Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 34025: - Restored ACP/OEMCP/MACCP static entries (removed in 34010) - they are needed for LiveCD boot process.
by fireball＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: fireball Date: Thu Jun 19 07:11:32 2008 New Revision: 34025 URL: http://svn.reactos.org/svn/reactos?rev=34025&view=rev Log: - Restored ACP/OEMCP/MACCP static entries (removed in 34010) - they are needed for LiveCD boot process. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Jun 19 07:11:32 2008 @@ -393,6 +393,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28597",0x00000000,"c_28597.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28598",0x00000000,"c_28598.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28599",0x00000000,"c_28599.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","ACP",0x00000000,"1252" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","OEMCP",0x00000000,"437" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","MACCP",0x00000000,"10000" ; NLS Language settings HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.nls"

1 0

[gedmurphy] 34024: Add all modules within a test to the treeview
by gedmurphy＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: gedmurphy Date: Thu Jun 19 06:57:14 2008 New Revision: 34024 URL: http://svn.reactos.org/svn/reactos?rev=34024&view=rev Log: Add all modules within a test to the treeview Modified: trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/misc.c trunk/rostests/winetests/GUI/precomp.h Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Thu Jun 19 06:57:14 2008 @@ -14,6 +14,7 @@ #define IL_TEST 1 typedef wchar_t *(__cdecl *DLLNAME)(); +typedef int (_cdecl *MODULES)(char **); static INT GetNumberOfDllsInFolder(LPWSTR lpFolder) @@ -135,6 +136,7 @@ HTREEITEM hRoot; HIMAGELIST hImgList; DLLNAME GetTestName; + MODULES GetModulesInTest; HMODULE hDll; LPWSTR lpDllPath; LPWSTR lpTestName; @@ -171,16 +173,47 @@ GetTestName = (DLLNAME)GetProcAddress(hDll, "GetTestName"); if (GetTestName) { + HTREEITEM hParent; + LPSTR lpModules, ptr; + LPWSTR lpModW; + INT numMods; + lpTestName = GetTestName(); - InsertIntoTreeView(pInfo->hBrowseTV, - hRoot, - lpTestName, - lpDllPath, - IL_TEST); - - // add individual tests as children - + hParent = InsertIntoTreeView(pInfo->hBrowseTV, + hRoot, + lpTestName, + lpDllPath, + IL_TEST); + + if (hParent) + { + GetModulesInTest = (MODULES)GetProcAddress(hDll, "GetModulesInTest"); + if ((numMods = GetModulesInTest(&lpModules))) + { + ptr = lpModules; + while (numMods && *ptr != '\0') + { + if (AnsiToUnicode(ptr, &lpModW)) + { + InsertIntoTreeView(pInfo->hBrowseTV, + hParent, + lpModW, + lpModW, + IL_TEST); + + HeapFree(GetProcessHeap(), 0, lpModW); + } + + while (*(ptr++) != '\0') + ; + + numMods--; + } + + HeapFree(GetProcessHeap(), 0, lpModules); + } + } } FreeLibrary(hDll); Modified: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Thu Jun 19 06:57:14 2008 @@ -24,7 +24,7 @@ } /* There are always blocks of 16 strings */ - lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + lpName = (LPWSTR)MAKEINTRESOURCEW((uID >> 4) + 1); /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && @@ -238,12 +238,12 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hIcon = (HBITMAP)LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_ICON, - Width, - Height, - LR_DEFAULTCOLOR); + hIcon = (HBITMAP)LoadImageW(hInstance, + MAKEINTRESOURCEW(i), + IMAGE_ICON, + Width, + Height, + LR_DEFAULTCOLOR); if (hIcon == NULL) goto fail; @@ -261,3 +261,21 @@ ImageList_Destroy(hImageList); return NULL; } + +DWORD +AnsiToUnicode(LPCSTR lpSrcStr, + LPWSTR *lpDstStr) +{ + INT length; + INT ret = 0; + + length = strlen(lpSrcStr) + 1; + + *lpDstStr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + if (*lpDstStr) + { + ret = MultiByteToWideChar(CP_ACP, 0, lpSrcStr, -1, *lpDstStr, length); + } + + return ret; +} Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Thu Jun 19 06:57:14 2008 @@ -32,6 +32,7 @@ /* dll exports */ wchar_t *GetTestName(); +int GetModulesInTest(char **modules); /* browsewnd.c */ @@ -41,5 +42,6 @@ HIMAGELIST InitImageList(UINT StartResource, UINT EndResource, UINT Width, UINT Height); VOID DisplayString(LPWSTR lpMsg); VOID DisplayError(INT err); +DWORD AnsiToUnicode(LPCSTR lpSrcStr, LPWSTR *lpDstStr); #endif /* __WINETESTGUI_PRECOMP_H */

1 0

[fireball] 34023: - Revert 34010 completely, too much breakages. "Don't fix what's not broken".
by fireball＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: fireball Date: Thu Jun 19 03:41:31 2008 New Revision: 34023 URL: http://svn.reactos.org/svn/reactos?rev=34023&view=rev Log: - Revert 34010 completely, too much breakages. "Don't fix what's not broken". Removed: trunk/reactos/dll/win32/kernel32/misc/lang.h Modified: trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Removed: trunk/reactos/dll/win32/kernel32/misc/lang.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti…

1 0

[gedmurphy] 34022: add all test dlls into the treeview
by gedmurphy＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: gedmurphy Date: Thu Jun 19 03:36:17 2008 New Revision: 34022 URL: http://svn.reactos.org/svn/reactos?rev=34022&view=rev Log: add all test dlls into the treeview Added: trunk/rostests/winetests/GUI/res/main.ico (with props) trunk/rostests/winetests/GUI/res/tests.ico (with props) Modified: trunk/rostests/winetests/GUI/WinetestsGUI.rc trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/mainwnd.c trunk/rostests/winetests/GUI/misc.c trunk/rostests/winetests/GUI/precomp.h trunk/rostests/winetests/GUI/resource.h trunk/rostests/winetests/GUI/rsrc.rc Modified: trunk/rostests/winetests/GUI/WinetestsGUI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/WinetestsGU… ============================================================================== --- trunk/rostests/winetests/GUI/WinetestsGUI.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/WinetestsGUI.rc [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -3,9 +3,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Character Map\0" -#define REACTOS_STR_INTERNAL_NAME "charmap\0" -#define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS API test GUI\0" +#define REACTOS_STR_INTERNAL_NAME "WinetestsGUI\0" +#define REACTOS_STR_ORIGINAL_FILENAME "WinetestsGUI.exe\0" //#include <reactos/version.rc> #include "rsrc.rc" Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Character Map + * PROJECT: ReactOS API Test GUI * LICENSE: GPL - See COPYING in the top level directory * FILE: * PURPOSE: browse dialog implementation @@ -10,6 +10,10 @@ #include <precomp.h> #define DLL_SEARCH_DIR L"\\Debug\\testlibs\\*" +#define IL_MAIN 0 +#define IL_TEST 1 + +typedef wchar_t *(__cdecl *DLLNAME)(); static INT GetNumberOfDllsInFolder(LPWSTR lpFolder) @@ -128,31 +132,67 @@ static VOID PopulateTreeView(PMAIN_WND_INFO pInfo) { - HWND hTreeView; HTREEITEM hRoot; - HBITMAP hComp; - TCHAR ComputerName[MAX_PATH]; - DWORD dwSize = MAX_PATH; - INT RootImage; - - hTreeView = GetDlgItem(pInfo->hBrowseDlg, IDC_TREEVIEW); - - (void)TreeView_DeleteAllItems(hTreeView); - - /* insert the root item into the tree */ - hRoot = InsertIntoTreeView(hTreeView, + HIMAGELIST hImgList; + DLLNAME GetTestName; + HMODULE hDll; + LPWSTR lpDllPath; + LPWSTR lpTestName; + INT RootImage, i; + + pInfo->hBrowseTV = GetDlgItem(pInfo->hBrowseDlg, IDC_TREEVIEW); + + (void)TreeView_DeleteAllItems(pInfo->hBrowseTV); + + hImgList = InitImageList(IDI_ICON, + IDI_TESTS, + 16, + 16); + if (!hImgList) return; + + (void)TreeView_SetImageList(pInfo->hBrowseTV, + hImgList, + TVSIL_NORMAL); + + /* insert the root item into the tree */ + hRoot = InsertIntoTreeView(pInfo->hBrowseTV, NULL, - ComputerName, + L"Full", NULL, - 0);//RootImage); + IL_MAIN); + + for (i = 0; i < pInfo->numDlls; i++) + { + lpDllPath = pInfo->lpDllList + (MAX_PATH * i); + + hDll = LoadLibraryW(lpDllPath); + if (hDll) + { + GetTestName = (DLLNAME)GetProcAddress(hDll, "GetTestName"); + if (GetTestName) + { + lpTestName = GetTestName(); + + InsertIntoTreeView(pInfo->hBrowseTV, + hRoot, + lpTestName, + lpDllPath, + IL_TEST); + + // add individual tests as children + + } + + FreeLibrary(hDll); + } + } } static VOID PopulateTestList(PMAIN_WND_INFO pInfo) { - INT numFiles; - - if ((numFiles = GetListOfTestDlls(pInfo))) + pInfo->numDlls = GetListOfTestDlls(pInfo); + if (pInfo->numDlls) { PopulateTreeView(pInfo); } Modified: trunk/rostests/winetests/GUI/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/mainwnd.c?r… ============================================================================== --- trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Character Map + * PROJECT: ReactOS API Test GUI * LICENSE: GPL - See COPYING in the top level directory * FILE: * PURPOSE: main dialog implementation Modified: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Services + * PROJECT: ReactOS API Test GUI * LICENSE: GPL - See COPYING in the top level directory * FILE: * PURPOSE: miscallanous functions @@ -221,15 +221,15 @@ UINT Width, UINT Height) { - HBITMAP hBitmap; + HICON hIcon; HIMAGELIST hImageList; UINT i; - INT Ret; + INT Ret; /* Create the toolbar icon image list */ hImageList = ImageList_Create(Width, Height, - ILC_MASK | ILC_COLOR24, + ILC_MASK | ILC_COLOR32, EndResource - StartResource, 0); if (hImageList == NULL) @@ -238,23 +238,26 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hBitmap = (HBITMAP)LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - Width, - Height, - LR_LOADTRANSPARENT); - if (hBitmap == NULL) - return NULL; - - Ret = ImageList_AddMasked(hImageList, - hBitmap, - RGB(255, 0, 128)); + hIcon = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_ICON, + Width, + Height, + LR_DEFAULTCOLOR); + if (hIcon == NULL) + goto fail; + + Ret = ImageList_AddIcon(hImageList, + hIcon); if (Ret == -1) - return NULL; - - DeleteObject(hBitmap); + goto fail; + + DestroyIcon(hIcon); } return hImageList; -} + +fail: + ImageList_Destroy(hImageList); + return NULL; +} Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -11,10 +11,11 @@ typedef struct _MAIN_WND_INFO { - HWND hMainWnd; - HWND hBrowseDlg; - HWND hStatus; - int nCmdShow; + HWND hMainWnd; + HWND hBrowseDlg; + HWND hBrowseTV; + HWND hStatus; + int nCmdShow; HICON hSmIcon; HICON hBgIcon; @@ -25,14 +26,19 @@ BOOL bIsUserAnAdmin; LPWSTR lpDllList; + INT numDlls; } MAIN_WND_INFO, *PMAIN_WND_INFO; + +/* dll exports */ +wchar_t *GetTestName(); /* browsewnd.c */ BOOL CALLBACK BrowseDlgProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* misc.c */ +HIMAGELIST InitImageList(UINT StartResource, UINT EndResource, UINT Width, UINT Height); VOID DisplayString(LPWSTR lpMsg); VOID DisplayError(INT err); Added: trunk/rostests/winetests/GUI/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/res/main.ic… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/GUI/res/main.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/winetests/GUI/res/tests.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/res/tests.i… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/GUI/res/tests.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/winetests/GUI/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/resource.h?… ============================================================================== --- trunk/rostests/winetests/GUI/resource.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/resource.h [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -3,7 +3,7 @@ #define IDM_ABOUT 104 #define IDM_EXIT 105 #define IDI_ICON 107 -#define IDI_SMALL 108 +#define IDI_TESTS 108 #define IDC_DELETE 109 #define IDR_MAINFRAME 128 #define IDC_LIST 1000 Modified: trunk/rostests/winetests/GUI/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/rsrc.rc?rev… ============================================================================== --- trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] Thu Jun 19 03:36:17 2008 @@ -3,7 +3,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -IDI_ICON ICON "res/charmap.ico" +IDI_ICON ICON "res/main.ico" +IDI_TESTS ICON "res/tests.ico" //#include "lang/bg-BG.rc" //#include "lang/ca-ES.rc"

1 0

[dreimer] 34021: Bug 3362: Italian translation update by Paolo Devoti (devotip@tiscali.it)
by dreimer＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: dreimer Date: Thu Jun 19 01:15:59 2008 New Revision: 34021 URL: http://svn.reactos.org/svn/reactos?rev=34021&view=rev Log: Bug 3362: Italian translation update by Paolo Devoti (devotip(a)tiscali.it) Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/vmwinst/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -381,9 +381,9 @@ TEXT_STYLE_NORMAL }, { - 8, + 3, 14, - "Layout tastiera:", + "Nazionalit tastiera:", TEXT_STYLE_NORMAL }, { @@ -573,7 +573,7 @@ { 10, 8, - "Questo potrebbe impiegare un minuto", + "Questo potrebbe impiegare qualche minuto", TEXT_STYLE_NORMAL }, { @@ -809,7 +809,7 @@ { 8, 11, - "\x07 Premere SU o GIU' per per selezionare un elemento della lista.", + "\x07 Premere SU o GIë per selezionare un elemento della lista.", TEXT_STYLE_NORMAL }, { @@ -827,7 +827,7 @@ { 8, 17, - "\x07 Premere D per cancellare una nuova partizione.", + "\x07 Premere D per cancellare una partizione esistente.", TEXT_STYLE_NORMAL }, { @@ -861,7 +861,7 @@ { 6, 10, - "Setup formattera la partizione. Premere INVIO per continuare.", + "Setup formatter la partizione. Premere INVIO per continuare.", TEXT_STYLE_NORMAL }, { @@ -895,7 +895,7 @@ { 6, 9, - "Scegliere una cartella dove volete che ReactOS verr installato:", + "Scegliere una cartella dove volete che ReactOS sia installato:", TEXT_STYLE_NORMAL }, { @@ -1033,7 +1033,7 @@ { 8, 10, - "\x07 Premere SU o GIU' per per selezionare il tipo di tastiera desiderato.", + "\x07 Premere SU o GIë per selezionare il tipo di tastiera desiderato.", TEXT_STYLE_NORMAL }, { @@ -1079,13 +1079,13 @@ { 6, 8, - "Please select a layout to be installed by default.", + "Selezionare la nazionalit predefinita della tastiera.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Premere SU o GIU' per per selezionare il tipo di layout di tastiera", + "\x07 Premere SU o GIë per selezionare il tipo di tastiera", TEXT_STYLE_NORMAL }, { @@ -1097,13 +1097,13 @@ { 8, 13, - "\x07 Premere ESC per tornare allapagina precedente senza modificare", + "\x07 Premere ESC per tornare alla pagina precedente senza modificare", TEXT_STYLE_NORMAL }, { 8, 14, - " il layout di tastiera.", + " la nazionalit della tastiera.", TEXT_STYLE_NORMAL }, { @@ -1132,7 +1132,7 @@ { 6, 8, - "Setup prepara il computer per la copia dei file di ReactOS. ", + "Setup sta preparando il computer per la copia dei file di ReactOS. ", TEXT_STYLE_NORMAL }, { @@ -1167,7 +1167,7 @@ { 8, 19, - "\x07 Premere SU o GIU' per selezionare un filesystem.", + "\x07 Premere SU o GIë per selezionare un filesystem.", 0 }, { @@ -1336,12 +1336,12 @@ }, { //ERROR_LOAD_KBLAYOUT, - "Setup non ha potuto caricare l'elenco di tipi di layout di tastiera.\n", + "Setup non ha potuto caricare l'elenco delle nazionalit di tastiera.\n", "INVIO = Riavviare il computer" }, { //ERROR_WARN_PARTITION, - "Setup ha trovato che al meno un disco fisso contiene una tabella delle\n" + "Setup ha trovato che almeno un disco fisso contiene una tabella delle\n" "partizioni incompatibile che non pu essere gestita correttamente!\n" "\n" "Il creare o cancellare partizioni pu distruggere la tabella delle partizioni.\n" @@ -1360,7 +1360,7 @@ }, { //ERROR_DELETE_SPACE, - "Non si pu cancellare spazio di disco non partizionato!\n" + "Non si pu cancellare spazio in un disco non partizionato!\n" "\n" " * Premere un tasto qualsiasi per continuare.", NULL @@ -1377,7 +1377,7 @@ }, { //ERROR_UPDATE_KBSETTINGS, - "Setup non ha potuto aggiornare la configurazione di layout di tastiera.", + "Setup non ha potuto aggiornare la nazionalit della tastiera.", "INVIO = Riavviare il computer" }, { @@ -1460,7 +1460,7 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup non ha potuto aggiungere la codepage al registry.\n" + "Setup non ha potuto aggiungere la codepage al registro.\n" "INVIO = Riavviare il computer" }, { @@ -1470,7 +1470,7 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Impossibile aggiungere le disposizioni di tastiera al registry.\n" + "Impossibile aggiungere le nazionalit di tastiera al registro.\n" "INVIO = Riavviare il computer" }, { @@ -1597,11 +1597,11 @@ {STRING_CREATEPARTITION, " INVIO = Creare la partizione ESC = Annulla F3 = Esci"}, {STRING_PARTFORMAT, - "Questa partizione verrà formattata successivamente."}, + "Questa partizione sar formattata successivamente."}, {STRING_NONFORMATTEDPART, "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, {STRING_INSTALLONPART, - "Setup installerà ReactOS sulla partitione"}, + "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."}, {STRING_QUITCONTINUE, @@ -1621,11 +1621,11 @@ {STRING_FREEMEM, "Memoria libera"}, {STRING_REGHIVEUPDATE, - " Aggiornamento del registry hives..."}, + " Aggiornamento degli hives del registro..."}, {STRING_IMPORTFILE, " Importazione di %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Aggiornamento delle impostazioni del display nel registry..."}, + " Aggiornamento delle impostazioni dello schermo nel registro..."}, {STRING_LOCALESETTINGSUPDATE, " Aggiornamento delle impostazioni di regionalizzazione..."}, {STRING_KEYBOARDSETTINGSUPDATE, @@ -1639,9 +1639,9 @@ {STRING_CONSOLEFAIL1, "Impossibile aprire la console\n\n"}, {STRING_CONSOLEFAIL2, - "La causa piu' frequente di questo e' l'uso di una tastiera USB\n"}, + "La causa pi frequente di questo l'uso di una tastiera USB\n"}, {STRING_CONSOLEFAIL3, - "le tastiere USB non sono ancora supportate per intero\n"}, + "le tastiere USB non sono ancora completamente supportate\n"}, {STRING_FORMATTINGDISK, "Setup sta formattando il disco"}, {STRING_CHECKINGDISK, @@ -1693,7 +1693,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Aggiunta delle disposizioni di tastiera"}, + "Aggiunta delle nazionalit di tastiera"}, {0, 0} }; Modified: trunk/reactos/base/setup/vmwinst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/it… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -31,7 +31,7 @@ CAPTION "Installazione Video Driver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "The VMware(r) SVGA driver has been successfully installed. Please choose your favorite screen resolution:",-1,25,5,225,20 + LTEXT "Il driver SVGA di VMware(r) è stato installato con successo, ora scegliere la risoluzione desiderata:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -10,7 +10,7 @@ CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 122, 174, 78 - LTEXT "Selezionare un immagine da usare come sfondo per il tuo desktop:", + LTEXT "Selezionare un'immagine da usare come sfondo per il desktop:", IDC_STATIC, 8, 103, 174, 17 PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 122, 50, 15 PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 185, 50, 15 @@ -118,7 +118,7 @@ IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP @@ -126,7 +126,7 @@ COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilità", -1, 7, 67, 237, 97 - LTEXT "Alcuni programmi funzionano in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 + LTEXT "Alcuni programmi potrebbero funzionare in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni.", IDC_RESTART_RB, 14, 116, 224, 10 AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 224, 10 Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -233,7 +233,7 @@ BEGIN IDS_CPLNAME "Suoni e Dispositivi audio" IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." - IDS_NO_SOUND "(None)" + IDS_NO_SOUND "(nessuno)" 5825 "Errore del programma" 5826 "Chiudere il programma" @@ -248,9 +248,9 @@ 5835 "Menu popup" 5836 "Minimizzare" 5837 "Notifica nuova email" - 5838 "Iniziare avigazione" + 5838 "Iniziare navigazione" 5839 "Aprire programma" - 5840 "Stama completata" + 5840 "Stampa completata" 5841 "Ripristinare giù" 5842 "Ripristinare su" 5843 "Asterisco" Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Jun 19 01:15:59 2008 @@ -51,7 +51,7 @@ BEGIN LTEXT "I privilegi di amministrazione sono necessari per la maggior parte delle impostazioni seguenti.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Prestazioni", IDC_STATIC, 6, 18, 244, 50 - LTEXT "Le opzioni di controllo delle prestazioni definiscono come è usata lamemoria dalle applicazioni, ha un effetto sulla velocità del computer.", IDC_STATIC, 16, 29, 210, 17 + LTEXT "Queste opzioni definiscono come è usata la memoria dalle applicazioni, ha un effetto sulla velocità del computer.", IDC_STATIC, 16, 29, 210, 17 PUSHBUTTON "Impostazioni", IDC_PERFOR, 194, 48, 50, 14 GROUPBOX "Profili utente", IDC_STATIC, 6,75,244,48

1 0

[jimtabor] 34020: Path does not work and it locks up the system with out any debug information. I will try to have it ready before 0.3.5 is release.
by jimtabor＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: jimtabor Date: Wed Jun 18 20:47:57 2008 New Revision: 34020 URL: http://svn.reactos.org/svn/reactos?rev=34020&view=rev Log: Path does not work and it locks up the system with out any debug information. I will try to have it ready before 0.3.5 is release. Modified: trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] Wed Jun 18 20:47:57 2008 @@ -1,5 +1,35 @@ #ifndef _WIN32K_PATH_H #define _WIN32K_PATH_H + +typedef struct _PATH +{ + BASEOBJECT BaseObject; + + RECTFX rcfxBoundBox; + POINTFX ptfxSubPathStart; + + // Things to convert from: + DWORD state; + POINT *pPoints; + BYTE *pFlags; + int numEntriesUsed; + int numEntriesAllocated; + BOOL newStroke; +} PATH, *PPATH; + +typedef struct _EPATHOBJ +{ + PATHOBJ po; + PPATH pPath; +} EPATHOBJ, *PEPATHOBJ; + +#define PATH_AllocPath() ((PPATH) GDIOBJ_AllocObj(GDIObjType_PATH_TYPE)) +#define PATH_AllocPathWithHandle() ((PPATH) GDIOBJ_AllocObjWithHandle (GDI_OBJECT_TYPE_PATH)) +#define PATH_FreePath(pPath) GDIOBJ_FreeObj((POBJ)pPath, GDIObjType_PATH_TYPE) +#define PATH_FreePathByHandle(hPath) GDIOBJ_FreeObjbyHandle((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH) +#define PATH_LockPath(hPath) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH)) +#define PATH_UnlockPath(pPath) GDIOBJ_UnlockObjByPtr((POBJ)pPath) + #define PATH_IsPathOpen(path) ((path).state==PATH_Open) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Jun 18 20:47:57 2008 @@ -46,7 +46,7 @@ {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RGN */ {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SURFACE */ {1, sizeof(CLIENTOBJ), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... */ - {0, 0, TAG_PATH, NULL}, /* 07 PATH, unused */ + {1, sizeof(PATH), TAG_PATH, GDI_CleanupDummy}, /* 07 PATH */ {1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ {1, sizeof(COLORSPACE), TAG_ICMLCS, GDI_CleanupDummy}, /* 09 ICMLCS, */ {1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */

1 0

[jimtabor] 34019: Set default miter limit.
by jimtabor＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: jimtabor Date: Wed Jun 18 20:29:01 2008 New Revision: 34019 URL: http://svn.reactos.org/svn/reactos?rev=34019&view=rev Log: Set default miter limit. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed Jun 18 20:29:01 2008 @@ -2515,6 +2515,7 @@ TextIntRealizeFont(Dc_Attr->hlfntNew); NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); + NewDC->DcLevel.laPath.eMiterLimit = 10.0; DC_UnlockDc(NewDC);

1 0

[dchapyshev] 34018: - Fix typos
by dchapyshev＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: dchapyshev Date: Wed Jun 18 14:33:55 2008 New Revision: 34018 URL: http://svn.reactos.org/svn/reactos?rev=34018&view=rev Log: - Fix typos Modified: trunk/reactos/drivers/network/acd/include/acdapi.h trunk/reactos/drivers/network/acd/rasacd.rc Modified: trunk/reactos/drivers/network/acd/include/acdapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/includ… ============================================================================== --- trunk/reactos/drivers/network/acd/include/acdapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/acd/include/acdapi.h [iso-8859-1] Wed Jun 18 14:33:55 2008 @@ -8,4 +8,9 @@ * 25/05/2008 Created */ +#ifndef _ACDAPI_H +#define _ACDAPI_H + #define FILE_DEVICE_RASACD 0xf1 + +#endif /* _ACDAPI_H */ Modified: trunk/reactos/drivers/network/acd/rasacd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/rasacd… ============================================================================== --- trunk/reactos/drivers/network/acd/rasacd.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/acd/rasacd.rc [iso-8859-1] Wed Jun 18 14:33:55 2008 @@ -1,5 +1,3 @@ -/* $Id: ndis.rc 21293 2006-03-11 23:55:37Z jimtabor $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "NDIS Library\0" #define REACTOS_STR_INTERNAL_NAME "ndis\0"

1 0

[mkupfer] 34017: Jeffrey Morlan <mrnobo1024 AT yahoo DOT com> - Patch for Optimizations of TextIntGetTextExtentPoint - See issue #3366 for more details.
by mkupfer＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: mkupfer Date: Wed Jun 18 14:15:37 2008 New Revision: 34017 URL: http://svn.reactos.org/svn/reactos?rev=34017&view=rev Log: Jeffrey Morlan <mrnobo1024 AT yahoo DOT com> - Patch for Optimizations of TextIntGetTextExtentPoint - See issue #3366 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed Jun 18 14:15:37 2008 @@ -3452,10 +3452,13 @@ PFONTGDI FontGDI; FT_Face face; FT_GlyphSlot glyph; + FT_Glyph realglyph; INT error, n, glyph_index, i, previous; ULONGLONG TotalWidth = 0; FT_CharMap charmap, found = NULL; BOOL use_kerning; + FT_Render_Mode RenderMode; + BOOLEAN Render; FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -3465,6 +3468,7 @@ *Fit = 0; } + IntLockFreeType; if (face->charmap == NULL) { DPRINT("WARNING: No charmap selected!\n"); @@ -3486,23 +3490,25 @@ DPRINT1("WARNING: Could not find desired charmap!\n"); } - IntLockFreeType; error = FT_Set_Charmap(face, found); - IntUnLockFreeType; if (error) { DPRINT1("WARNING: Could not set the charmap!\n"); } } - IntLockFreeType; + Render = IntIsFontRenderingEnabled(); + if (Render) + RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); + else + RenderMode = FT_RENDER_MODE_MONO; + error = FT_Set_Pixel_Sizes(face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - IntUnLockFreeType; if (error) { DPRINT1("Error in setting pixel sizes: %u\n", error); @@ -3513,27 +3519,36 @@ for (i = 0; i < Count; i++) { - IntLockFreeType; glyph_index = FT_Get_Char_Index(face, *String); - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - IntUnLockFreeType; - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - } - glyph = face->glyph; + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + { + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + break; + } + + glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + break; + } + } /* retrieve kerning distance */ if (use_kerning && previous && glyph_index) { FT_Vector delta; - IntLockFreeType; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - IntUnLockFreeType; TotalWidth += delta.x; } - TotalWidth += glyph->advance.x; + TotalWidth += realglyph->advance.x >> 10; if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) { @@ -3547,6 +3562,7 @@ previous = glyph_index; String++; } + IntUnLockFreeType; Size->cx = (TotalWidth + 32) >> 6; Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight);

1 0

[gedmurphy] 34016: The start of a GUI to make running the Wine API tests a pleasure rather than a pain. This will plug into the new testing framework for the Wine tests, which will also publish it's results on a live website (if I can get Colin to help me with the web stuff ; ) ) This is the time to pester me with requests / ideas anyone may have.
by gedmurphy＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: gedmurphy Date: Wed Jun 18 14:10:39 2008 New Revision: 34016 URL: http://svn.reactos.org/svn/reactos?rev=34016&view=rev Log: The start of a GUI to make running the Wine API tests a pleasure rather than a pain. This will plug into the new testing framework for the Wine tests, which will also publish it's results on a live website (if I can get Colin to help me with the web stuff ;) ) This is the time to pester me with requests / ideas anyone may have. Added: trunk/rostests/winetests/GUI/ trunk/rostests/winetests/GUI/WinetestsGUI.rc (with props) trunk/rostests/winetests/GUI/browsewnd.c (with props) trunk/rostests/winetests/GUI/lang/ trunk/rostests/winetests/GUI/lang/en-US.rc (with props) trunk/rostests/winetests/GUI/mainwnd.c (with props) trunk/rostests/winetests/GUI/misc.c (with props) trunk/rostests/winetests/GUI/precomp.h (with props) trunk/rostests/winetests/GUI/res/ trunk/rostests/winetests/GUI/resource.h (with props) trunk/rostests/winetests/GUI/rsrc.rc (with props) Added: trunk/rostests/winetests/GUI/WinetestsGUI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/WinetestsGU… ============================================================================== --- trunk/rostests/winetests/GUI/WinetestsGUI.rc (added) +++ trunk/rostests/winetests/GUI/WinetestsGUI.rc [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,11 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Character Map\0" +#define REACTOS_STR_INTERNAL_NAME "charmap\0" +#define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" +//#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/rostests/winetests/GUI/WinetestsGUI.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c (added) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,224 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: browse dialog implementation + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include <precomp.h> + +#define DLL_SEARCH_DIR L"\\Debug\\testlibs\\*" + +static INT +GetNumberOfDllsInFolder(LPWSTR lpFolder) +{ + HANDLE hFind; + WIN32_FIND_DATAW findFileData; + INT numFiles = 0; + + hFind = FindFirstFileW(lpFolder, + &findFileData); + if (hFind == INVALID_HANDLE_VALUE) + { + DisplayError(GetLastError()); + return 0; + } + + do + { + if (!(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + numFiles++; + } + } while (FindNextFile(hFind, &findFileData) != 0); + + return numFiles; +} + +static INT +GetListOfTestDlls(PMAIN_WND_INFO pInfo) +{ + HANDLE hFind; + WIN32_FIND_DATAW findFileData; + WCHAR szDllPath[MAX_PATH]; + LPWSTR ptr; + INT numFiles = 0; + INT len; + + len = GetCurrentDirectory(MAX_PATH, szDllPath); + if (!len) return 0; + + wcsncat(szDllPath, DLL_SEARCH_DIR, MAX_PATH - (len + 1)); + + numFiles = GetNumberOfDllsInFolder(szDllPath); + if (!numFiles) return 0; + + pInfo->lpDllList = HeapAlloc(GetProcessHeap(), 0, numFiles * (MAX_PATH * sizeof(WCHAR))); + if (!pInfo->lpDllList) + return 0; + + hFind = FindFirstFileW(szDllPath, + &findFileData); + if (hFind == INVALID_HANDLE_VALUE) + { + DisplayError(GetLastError()); + HeapFree(GetProcessHeap(), 0, pInfo->lpDllList); + return 0; + } + + /* remove the glob */ + ptr = wcschr(szDllPath, L'*'); + if (ptr) + *ptr = L'\0'; + + /* don't mod our base pointer */ + ptr = pInfo->lpDllList; + + do + { + if (!(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + //MessageBoxW(NULL, findFileData.cFileName, NULL, 0); + + /* set the path */ + wcscpy(ptr, szDllPath); + + /* tag the file onto the path */ + len = MAX_PATH - (wcslen(ptr) + 1); + wcsncat(ptr, findFileData.cFileName, len); + + /* move the pointer along by MAX_PATH */ + ptr += MAX_PATH; + } + } while (FindNextFile(hFind, &findFileData) != 0); + + return numFiles; +} + +static HTREEITEM +InsertIntoTreeView(HWND hTreeView, + HTREEITEM hRoot, + LPWSTR lpLabel, + LPWSTR lpDllPath, + INT Image) +{ + TV_ITEM tvi; + TV_INSERTSTRUCT tvins; + + ZeroMemory(&tvi, sizeof(tvi)); + ZeroMemory(&tvins, sizeof(tvins)); + + tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvi.pszText = lpLabel; + tvi.cchTextMax = lstrlen(lpLabel); + tvi.lParam = (LPARAM)lpDllPath; + tvi.iImage = Image; + tvi.iSelectedImage = Image; + + //tvi.stateMask = TVIS_OVERLAYMASK; + + tvins.item = tvi; + tvins.hParent = hRoot; + + return TreeView_InsertItem(hTreeView, &tvins); +} + +static VOID +PopulateTreeView(PMAIN_WND_INFO pInfo) +{ + HWND hTreeView; + HTREEITEM hRoot; + HBITMAP hComp; + TCHAR ComputerName[MAX_PATH]; + DWORD dwSize = MAX_PATH; + INT RootImage; + + hTreeView = GetDlgItem(pInfo->hBrowseDlg, IDC_TREEVIEW); + + (void)TreeView_DeleteAllItems(hTreeView); + + /* insert the root item into the tree */ + hRoot = InsertIntoTreeView(hTreeView, + NULL, + ComputerName, + NULL, + 0);//RootImage); +} + +static VOID +PopulateTestList(PMAIN_WND_INFO pInfo) +{ + INT numFiles; + + if ((numFiles = GetListOfTestDlls(pInfo))) + { + PopulateTreeView(pInfo); + } +} + + +static BOOL +OnInitBrowseDialog(HWND hDlg, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + + pInfo = (PMAIN_WND_INFO)lParam; + + pInfo->hBrowseDlg = hDlg; + + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + PopulateTestList(pInfo); + + return TRUE; +} + + +BOOL CALLBACK +BrowseDlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + + /* Get the window context */ + pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && Message != WM_INITDIALOG) + { + goto HandleDefaultMessage; + } + + switch(Message) + { + case WM_INITDIALOG: + return OnInitBrowseDialog(hDlg, lParam); + + case WM_COMMAND: + { + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + HeapFree(GetProcessHeap(), 0, pInfo->lpDllList); + pInfo->lpDllList = NULL; + + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + + break; + } + +HandleDefaultMessage: + default: + return FALSE; + } + + return FALSE; +} Propchange: trunk/rostests/winetests/GUI/browsewnd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/lang/en-US.… ============================================================================== --- trunk/rostests/winetests/GUI/lang/en-US.rc (added) +++ trunk/rostests/winetests/GUI/lang/en-US.rc [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,35 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_WINETESTGUI DIALOGEX 0, 0, 293, 262 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Winetest GUI" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,236,241,50,14,WS_GROUP + CONTROL "",IDC_LIST,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,69,279,103 + EDITTEXT IDC_OUTPUT,7,175,279,62,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY + COMBOBOX IDC_TESTSELECTION,27,12,205,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Test:",IDC_STATIC,6,14,18,8 + PUSHBUTTON "Browse...",IDC_BROWSE,236,11,50,14 + PUSHBUTTON "Run",IDC_RUN,236,30,50,14 + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,28,30,204,14 + LTEXT "Runs:",IDC_STATIC,8,53,20,8 + LTEXT "?",IDC_NUMRUNS,33,53,8,8 + LTEXT "Errors:",IDC_STATIC,55,53,23,8 + LTEXT "?",IDC_NUMERRORS,85,53,8,8 + LTEXT "Failures:",IDC_STATIC,107,53,28,8 + LTEXT "?",IDC_NUMFAILURES,141,53,8,8 + PUSHBUTTON "Stop",IDC_STOP,236,49,50,14 + CONTROL "Run on start",IDC_RUNONSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,52,56,10 + LTEXT "status bar",IDC_STATUS,7,244,210,8 +END + +IDD_TESTBROWSER DIALOGEX 0, 0, 259, 250 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Test hierarchy" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "Select", IDC_SELECT, 202, 7, 50, 14 + CONTROL "", IDC_TREEVIEW, "SysTreeView32", WS_BORDER | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT, 7, 7, 189, 236 + PUSHBUTTON "Close", IDOK, 202, 34, 50, 14 +END Propchange: trunk/rostests/winetests/GUI/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/mainwnd.c?r… ============================================================================== --- trunk/rostests/winetests/GUI/mainwnd.c (added) +++ trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,155 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: main dialog implementation + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include <precomp.h> + +HINSTANCE hInstance; + + + + +static BOOL +OnInitMainDialog(HWND hDlg, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + //HMENU hSysMenu; + LPWSTR lpAboutText; + + pInfo = (PMAIN_WND_INFO)lParam; + + /* Initialize the main window context */ + pInfo->hMainWnd = hDlg; + + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + pInfo->hSmIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (pInfo->hSmIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)pInfo->hSmIcon); + } + + pInfo->hBgIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); + if (pInfo->hBgIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)pInfo->hBgIcon); + } + + return TRUE; +} + + +static BOOL CALLBACK +MainDlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + + /* Get the window context */ + pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && Message != WM_INITDIALOG) + { + goto HandleDefaultMessage; + } + + switch(Message) + { + case WM_INITDIALOG: + return OnInitMainDialog(hDlg, lParam); + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_BROWSE: + DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_TESTBROWSER), + hDlg, + (DLGPROC)BrowseDlgProc, + (LPARAM)pInfo); + + break; + + case IDOK: + EndDialog(hDlg, 0); + break; + } + } + break; + + case WM_CLOSE: + if (pInfo->hSmIcon) + DestroyIcon(pInfo->hSmIcon); + if (pInfo->hBgIcon) + DestroyIcon(pInfo->hBgIcon); + EndDialog(hDlg, 0); + break; + +HandleDefaultMessage: + default: + return FALSE; + } + + return FALSE; +} + + +INT WINAPI +wWinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR Cmd, + int iCmd) +{ + INITCOMMONCONTROLSEX iccx; + PMAIN_WND_INFO pInfo; + INT Ret = 1; + + hInstance = hInst; + + ZeroMemory(&iccx, sizeof(INITCOMMONCONTROLSEX)); + iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwICC = ICC_TAB_CLASSES; + InitCommonControlsEx(&iccx); + + pInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(MAIN_WND_INFO)); + if (pInfo) + { + Ret = (DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_WINETESTGUI), + NULL, + (DLGPROC)MainDlgProc, + (LPARAM)pInfo) == IDOK); + + HeapFree(GetProcessHeap(), 0, pInfo); + + } + + return Ret; +} Propchange: trunk/rostests/winetests/GUI/mainwnd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c (added) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,260 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: miscallanous functions + * COPYRIGHT: Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.org> + * Copyright 2006 - 2008 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include <precomp.h> + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + return -1; + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = (WCHAR*) LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + +INT +AllocAndLoadString(OUT LPWSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(TCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadStringW(hInst, uID, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} + +DWORD +LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPWSTR *lpTarget, + ...) +{ + DWORD Ret = 0; + LPTSTR lpFormat; + va_list lArgs; + + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) > 0) + { + va_start(lArgs, lpTarget); + /* let's use Format to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPTSTR)lpTarget, + 0, + &lArgs); + va_end(lArgs); + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} + +BOOL +StatusBarLoadAndFormatString(IN HWND hStatusBar, + IN INT PartId, + IN HINSTANCE hInstance, + IN UINT uID, + ...) +{ + BOOL Ret = FALSE; + LPWSTR lpFormat, lpStr; + va_list lArgs; + + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) > 0) + { + va_start(lArgs, uID); + /* let's use FormatMessage to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (VOID*)&lpStr, + 0, + &lArgs); + va_end(lArgs); + + if (lpStr != NULL) + { + Ret = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)lpStr); + LocalFree((HLOCAL)lpStr); + } + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} + +BOOL +StatusBarLoadString(IN HWND hStatusBar, + IN INT PartId, + IN HINSTANCE hInstance, + IN UINT uID) +{ + BOOL Ret = FALSE; + LPWSTR lpStr; + + if (AllocAndLoadString(&lpStr, + hInstance, + uID) > 0) + { + Ret = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)lpStr); + LocalFree((HLOCAL)lpStr); + } + + return Ret; +} + + +INT +GetTextFromEdit(OUT LPWSTR lpString, + IN HWND hDlg, + IN UINT Res) +{ + INT len = GetWindowTextLengthW(GetDlgItem(hDlg, Res)); + if(len > 0) + { + GetDlgItemTextW(hDlg, + Res, + lpString, + len + 1); + } + else + lpString = NULL; + + return len; +} + +VOID DisplayError(INT err) +{ + LPWSTR lpMsgBuf = NULL; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + err, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (VOID*)&lpMsgBuf, + 0, + NULL ); + + MessageBoxW(NULL, lpMsgBuf, L"Error!", MB_OK | MB_ICONERROR); + + LocalFree(lpMsgBuf); +} + +VOID DisplayString(LPWSTR lpMsg) +{ + MessageBoxW(NULL, lpMsg, L"Note!", MB_ICONEXCLAMATION|MB_OK); +} + + + +HIMAGELIST +InitImageList(UINT StartResource, + UINT EndResource, + UINT Width, + UINT Height) +{ + HBITMAP hBitmap; + HIMAGELIST hImageList; + UINT i; + INT Ret; + + /* Create the toolbar icon image list */ + hImageList = ImageList_Create(Width, + Height, + ILC_MASK | ILC_COLOR24, + EndResource - StartResource, + 0); + if (hImageList == NULL) + return NULL; + + /* Add all icons to the image list */ + for (i = StartResource; i <= EndResource; i++) + { + hBitmap = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + Width, + Height, + LR_LOADTRANSPARENT); + if (hBitmap == NULL) + return NULL; + + Ret = ImageList_AddMasked(hImageList, + hBitmap, + RGB(255, 0, 128)); + if (Ret == -1) + return NULL; + + DeleteObject(hBitmap); + } + + return hImageList; +} Propchange: trunk/rostests/winetests/GUI/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h (added) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,39 @@ +#ifndef __WINETESTGUI_PRECOMP_H +#define __WINETESTGUI_PRECOMP_H + +#include <stdio.h> +#include <stdlib.h> +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +extern HINSTANCE hInstance; + +typedef struct _MAIN_WND_INFO +{ + HWND hMainWnd; + HWND hBrowseDlg; + HWND hStatus; + int nCmdShow; + + HICON hSmIcon; + HICON hBgIcon; + + INT SelectedItem;/* selection number in the list view */ + BOOL bDlgOpen; + BOOL bInMenuLoop; + BOOL bIsUserAnAdmin; + + LPWSTR lpDllList; + +} MAIN_WND_INFO, *PMAIN_WND_INFO; + + +/* browsewnd.c */ +BOOL CALLBACK BrowseDlgProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); + +/* misc.c */ +VOID DisplayString(LPWSTR lpMsg); +VOID DisplayError(INT err); + +#endif /* __WINETESTGUI_PRECOMP_H */ Propchange: trunk/rostests/winetests/GUI/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/resource.h?… ============================================================================== --- trunk/rostests/winetests/GUI/resource.h (added) +++ trunk/rostests/winetests/GUI/resource.h [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,24 @@ +#define IDD_WINETESTGUI 102 +#define IDD_TESTBROWSER 103 +#define IDM_ABOUT 104 +#define IDM_EXIT 105 +#define IDI_ICON 107 +#define IDI_SMALL 108 +#define IDC_DELETE 109 +#define IDR_MAINFRAME 128 +#define IDC_LIST 1000 +#define IDC_OUTPUT 1001 +#define IDC_TESTSELECTION 1002 +#define IDC_BROWSE 1003 +#define IDC_RUN 1004 +#define IDC_PROGRESS 1005 +#define IDC_NUMRUNS 1006 +#define IDC_NUMERRORS 1007 +#define IDC_NUMFAILURES 1008 +#define IDC_STOP 1010 +#define IDC_CHECK2 1011 +#define IDC_RUNONSTART 1011 +#define IDC_STATUS 1012 +#define IDC_SELECT 1020 +#define IDC_TREEVIEW 1021 +#define IDC_STATIC -1 Propchange: trunk/rostests/winetests/GUI/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/rsrc.rc?rev… ============================================================================== --- trunk/rostests/winetests/GUI/rsrc.rc (added) +++ trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,25 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON "res/charmap.ico" + +//#include "lang/bg-BG.rc" +//#include "lang/ca-ES.rc" +//#include "lang/cs-CZ.rc" +#include "lang/en-US.rc" +//#include "lang/de-DE.rc" +//#include "lang/es-ES.rc" +//#include "lang/fr-FR.rc" +//#include "lang/id-ID.rc" +//#include "lang/it-IT.rc" +//#include "lang/ko-KO.rc" +//#include "lang/lt-LT.rc" +//#include "lang/nl-NL.rc" +//#include "lang/pl-PL.rc" +//#include "lang/pt-BR.rc" +//#include "lang/sk-SK.rc" +//#include "lang/uk-UA.rc" +//#include "lang/ru-RU.rc" +//#include "lang/el-GR.rc" Propchange: trunk/rostests/winetests/GUI/rsrc.rc ------------------------------------------------------------------------------ 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