Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 28591: Add some missing definitions Fix wrong structure alignment
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 10:56:39 2007 New Revision: 28591 URL: http://svn.reactos.org/svn/reactos?rev=28591&view=rev Log: Add some missing definitions Fix wrong structure alignment Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h (original) +++ trunk/reactos/include/psdk/shellapi.h Mon Aug 27 10:56:39 2007 @@ -124,7 +124,7 @@ typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; -#include <pshpack2.h> +#include <pshpack1.h> typedef struct _AppBarData { DWORD cbSize; HWND hWnd; @@ -186,6 +186,28 @@ GUID guidItem; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; + +#define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64]) +#define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) +#define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem) +#define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem) + +#if WINVER >= 0x400 +typedef struct _DRAGINFOA { + UINT uSize; + POINT pt; + BOOL fNC; + LPSTR lpFileList; + DWORD grfKeyState; +} DRAGINFOA,*LPDRAGINFOA; +typedef struct _DRAGINFOW { + UINT uSize; + POINT pt; + BOOL fNC; + LPWSTR lpFileList; + DWORD grfKeyState; +} DRAGINFOW,*LPDRAGINFOW; +#endif typedef struct _SHELLEXECUTEINFOA { DWORD cbSize; @@ -310,7 +332,10 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD); #ifdef UNICODE +#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE +#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; +typedef DRAGINFOW DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHFILEOPSTRUCTW SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT; typedef SHFILEINFOW SHFILEINFO; @@ -332,7 +357,10 @@ #define SHEmptyRecycleBin SHEmptyRecycleBinW #else +#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE +#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; +typedef DRAGINFOA DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHFILEOPSTRUCTA SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT; typedef SHFILEINFOA SHFILEINFO;

1 0

[jimtabor] 28590: Update ENUMFONTDATAW structure based on returned data.
by jimtabor＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: jimtabor Date: Mon Aug 27 10:38:51 2007 New Revision: 28590 URL: http://svn.reactos.org/svn/reactos?rev=28590&view=rev Log: Update ENUMFONTDATAW structure based on returned data. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon Aug 27 10:38:51 2007 @@ -120,18 +120,36 @@ TMDIFF Diff; } TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct _ENUMFONTDATAW +typedef struct _DESIGNVECTORINT { + DWORD dvReserved; + DWORD dvNumAxes; + LONG dvValues[0]; +} DESIGNVECTORINT, *PDESIGNVECTORINT; + +typedef struct _ENUMFONTDATAINT { - DWORD cbSize; // Size of ENUMFONTDATAW + (size of ENUMTEXTMETRIC + ENUMLOGFONTEXDV) - PENUMTEXTMETRIC lpentm; // Ptr with in this structure. ^^^ if Win2k + ^^^ - DWORD FontType; - PENUMLOGFONTEXDV lpelfedv; // Prt with in this structure. - // The rest of the structure is variable in size. - // Based on iEnumType and Win32Compat flags,, - // if w2k+ {ENUMTEXTMETRIC else NEWTEXTMETRICS} or TEXTMETRIC - // if w2k+ {ENUMLOGFONTEXDV else ENUMLOGFONT} or LOGFONT + DWORD dwReserved; + DWORD dwReserved1; + ENUMTEXTMETRICW etmTm; +} ENUMFONTDATAINT, *PENUMFONTDATAINT; + +typedef struct _ENUMFONTDATAW +{ + DWORD dwSize; // Full size of this structure. + ULONG ulOffsetTM; // Offset to enfdi in this structure. + DWORD dwFontType; // If sign set scale enum. + ENUMLOGFONTEXW elfex; +/* + * Yuam 14.5: + * DESIGNVECTOR is a variable-size data structure that specifies the number of + * axes and a value for each axis. + * So it maybe smaller than MM_MAX_NUMAXES. + */ + DESIGNVECTORINT DesignVectori; + ENUMFONTDATAINT enfdi; } ENUMFONTDATAW, *PENUMFONTDATAW; - + + /* Number Representation */ typedef struct _EFLOAT_S {

1 0

[arty] 28589: Slight improvement: When terminating the process, kill sibling threads first. We'll need this for synchronization at process termination among other things. Thanks alex for pointing out that we didn't do this.
by arty＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: arty Date: Mon Aug 27 09:00:03 2007 New Revision: 28589 URL: http://svn.reactos.org/svn/reactos?rev=28589&view=rev Log: Slight improvement: When terminating the process, kill sibling threads first. We'll need this for synchronization at process termination among other things. Thanks alex for pointing out that we didn't do this. Modified: trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c Mon Aug 27 09:00:03 2007 @@ -567,6 +567,9 @@ ULONG Request; NTSTATUS Status; + /* kill sibling threads ... we want to be alone at this point */ + NtTerminateProcess (NULL, 0); + /* unload all dll's */ LdrShutdownProcess ();

1 0

[janderwald] 28588: - fix warning
by janderwald＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: janderwald Date: Mon Aug 27 03:56:05 2007 New Revision: 28588 URL: http://svn.reactos.org/svn/reactos?rev=28588&view=rev Log: - fix warning Modified: trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c (original) +++ trunk/reactos/base/shell/cmd/misc.c Mon Aug 27 03:56:05 2007 @@ -105,7 +105,7 @@ */ VOID GetPathCase( TCHAR * Path, TCHAR * OutPath) { - INT i = 0; + UINT i = 0; TCHAR TempPath[MAX_PATH]; WIN32_FIND_DATA FindFileData; HANDLE hFind;

1 0

[janderwald] 28587: - add restart button by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us - the icon is taken from the tango project (see view-refresh.svg) See issue #2599 for more details.
by janderwald＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: janderwald Date: Mon Aug 27 03:41:04 2007 New Revision: 28587 URL: http://svn.reactos.org/svn/reactos?rev=28587&view=rev Log: - add restart button by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us - the icon is taken from the tango project (see view-refresh.svg) See issue #2599 for more details. Added: trunk/reactos/base/shell/explorer/res/restart.ico (with props) Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc trunk/reactos/base/shell/explorer/explorer-bn.rc trunk/reactos/base/shell/explorer/explorer-cn.rc trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/base/shell/explorer/explorer-hu.rc trunk/reactos/base/shell/explorer/explorer-id.rc trunk/reactos/base/shell/explorer/explorer-it.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-nl.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/base/shell/explorer/explorer-pt.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/base/shell/explorer/globals.h trunk/reactos/base/shell/explorer/resource.h trunk/reactos/base/shell/explorer/taskbar/desktopbar.h trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.h Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bg.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bg.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Èçõîä..." IDS_SHUTDOWN "Èçêëþ÷âàíå..." + IDS_RESTART "Restart..." IDS_LAUNCH "Èçïúëíÿâàíå..." IDS_START_HELP "Ïîìîù" IDS_SEARCH_FILES "Òúðñåíå" @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc Mon Aug 27 03:41:04 2007 @@ -327,6 +327,7 @@ IDS_START "Kvh©Kvix ZvwjKv" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "eÜ Kiv..." + IDS_RESTART "Restart..." IDS_LAUNCH "cwiPvjbv..." IDS_START_HELP "mvnvh¨" IDS_SEARCH_FILES "AbymÜvb..." @@ -394,3 +395,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cn.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "¿ªÊ¼" IDS_LOGOFF "×¢Ïú..." IDS_SHUTDOWN "¹Ø±Õ..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÔËÐÐ..." IDS_START_HELP "°ïÖú" IDS_SEARCH_FILES "ËÑË÷..." Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Odhlásit se..." IDS_SHUTDOWN "Vypnout..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spustit..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Hledat" @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Mon Aug 27 03:41:04 2007 @@ -336,6 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." + IDS_RESTART "Restart..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." @@ -403,3 +404,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "Turn Off..." + IDS_RESTART "Restart..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Search..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc Mon Aug 27 03:41:04 2007 @@ -315,6 +315,7 @@ IDS_START "Iniciar" IDS_LOGOFF "Salir..." IDS_SHUTDOWN "Apagar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Ejecutar..." IDS_START_HELP "Ayuda" IDS_SEARCH_FILES "Buscar..." @@ -382,3 +383,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc Mon Aug 27 03:41:04 2007 @@ -329,6 +329,7 @@ IDS_START "Démarrer" IDS_LOGOFF "Se déconnecter..." IDS_SHUTDOWN "Arrêter..." + IDS_RESTART "Restart..." IDS_LAUNCH "Exécuter..." IDS_START_HELP "Aide" IDS_SEARCH_FILES "Rechercher..." @@ -396,3 +397,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-gr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc Mon Aug 27 03:41:04 2007 @@ -332,6 +332,7 @@ IDS_START "Ýíáñîç" IDS_LOGOFF "Áðïóýíäåóç..." IDS_SHUTDOWN "Ôåñìáôéóìüò..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÅêôÝëåóç..." IDS_START_HELP "ÂïÞèåéá" IDS_SEARCH_FILES "ÁíáæÞôçóç..." @@ -399,3 +400,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-hu.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-hu.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Kijelentkezés..." IDS_SHUTDOWN "Kikapcsolás..." + IDS_RESTART "Restart..." IDS_LAUNCH "Futtatás..." IDS_START_HELP "Súgó" IDS_SEARCH_FILES "Keresés..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-id.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-id.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Mulai" IDS_LOGOFF "Keluar..." IDS_SHUTDOWN "Matikan..." + IDS_RESTART "Restart..." IDS_LAUNCH "Jalankan..." IDS_START_HELP "Bantuan" IDS_SEARCH_FILES "Cari..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-it.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-it.rc Mon Aug 27 03:41:04 2007 @@ -294,6 +294,7 @@ IDS_START "Start" IDS_LOGOFF "Disconnetti..." IDS_SHUTDOWN "Chiudi sessione..." + IDS_RESTART "Restart..." IDS_LAUNCH "Esegui..." IDS_START_HELP "Guida" IDS_SEARCH_FILES "Cerca..." @@ -361,3 +362,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "½À°Ä" IDS_LOGOFF "OIt..." IDS_SHUTDOWN "Vbg_E..." + IDS_RESTART "Restart..." IDS_LAUNCH "t@C¼ðwèµÄÀs..." IDS_START_HELP "wv" IDS_SEARCH_FILES "t@CâtH_..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-nl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-nl.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Afmelden..." IDS_SHUTDOWN "Uitschakelen..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uitvoeren..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Zoeken..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Logg av..." IDS_SHUTDOWN "Slå av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kjør..." IDS_START_HELP "Hjelp" IDS_SEARCH_FILES "Søk..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Wyloguj..." IDS_SHUTDOWN "Zamknij system..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uruchom..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Szukaj..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pt.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pt.rc Mon Aug 27 03:41:04 2007 @@ -98,6 +98,7 @@ IDS_START "Iniciar" IDS_LOGOFF "Terminar sessão..." IDS_SHUTDOWN "Desligar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" IDS_SEARCH_FILES "Procurar..." @@ -165,3 +166,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc Mon Aug 27 03:41:04 2007 @@ -134,6 +134,7 @@ IDS_START "Începe" IDS_LOGOFF "Închide sesiunea ..." IDS_SHUTDOWN "Oprire calculator ..." + IDS_RESTART "Restart..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" IDS_SEARCH_FILES "Cãutare Files..." @@ -243,3 +244,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Âûõîä èç ñèñòåìû..." IDS_SHUTDOWN "Âûêëþ÷åíèå..." + IDS_RESTART "Restart..." IDS_LAUNCH "Âûïîëíèòü..." IDS_START_HELP "Ñïðàâêà" IDS_SEARCH_FILES "Ïîèñê..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc Mon Aug 27 03:41:04 2007 @@ -340,6 +340,7 @@ IDS_START "tart" IDS_LOGOFF "Odhlási..." IDS_SHUTDOWN "Vypnú..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spusti..." IDS_START_HELP "Pomocník" IDS_SEARCH_FILES "H¾ada..." @@ -407,3 +408,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc Mon Aug 27 03:41:04 2007 @@ -325,6 +325,7 @@ IDS_START "Start" IDS_LOGOFF "Logga ut..." IDS_SHUTDOWN "Stäng av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kör..." IDS_START_HELP "Hjälp" IDS_SEARCH_FILES "Sök..." @@ -392,3 +393,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc Mon Aug 27 03:41:04 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Âèõ³ä ³ç ñèñòåìè..." IDS_SHUTDOWN "Âèìêíåííÿ..." + IDS_RESTART "Restart..." IDS_LAUNCH "Âèêîíàòè..." IDS_START_HELP "Äîâ³äêà" IDS_SEARCH_FILES "Ïîøóê..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp Mon Aug 27 03:41:04 2007 @@ -402,6 +402,7 @@ _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER, icon_size); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF, icon_size); _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN, icon_size); + _icons[ICID_RESTART] = Icon(ICID_RESTART, IDI_RESTART, icon_size); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS, icon_size); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE, icon_size); _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN, icon_size); Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Aug 27 03:41:04 2007 @@ -152,6 +152,7 @@ IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" +IDI_RESTART ICON DISCARDABLE "res/restart.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" @@ -244,3 +245,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/global… ============================================================================== --- trunk/reactos/base/shell/explorer/globals.h (original) +++ trunk/reactos/base/shell/explorer/globals.h Mon Aug 27 03:41:04 2007 @@ -81,6 +81,7 @@ ICID_COMPUTER, ICID_LOGOFF, ICID_SHUTDOWN, + ICID_RESTART, ICID_BOOKMARK, ICID_MINIMIZE, ICID_CONTROLPAN, Added: trunk/reactos/base/shell/explorer/res/restart.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/shell/explorer/res/restart.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h (original) +++ trunk/reactos/base/shell/explorer/resource.h Mon Aug 27 03:41:04 2007 @@ -48,6 +48,7 @@ #define IDS_SHOW_HIDDEN_ICONS 43 #define IDS_HIDE_ICONS 44 #define IDS_TERMINATE 45 +#define IDS_RESTART 46 #define IDI_REACTOS 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102 @@ -123,6 +124,7 @@ #define IDI_NETCONNS 175 #define IDI_ADMIN 176 #define IDI_RECENT 178 +#define IDI_RESTART 179 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Mon Aug 27 03:41:04 2007 @@ -59,6 +59,7 @@ #define IDC_SEARCH_PROGRAM 0x1016 #define IDC_SEARCH 0x1017 #define IDC_TERMINATE 0x1018 +#define IDC_RESTART 0x1019 #define IDC_FIRST_MENU 0x3000 Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Mon Aug 27 03:41:04 2007 @@ -1752,20 +1752,22 @@ #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) + if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) +#else + if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) +#endif + AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); + +#ifdef _ROS_ + AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART); +#endif + +#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCLOSE)) #else - if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) -#endif - AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); - - -#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) - if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) -#else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); - #ifndef _ROS_ AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE); @@ -1940,9 +1942,15 @@ case IDC_SHUTDOWN: CloseStartMenu(id); - ShowExitWindowsDialog(g_Globals._hwndDesktopBar); - break; - + ShowExitWindowsDialog(g_Globals._hwndDesktop); + break; + + case IDC_RESTART: + CloseStartMenu(id); + ShowRestartDialog(g_Globals._hwndDesktop, EWX_REBOOT); + /* An alternative way to do restart without shell32 help */ + //launch_file(_hwnd, TEXT("shutdown.exe"), SW_HIDE, TEXT("-r")); + break; // settings menu @@ -2149,6 +2157,15 @@ MessageBox(hwndOwner, TEXT("ExitWindowsDialog() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } +void StartMenuHandler::ShowRestartDialog(HWND hwndOwner, UINT flags) +{ + static DynamicFct<RESTARTWINDOWSDLG> RestartDlg(TEXT("SHELL32"), 59); + + if (RestartDlg) + (*RestartDlg)(hwndOwner, (LPWSTR)L"You selected restart.\n\n", flags); + else + MessageBox(hwndOwner, TEXT("RestartDlg() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); +} void SettingsMenu::AddEntries() { Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.h (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h Mon Aug 27 03:41:04 2007 @@ -348,6 +348,7 @@ static void ShowLaunchDialog(HWND hwndOwner); static void ShowLogoffDialog(HWND hwndOwner); + static void ShowRestartDialog(HWND hwndOwner, UINT flags); static void ShowSearchDialog(); static void ShowSearchComputer(); };

1 0

[greatlrd] 28586: fix the build
by greatlrd＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: greatlrd Date: Mon Aug 27 03:01:18 2007 New Revision: 28586 URL: http://svn.reactos.org/svn/reactos?rev=28586&view=rev Log: fix the build Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Mon Aug 27 03:01:18 2007 @@ -2616,11 +2616,22 @@ return 0; } - - - - - - - - + /* + * @unimplemented + */ + DWORD +STDCALL +NtGdiDvpGetVideoPortField( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData) +{ + UNIMPLEMENTED; + return 0; +} + + + + + + +

1 0

[janderwald] 28585: - dont show the same resolution multiple times - sort the resolution according to width, height and bits per pixel See issue #2594 for more details.
by janderwald＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: janderwald Date: Mon Aug 27 02:43:51 2007 New Revision: 28585 URL: http://svn.reactos.org/svn/reactos?rev=28585&view=rev Log: - dont show the same resolution multiple times - sort the resolution according to width, height and bits per pixel See issue #2594 for more details. Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Mon Aug 27 02:43:51 2007 @@ -137,11 +137,11 @@ Current->dmPelsHeight = devmode.dmPelsHeight; Current->dmBitsPerPel = devmode.dmBitsPerPel; while (Next != NULL && ( - Next->dmPelsHeight < Current->dmPelsHeight || - (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel) || + Next->dmPelsWidth < Current->dmPelsWidth || + (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || (Next->dmPelsHeight == Current->dmPelsHeight && - Next->dmBitsPerPel == Current->dmBitsPerPel && - Next->dmPelsWidth < Current->dmPelsWidth))) + Next->dmPelsWidth == Current->dmPelsWidth && + Next->dmBitsPerPel < Current->dmBitsPerPel ))) { Previous = Next; Next = Next->Flink; @@ -194,7 +194,7 @@ for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) { if (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) { ResolutionsCount++; @@ -211,7 +211,7 @@ { if (Current->Flink == NULL || (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) { newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth;

1 0

[greatlrd] 28584: Implement stub for NtGdiDvpGetVideoPortField, NtGdiDvpGetVideoPortFlipStatus, NtGdiDvpGetVideoPortInputFormats, NtGdiDvpGetVideoPortLine, NtGdiDvpGetVideoPortOutputFormats, NtGdiDvpGetVideoPortConnectInfo, NtGdiDvpGetVideoSignalStatus, NtGdiDvpUpdateVideoPort, NtGdiDvpWaitForVideoPortSync, NtGdiDvpAcquireNotification, NtGdiDvpReleaseNotification, NtGdiDxgGenericThunk, NtGdiDeleteColorTransform, NtGdiGetPerBandInfo, NtGdiDoBanding, NtGdiEnumFontChunk, NtGdiEnumFontClose, NtGdiEn
by greatlrd＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: greatlrd Date: Mon Aug 27 02:03:02 2007 New Revision: 28584 URL: http://svn.reactos.org/svn/reactos?rev=28584&view=rev Log: Implement stub for NtGdiDvpGetVideoPortField, NtGdiDvpGetVideoPortFlipStatus, NtGdiDvpGetVideoPortInputFormats, NtGdiDvpGetVideoPortLine, NtGdiDvpGetVideoPortOutputFormats, NtGdiDvpGetVideoPortConnectInfo, NtGdiDvpGetVideoSignalStatus, NtGdiDvpUpdateVideoPort, NtGdiDvpWaitForVideoPortSync, NtGdiDvpAcquireNotification, NtGdiDvpReleaseNotification, NtGdiDxgGenericThunk, NtGdiDeleteColorTransform, NtGdiGetPerBandInfo, NtGdiDoBanding, NtGdiEnumFontChunk, NtGdiEnumFontClose, NtGdiEnumFontOpen, NtGdiEudcLoadUnloadLink, NtGdiExtTextOutW, NtGdiForceUFIMapping, NtGdiFullscreenControl, NtGdiGetAppClipBox, NtGdiGetCharABCWidthsW, NtGdiGetCharacterPlacementW, NtGdiGetCharWidthW, NtGdiGetCharWidthInfo, NtGdiGetColorSpaceforBitmap, NtGdiGetDCforBitmap, NtGdiGetDCObject, NtGdiGetDeviceCapsAll, NtGdiGetETM, NtGdiGetEudcTimeStampEx Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Mon Aug 27 02:03:02 2007 @@ -2141,3 +2141,486 @@ return 0; } + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortFlipStatus( + IN HANDLE hDirectDraw, + IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortInputFormats( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortLine( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortOutputFormats( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortConnectInfo( + IN HANDLE hDirectDraw, + IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoSignalStatus( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpUpdateVideoPort( + IN HANDLE hVideoPort, + IN HANDLE* phSurfaceVideo, + IN HANDLE* phSurfaceVbi, + IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpWaitForVideoPortSync( + IN HANDLE hVideoPort, + IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpAcquireNotification( + IN HANDLE hVideoPort, + IN OUT HANDLE* hEvent, + IN LPDDVIDEOPORTNOTIFY pNotify) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpReleaseNotification( + IN HANDLE hVideoPort, + IN HANDLE hEvent) +{ + UNIMPLEMENTED; + return 0; +} + + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDxgGenericThunk( + IN ULONG_PTR ulIndex, + IN ULONG_PTR ulHandle, + IN OUT SIZE_T *pdwSizeOfPtr1, + IN OUT PVOID pvPtr1, + IN OUT SIZE_T *pdwSizeOfPtr2, + IN OUT PVOID pvPtr2) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiDeleteColorTransform( + IN HDC hdc, + IN HANDLE hColorTransform) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiGetPerBandInfo( + IN HDC hdc, + IN OUT PERBANDINFO *ppbi) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiDoBanding( + IN HDC hdc, + IN BOOL bStart, + OUT POINTL *pptl, + OUT PSIZE pSize) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEnumFontChunk( + IN HDC hdc, + IN ULONG_PTR idEnum, + IN ULONG cjEfdw, + OUT ULONG *pcjEfdw, + OUT PENUMFONTDATAW pefdw) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEnumFontClose( + IN ULONG_PTR idEnum) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG_PTR +STDCALL +NtGdiEnumFontOpen( + IN HDC hdc, + IN ULONG iEnumType, + IN FLONG flWin31Compat, + IN ULONG cwchMax, + IN OPTIONAL LPWSTR pwszFaceName, + IN ULONG lfCharSet, + OUT ULONG *pulCount) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiEudcLoadUnloadLink( + IN OPTIONAL LPCWSTR pBaseFaceName, + IN UINT cwcBaseFaceName, + IN LPCWSTR pEudcFontPath, + IN UINT cwcEudcFontPath, + IN INT iPriority, + IN INT iFontLinkType, + IN BOOL bLoadLin) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiExtTextOutW( + IN HDC hdc, + IN INT x, + IN INT y, + IN UINT flOpts, + IN OPTIONAL LPRECT prcl, + IN LPWSTR pwsz, + IN INT cwc, + IN OPTIONAL LPINT pdx, + IN DWORD dwCodePage) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiForceUFIMapping( + IN HDC hdc, + IN PUNIVERSAL_FONT_ID pufi) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +NTSTATUS +STDCALL +NtGdiFullscreenControl( + IN FULLSCREENCONTROL FullscreenCommand, + IN PVOID FullscreenInput, + IN DWORD FullscreenInputLength, + OUT PVOID FullscreenOutput, + IN OUT PULONG FullscreenOutputLength) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +INT +STDCALL +NtGdiGetAppClipBox( + IN HDC hdc, + OUT LPRECT prc) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharABCWidthsW( + IN HDC hdc, + IN UINT wchFirst, + IN ULONG cwch, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID pvBuf) + { + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiGetCharacterPlacementW( + IN HDC hdc, + IN LPWSTR pwsz, + IN INT nCount, + IN INT nMaxExtent, + IN OUT LPGCP_RESULTSW pgcpw, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharWidthW( + IN HDC hdc, + IN UINT wcFirst, + IN UINT cwc, + IN OPTIONAL PWCHAR pwc, + IN FLONG fl, + OUT PVOID pvBuf) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharWidthInfo( + IN HDC hdc, + OUT PCHWIDTHINFO pChWidthInfo) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG_PTR +STDCALL +NtGdiGetColorSpaceforBitmap( + IN HBITMAP hsurf) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HDC +STDCALL +NtGdiGetDCforBitmap( + IN HBITMAP hsurf) +{ + UNIMPLEMENTED; + return NULL; +} + + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiGetDCObject( + IN HDC hdc, + IN INT itype) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetDeviceCapsAll ( + IN HDC hdc, + OUT PDEVCAPS pDevCaps) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetETM( + IN HDC hdc, + OUT EXTTEXTMETRIC *petm) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiGetEudcTimeStampEx( + IN OPTIONAL LPWSTR lpBaseFaceName, + IN ULONG cwcBaseFaceName, + IN BOOL bSystemTimeStamp) +{ + UNIMPLEMENTED; + return 0; +} + + + + + + + + + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Mon Aug 27 02:03:02 2007 @@ -113,25 +113,25 @@ NtGdiDvpDestroyVideoPort 2 NtGdiDvpFlipVideoPort 4 NtGdiDvpGetVideoPortBandwidth 2 -# NtGdiDvpGetVideoPortField 2 -# NtGdiDvpGetVideoPortFlipStatus 2 -# NtGdiDvpGetVideoPortInputFormats 2 -# NtGdiDvpGetVideoPortLine 2 -# NtGdiDvpGetVideoPortOutputFormats 2 -# NtGdiDvpGetVideoPortConnectInfo 2 -# NtGdiDvpGetVideoSignalStatus 2 -# NtGdiDvpUpdateVideoPort 4 -# NtGdiDvpWaitForVideoPortSync 2 -# NtGdiDvpAcquireNotification 3 -# NtGdiDvpReleaseNotification 2 -# NtGdiDxgGenericThunk 6 +NtGdiDvpGetVideoPortField 2 +NtGdiDvpGetVideoPortFlipStatus 2 +NtGdiDvpGetVideoPortInputFormats 2 +NtGdiDvpGetVideoPortLine 2 +NtGdiDvpGetVideoPortOutputFormats 2 +NtGdiDvpGetVideoPortConnectInfo 2 +NtGdiDvpGetVideoSignalStatus 2 +NtGdiDvpUpdateVideoPort 4 +NtGdiDvpWaitForVideoPortSync 2 +NtGdiDvpAcquireNotification 3 +NtGdiDvpReleaseNotification 2 +NtGdiDxgGenericThunk 6 NtGdiDeleteClientObj 1 NtGdiDeleteColorSpace 1 -# NtGdiDeleteColorTransform 2 +NtGdiDeleteColorTransform 2 NtGdiDeleteObjectApp 1 NtGdiDescribePixelFormat 4 -# NtGdiGetPerBandInfo 2 -# NtGdiDoBanding 4 +NtGdiGetPerBandInfo 2 +NtGdiDoBanding 4 NtGdiDoPalette 6 NtGdiDrawEscape 4 NtGdiEllipse 5 @@ -139,12 +139,12 @@ NtGdiEndDoc 1 NtGdiEndPage 1 NtGdiEndPath 1 -# NtGdiEnumFontChunk 5 -# NtGdiEnumFontClose 1 -# NtGdiEnumFontOpen 7 +NtGdiEnumFontChunk 5 +NtGdiEnumFontClose 1 +NtGdiEnumFontOpen 7 NtGdiEnumObjects 4 NtGdiEqualRgn 2 -# NtGdiEudcLoadUnloadLink 7 +NtGdiEudcLoadUnloadLink 7 NtGdiExcludeClipRect 5 NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 @@ -152,37 +152,37 @@ NtGdiExtFloodFill 5 NtGdiExtGetObjectW 3 NtGdiExtSelectClipRgn 3 -# NtGdiExtTextOutW 9 +NtGdiExtTextOutW 9 NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 NtGdiFlushUserBatch 0 NtGdiFlush 0 -# NtGdiForceUFIMapping 2 +NtGdiForceUFIMapping 2 NtGdiFrameRgn 5 -# NtGdiFullscreenControl 5 +NtGdiFullscreenControl 5 NtGdiGetAndSetDCDword 4 -# NtGdiGetAppClipBox 2 +NtGdiGetAppClipBox 2 NtGdiGetBitmapBits 3 NtGdiGetBitmapDimension 2 NtGdiGetBoundsRect 3 -# NtGdiGetCharABCWidthsW 6 -# NtGdiGetCharacterPlacementW 6 +NtGdiGetCharABCWidthsW 6 +NtGdiGetCharacterPlacementW 6 NtGdiGetCharSet 1 -# NtGdiGetCharWidthW 6 -# NtGdiGetCharWidthInfo 2 +NtGdiGetCharWidthW 6 +NtGdiGetCharWidthInfo 2 NtGdiGetColorAdjustment 2 -# NtGdiGetColorSpaceforBitmap 1 +NtGdiGetColorSpaceforBitmap 1 NtGdiGetDCDword 3 -# NtGdiGetDCforBitmap 1 -# NtGdiGetDCObject 2 +NtGdiGetDCforBitmap 1 +NtGdiGetDCObject 2 NtGdiGetDCPoint 3 NtGdiGetDeviceCaps 2 NtGdiGetDeviceGammaRamp 2 -# NtGdiGetDeviceCapsAll 2 +NtGdiGetDeviceCapsAll 2 NtGdiGetDIBitsInternal 9 -# NtGdiGetETM 2 -# NtGdiGetEudcTimeStampEx 3 +NtGdiGetETM 2 +NtGdiGetEudcTimeStampEx 3 NtGdiGetFontData 5 NtGdiGetFontResourceInfoInternalW 7 # NtGdiGetGlyphIndicesW 5

1 0

[janderwald] 28583: - creation of empty environment variables should not be possible (tested under Windows XP SP2) - dont create variables when cancel is hit - bug report + patch by Gregor Schneider (aka DosX) See issue #2600 for more details.
by janderwald＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: janderwald Date: Mon Aug 27 01:42:48 2007 New Revision: 28583 URL: http://svn.reactos.org/svn/reactos?rev=28583&view=rev Log: - creation of empty environment variables should not be possible (tested under Windows XP SP2) - dont create variables when cancel is hit - bug report + patch by Gregor Schneider (aka DosX) See issue #2600 for more details. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Mon Aug 27 01:42:48 2007 @@ -266,6 +266,8 @@ /* Set user environment variables */ hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); + SetListViewColumns(hwndListView); SetEnvironmentVariables(hwndListView, @@ -273,11 +275,16 @@ _T("Environment")); (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + + ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED); + (void)ListView_Update(hwndListView,0); /* Set system environment variables */ hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); SetListViewColumns(hwndListView); @@ -286,6 +293,9 @@ _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + + ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED); + (void)ListView_Update(hwndListView,0); } @@ -319,17 +329,22 @@ GlobalFree(VarData->lpCookedValue); GlobalFree(VarData); - } - - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - lvi.lParam = (LPARAM)VarData; - lvi.pszText = VarData->lpName; - lvi.state = 0; - iItem = ListView_InsertItem(hwndListView, &lvi); - - ListView_SetItemText(hwndListView, iItem, 1, + } + else + { + if(VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; + lvi.lParam = (LPARAM)VarData; + lvi.pszText = VarData->lpName; + lvi.state = 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + } + } }

1 0

[greatlrd] 28582: Implement stub for NtGdiClearBrushAttributes, NtGdiColorCorrectPalette, NtGdiComputeXformCoefficients, NtGdiConsoleTextOut, NtGdiConvertMetafileRect, NtGdiCreateColorTransform, NtGdiDvpCanCreateVideoPort, NtGdiDvpColorControl, NtGdiDvpCreateVideoPort, NtGdiDvpDestroyVideoPort, NtGdiDvpFlipVideoPort, NtGdiDvpGetVideoPortBandwidth
by greatlrd＠svn.reactos.org 26 Aug '07

26 Aug '07

Author: greatlrd Date: Mon Aug 27 00:33:56 2007 New Revision: 28582 URL: http://svn.reactos.org/svn/reactos?rev=28582&view=rev Log: Implement stub for NtGdiClearBrushAttributes, NtGdiColorCorrectPalette, NtGdiComputeXformCoefficients, NtGdiConsoleTextOut, NtGdiConvertMetafileRect, NtGdiCreateColorTransform, NtGdiDvpCanCreateVideoPort, NtGdiDvpColorControl, NtGdiDvpCreateVideoPort, NtGdiDvpDestroyVideoPort, NtGdiDvpFlipVideoPort, NtGdiDvpGetVideoPortBandwidth Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Mon Aug 27 00:33:56 2007 @@ -1970,3 +1970,174 @@ return NULL; } + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpCanCreateVideoPort( + IN HANDLE hDirectDraw, + IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpColorControl( + IN HANDLE hVideoPort, + IN OUT PDD_VPORTCOLORDATA puVPortColorData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiDvpCreateVideoPort( + IN HANDLE hDirectDraw, + IN OUT PDD_CREATEVPORTDATA puCreateVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpDestroyVideoPort( + IN HANDLE hVideoPort, + IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpFlipVideoPort( + IN HANDLE hVideoPort, + IN HANDLE hDDSurfaceCurrent, + IN HANDLE hDDSurfaceTarget, + IN OUT PDD_FLIPVPORTDATA puFlipVPortData) +{ + UNIMPLEMENTED; + return 0; +} + + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiDvpGetVideoPortBandwidth( + IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HBRUSH +STDCALL +NtGdiClearBrushAttributes( + IN HBRUSH hbm, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiColorCorrectPalette( + IN HDC hdc, + IN HPALETTE hpal, + IN ULONG FirstEntry, + IN ULONG NumberOfEntries, + IN OUT PALETTEENTRY *ppalEntry, + IN ULONG Command) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiCreateColorTransform( + IN HDC hdc, + IN LPLOGCOLORSPACEW pLogColorSpaceW, + IN OPTIONAL PVOID pvSrcProfile, + IN ULONG cjSrcProfile, + IN OPTIONAL PVOID pvDestProfile, + IN ULONG cjDestProfile, + IN OPTIONAL PVOID pvTargetProfile, + IN ULONG cjTargetProfile) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiComputeXformCoefficients(IN HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiConsoleTextOut( + IN HDC hdc, + IN POLYTEXTW *lpto, + IN UINT nStrings, + IN RECTL *prclBounds) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +LONG +STDCALL +NtGdiConvertMetafileRect( + IN HDC hdc, + IN OUT PRECTL prect) +{ + UNIMPLEMENTED; + return 0; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Mon Aug 27 00:33:56 2007 @@ -24,17 +24,17 @@ NtGdiCheckBitmapBits 8 NtGdiCloseFigure 1 NtGdiClearBitmapAttributes 2 -# NtGdiClearBrushAttributes 2 -# NtGdiColorCorrectPalette 6 +NtGdiClearBrushAttributes 2 +NtGdiColorCorrectPalette 6 NtGdiCombineRgn 4 NtGdiCombineTransform 3 -# NtGdiComputeXformCoefficients 1 -# NtGdiConsoleTextOut 4 -# NtGdiConvertMetafileRect 2 +NtGdiComputeXformCoefficients 1 +NtGdiConsoleTextOut 4 +NtGdiConvertMetafileRect 2 NtGdiCreateBitmap 5 NtGdiCreateClientObj 1 NtGdiCreateColorSpace 1 -# NtGdiCreateColorTransform 8 +NtGdiCreateColorTransform 8 NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 NtGdiCreateDIBBrush 6 @@ -107,12 +107,12 @@ NtGdiDdUnlockD3D 2 NtGdiDdUpdateOverlay 3 NtGdiDdWaitForVerticalBlank 2 -# NtGdiDvpCanCreateVideoPort 2 -# NtGdiDvpColorControl 2 -# NtGdiDvpCreateVideoPort 2 -# NtGdiDvpDestroyVideoPort 2 -# NtGdiDvpFlipVideoPort 4 -# NtGdiDvpGetVideoPortBandwidth 2 +NtGdiDvpCanCreateVideoPort 2 +NtGdiDvpColorControl 2 +NtGdiDvpCreateVideoPort 2 +NtGdiDvpDestroyVideoPort 2 +NtGdiDvpFlipVideoPort 4 +NtGdiDvpGetVideoPortBandwidth 2 # NtGdiDvpGetVideoPortField 2 # NtGdiDvpGetVideoPortFlipStatus 2 # NtGdiDvpGetVideoPortInputFormats 2

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