Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[dchapyshev] 33216: - Implement layouts indicator
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 11:00:51 2008 New Revision: 33216 URL: http://svn.reactos.org/svn/reactos?rev=33216&view=rev Log: - Implement layouts indicator Modified: trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.rbuild [iso-8859-1] Thu May 1 11:00:51 2008 @@ -10,6 +10,7 @@ <library>user32</library> <library>comctl32</library> <library>msvcrt</library> + <library>gdi32</library> <file>input.c</file> <file>settings.c</file> <file>keysettings.c</file> Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Thu May 1 11:00:51 2008 @@ -13,6 +13,7 @@ #include "input.h" static HWND MainDlgWnd; +static HIMAGELIST hImgList; typedef struct { @@ -23,6 +24,67 @@ TCHAR IndName[MAX_PATH]; } LAYOUT_ITEM, *LPLAYOUT_ITEM; + +static HICON +CreateLayoutIcon(LPTSTR szInd) +{ + HDC hdc, hdcsrc; + HBITMAP hBitmap, hBmpNew, hBmpOld; + RECT rect; + DWORD bkColor, bkText; + HFONT hFont = NULL; + ICONINFO IconInfo; + HICON hIcon = NULL; + + hdcsrc = GetDC(NULL); + hdc = CreateCompatibleDC(hdcsrc); + hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); + ReleaseDC(NULL, hdcsrc); + + if (hdc && hBitmap) + { + hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); + if (hBmpNew) + { + hBmpOld = SelectObject(hdc, hBitmap); + rect.right = 16; + rect.left = 0; + rect.bottom = 16; + rect.top = 0; + + bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); + bkText = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + + ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); + + hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); + + SelectObject(hdc, hFont); + DrawText(hdc, _tcsupr(szInd), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); + SelectObject(hdc, hBmpNew); + PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); + SelectObject(hdc, hBmpOld); + + IconInfo.hbmColor = hBitmap; + IconInfo.hbmMask = hBmpNew; + IconInfo.fIcon = TRUE; + + hIcon = CreateIconIndirect(&IconInfo); + + DeleteObject(hBmpNew); + DeleteObject(hBmpOld); + DeleteObject(hFont); + } + } + + DeleteDC(hdc); + DeleteObject(hBitmap); + + return hIcon; +} + BOOL GetLayoutName(LPCTSTR lcid, LPTSTR name) { @@ -55,25 +117,20 @@ ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + column.fmt = LVCFMT_LEFT; column.iSubItem = 0; - column.pszText = NULL; - column.cx = 25; - (VOID) ListView_InsertColumn(hList, 0, &column); - - column.fmt = LVCFMT_LEFT; - column.iSubItem = 1; LoadString(hApplet, IDS_LANGUAGE, szBuf, sizeof(szBuf) / sizeof(TCHAR)); column.pszText = szBuf; - column.cx = 160; - (VOID) ListView_InsertColumn(hList, 1, &column); + column.cx = 175; + (VOID) ListView_InsertColumn(hList, 0, &column); column.fmt = LVCFMT_RIGHT; - column.cx = 145; - column.iSubItem = 2; + column.cx = 155; + column.iSubItem = 1; LoadString(hApplet, IDS_LAYOUT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); column.pszText = szBuf; - (VOID) ListView_InsertColumn(hList, 2, &column); + (VOID) ListView_InsertColumn(hList, 1, &column); } static VOID @@ -85,9 +142,9 @@ DWORD dwIndex = 0, dwType, dwSize; LV_ITEM item = {0}; HWND hList = GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); - INT i; - - item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + INT i, imgIndex; + + item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) @@ -103,6 +160,7 @@ GetLocaleInfo(lItem.LangId, LOCALE_SISO639LANGNAME, (LPTSTR)szBuf, sizeof(szBuf) / sizeof(TCHAR)); lstrcpy(lItem.IndName, _tcsupr(szBuf)); + imgIndex = ImageList_AddIcon(hImgList, CreateLayoutIcon(lItem.IndName)); GetLocaleInfo(lItem.LangId, LOCALE_SLANGUAGE, (LPTSTR)szBuf, sizeof(szBuf) / sizeof(TCHAR)); lstrcpy(lItem.LangName, szBuf); @@ -124,13 +182,13 @@ GetLayoutName(szPreload, lItem.LayoutName); - item.pszText = lItem.IndName; + item.pszText = lItem.LangName; item.iItem = (INT) dwIndex; item.lParam = (LPARAM)_ttoi(lItem.ValName); + item.iImage = imgIndex; i = ListView_InsertItem(hList, &item); - ListView_SetItemText(hList, i, 1, lItem.LangName); - ListView_SetItemText(hList, i, 2, lItem.LayoutName); + ListView_SetItemText(hList, i, 1, lItem.LayoutName); dwIndex++; @@ -147,8 +205,11 @@ VOID UpdateLayoutsList(VOID) { + (VOID) ImageList_Destroy(hImgList); (VOID) ListView_DeleteAllItems(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST)); + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); InitLangList(MainDlgWnd); + (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); } static VOID @@ -204,7 +265,9 @@ AddListColumn(hwndDlg); (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVS_EX_FULLROWSELECT); + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); InitLangList(hwndDlg); + (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); } @@ -246,6 +309,9 @@ break; } break; + case WM_DESTROY: + (VOID) ImageList_Destroy(hImgList); + break; } return FALSE;

1 0

[dchapyshev] 33215: - Implement deleting layouts
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 10:25:12 2008 New Revision: 33215 URL: http://svn.reactos.org/svn/reactos?rev=33215&view=rev Log: - Implement deleting layouts Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Êàêâî å òîâà?" IDS_LANGUAGE "Åçèê" IDS_LAYOUT "Êëàâèàòóðíà ïîäðåäáà" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -86,6 +86,8 @@ IDS_WHATS_THIS "Was ist das?" IDS_LANGUAGE "Sprache" IDS_LAYOUT "Tastaturlayout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Ôé åßíáé áõôü;" IDS_LANGUAGE "Ãëþóóá" IDS_LAYOUT "ÄéÜôáîç ðëçêôñïëïãßïõ" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "What's This?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -90,6 +90,8 @@ IDS_WHATS_THIS "¿Qué es esto?" IDS_LANGUAGE "Idioma" IDS_LAYOUT "Distribución del teclado" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Qu'est-ce que c'est ?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END /* FIXME : To improve/complete */ Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Cosa è questo?" IDS_LANGUAGE "Lingua" IDS_LAYOUT "Disposizione tastiera" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -92,6 +92,8 @@ IDS_WHATS_THIS "Co to jest?" IDS_LANGUAGE "Jêzyk" IDS_LAYOUT "Uk³ad klawiatury" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "×òî ýòî?" IDS_LANGUAGE "ßçûê ââîäà" IDS_LAYOUT "Ðàñêëàäêà" + IDS_REM_QUESTION "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü âûáðàííóþ ðàñêëàäêó êëàâèàòóðû?" + IDS_CONFIRMATION "Ïîäòâåðæäåíèå" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -89,6 +89,8 @@ IDS_WHATS_THIS "Èo je toto?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -94,6 +94,8 @@ IDS_WHATS_THIS "Ùî öå?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Thu May 1 10:25:12 2008 @@ -49,6 +49,8 @@ #define IDS_WHATS_THIS 7 #define IDS_LANGUAGE 8 #define IDS_LAYOUT 9 +#define IDS_REM_QUESTION 10 +#define IDS_CONFIRMATION 11 /* Layouts */ #define IDS_US_LAYOUT 5000 Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Thu May 1 10:25:12 2008 @@ -126,6 +126,7 @@ item.pszText = lItem.IndName; item.iItem = (INT) dwIndex; + item.lParam = (LPARAM)_ttoi(lItem.ValName); i = ListView_InsertItem(hList, &item); ListView_SetItemText(hList, i, 1, lItem.LangName); @@ -153,12 +154,39 @@ static VOID DeleteLayout(VOID) { - INT iIndex; - - iIndex = (INT) SendMessage(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + INT iIndex, LayoutNum; + LVITEM item; + HKEY hKey; + HWND hLayoutList = GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST); + TCHAR szLayoutNum[10 + 1], szTitle[MAX_PATH], szConf[MAX_PATH]; + + iIndex = (INT) SendMessage(hLayoutList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + if (iIndex != -1) { - MessageBox(0, _T("Not implemented!"), NULL, MB_OK); + LoadString(hApplet, IDS_REM_QUESTION, szConf, sizeof(szConf) / sizeof(TCHAR)); + LoadString(hApplet, IDS_CONFIRMATION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); + + if (MessageBox(MainDlgWnd, szConf, szTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) + { + ZeroMemory(&item, sizeof(LVITEM)); + + item.mask = LVIF_PARAM; + item.iItem = iIndex; + + (VOID) ListView_GetItem(hLayoutList, &item); + LayoutNum = (INT) item.lParam; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) + { + _ultot(LayoutNum, szLayoutNum, 10); + if (RegDeleteValue(hKey, szLayoutNum) == ERROR_SUCCESS) + { + UpdateLayoutsList(); + } + } + RegCloseKey(hKey); + } } }

1 0

[gedmurphy] 33214: DECLSPEC_NOVTABLE isn't supported by gcc
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 09:56:54 2008 New Revision: 33214 URL: http://svn.reactos.org/svn/reactos?rev=33214&view=rev Log: DECLSPEC_NOVTABLE isn't supported by gcc Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Thu May 1 09:56:54 2008 @@ -227,8 +227,8 @@ #define interface struct #define DECLARE_INTERFACE(iface) interface iface #define DECLARE_INTERFACE_(iface,ibase) interface iface : public ibase -#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface -#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public baseiface +#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) iface +#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) iface : public baseiface #define BEGIN_INTERFACE #define END_INTERFACE

1 0

[gedmurphy] 33213: - Change the ... gcc specific statement - Seperators with MENUEX now need the full definition (although the docs don't say this yet) - explorer_new now builds with msvc9. Doesn't link yet though...
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 09:52:11 2008 New Revision: 33213 URL: http://svn.reactos.org/svn/reactos?rev=33213&view=rev Log: - Change the ... gcc specific statement - Seperators with MENUEX now need the full definition (although the docs don't say this yet) - explorer_new now builds with msvc9. Doesn't link yet though... Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/startmnu.c Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "Íà&ñòðîéêè", IDM_SETTINGS BEGIN MENUITEM "&Êðèëî çà óïðàâëåíèå", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Ñèãóðíîñò...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Ìðåæîâè âðúçêè", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Ïå÷àòà÷è è ôàêñîâå", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&Òúðñåíå", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Ïîìîù è ïîääðúæêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Èçïúëíåíèå...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "&Einstellungen", IDM_SETTINGS BEGIN MENUITEM "S&ystemsteuerung", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sicherheit...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Netzwerkverbindungen", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Drucker und Faxgeräte", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&Suche", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Hilfe und Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "A&usführen...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "&Settings", IDM_SETTINGS BEGIN MENUITEM "&Control Panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Security...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Network Connections", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Printers and Faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "Sear&ch", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Help and Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Run...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -37,7 +37,7 @@ POPUP "&Configuración", IDM_SETTINGS BEGIN MENUITEM "&Panel de Control", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Seguridad...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Conexiones de red", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Impresoras y faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -45,7 +45,7 @@ END POPUP "Sear&ch", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Ayuda y soporte técnico", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Ejecutar...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "Paramètre&s", IDM_SETTINGS BEGIN MENUITEM "Panneau de &contrôle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sécurité...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Co&nnexions au réseau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&Chercher", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Exécuter...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "&Impostazioni", IDM_SETTINGS BEGIN MENUITEM "&Pannello di controllo", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sicurezza...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Connessioni di rete", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Fax e stampanti", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "Cerca", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Aiuto e supporto", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Esegui...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -31,7 +31,7 @@ POPUP "Us&tawienia", IDM_SETTINGS BEGIN MENUITEM "P&anel sterowania", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Za&bezpieczenia...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "P&o³¹czenia sieciowe", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Drukarki i faksy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -39,7 +39,7 @@ END POPUP "&Szukaj", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Po&moc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Uruchom...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -31,7 +31,7 @@ POPUP "&Íàñòðîéêè", IDM_SETTINGS BEGIN MENUITEM "&Ïàíåëü óïðàâëåíèÿ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Áåçîïàñíîñòü...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Ñåòåâûå ïîäêëþ÷åíèÿ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Ïðèíòåðû è ôàêñû", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -39,7 +39,7 @@ END POPUP "Ï&îèñê", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Ñï&ðàâêà è ïîääåðæêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Çàïóñ&ê...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "Nastav&enia", IDM_SETTINGS BEGIN MENUITEM "&Ovládaci panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Zabezpeèenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Sieové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Tlaèiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&H¾ada", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Pomoc a technická podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Sp&usti...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -37,7 +37,7 @@ POPUP "Í&àñòðîéêà", IDM_SETTINGS BEGIN MENUITEM "Ï&àíåëü êåðóâàííÿ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Áåçïåêà...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Ìåðåæí³ ï³äêëþ÷åííÿ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Ïð&èíòåðè é ôàêñè", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -45,7 +45,7 @@ END POPUP "Ç&íàéòè", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Äîâ³äêà òà ï³äòðèìêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Çàïóñê ïðî&ãðàìè...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Thu May 1 09:52:11 2008 @@ -100,35 +100,31 @@ if (uiCmdId != 0) { - switch (uiCmdId) - { - case ID_SHELL_CMD_FIRST ... ID_SHELL_CMD_LAST: + if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) + { + CMINVOKECOMMANDINFO cmici = {0}; + CHAR szDir[MAX_PATH]; + + /* Setup and invoke the shell command */ + cmici.cbSize = sizeof(cmici); + cmici.hwnd = hWndOwner; + cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); + cmici.nShow = SW_NORMAL; + + /* FIXME: Support Unicode!!! */ + if (SHGetPathFromIDListA(psmcmc->pidl, + szDir)) { - CMINVOKECOMMANDINFO cmici = {0}; - CHAR szDir[MAX_PATH]; - - /* Setup and invoke the shell command */ - cmici.cbSize = sizeof(cmici); - cmici.hwnd = hWndOwner; - cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); - cmici.nShow = SW_NORMAL; - - /* FIXME: Support Unicode!!! */ - if (SHGetPathFromIDListA(psmcmc->pidl, - szDir)) - { - cmici.lpDirectory = szDir; - } - - IContextMenu_InvokeCommand(psmcmc->pcm, - &cmici); - break; + cmici.lpDirectory = szDir; } - default: - ITrayWindow_ExecContextMenuCmd((ITrayWindow *)Context, - uiCmdId); - break; + IContextMenu_InvokeCommand(psmcmc->pcm, + &cmici); + } + else + { + ITrayWindow_ExecContextMenuCmd((ITrayWindow *)Context, + uiCmdId); } } @@ -804,15 +800,20 @@ (PVOID)&pbb); if (SUCCEEDED(hRet)) { - hRet = IBanneredBar_SetBitmap(pbb, + // hRet = IBanneredBar_SetBitmap(pbb, + // hbmBanner); + hRet = pbb->lpVtbl->SetBitmap(pbb, hbmBanner); /* Update the icon size */ - hRet = IBanneredBar_SetIconSize(pbb, + //hRet = IBanneredBar_SetIconSize(pbb, + // bSmallIcons ? BMICON_SMALL : BMICON_LARGE); + hRet = pbb->lpVtbl->SetIconSize(pbb, bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - IBanneredBar_Release(pbb); + //IBanneredBar_Release(pbb); + pbb->lpVtbl->Release(pbb); } return hRet; @@ -861,9 +862,11 @@ (PVOID*)&pIo); if (SUCCEEDED(hRet)) { - hRet = IInitializeObject_Initialize(pIo); - - IInitializeObject_Release(pIo); + //hRet = IInitializeObject_Initialize(pIo); + hRet = pIo->lpVtbl->Initialize(pIo); + + //IInitializeObject_Release(pIo); + pIo->lpVtbl->Release(pIo); } else hRet = S_OK;

1 0

[dreimer] 33212: build.ps1 works now. makex not, because I did not find a way to get the number of cores yet.
by dreimer＠svn.reactos.org 01 May '08

01 May '08

Author: dreimer Date: Thu May 1 09:24:40 2008 New Revision: 33212 URL: http://svn.reactos.org/svn/reactos?rev=33212&view=rev Log: build.ps1 works now. makex not, because I did not find a way to get the number of cores yet. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Thu May 1 09:24:40 2008 @@ -73,8 +73,8 @@ # # Get the current date and time for use in in our build log's file name. # -$DATENAME = get-date -f d -$TIMENAME = get-date -f t +$DATENAME = get-date -f dyMMyyyy +$TIMENAME = get-date -f HHmm # @@ -82,23 +82,25 @@ # exists, if it doesn't, create it. # if ($_ROSBE_WRITELOG -eq 1) { - if (Test-Path "$_ROSBE_LOGDIR\.") { - mkdir "$_ROSBE_LOGDIR" 1> NUL 2> NUL + if (!(Test-Path "$_ROSBE_LOGDIR")) { + New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory } } function BUILD { if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { - """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt""" + New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5]" + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { - """$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt""" + New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - """$_ROSBE_MINGWMAKE"" $args[0..5]" + & "$_ROSBE_MINGWMAKE" $($args) } } } @@ -116,15 +118,17 @@ if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { -# "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" +# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file +# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 +# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { -# "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" +# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file +# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 +# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } }

1 0

[dreimer] 33211: Polish Translation Update by Olaf Siejka Updated German USETUP Translation. To Translators: kbswitch is open for translations now in my eyes. DXDiag maybe too. Ask Johannes Anderwald about it
by dreimer＠svn.reactos.org 01 May '08

01 May '08

Author: dreimer Date: Thu May 1 08:07:58 2008 New Revision: 33211 URL: http://svn.reactos.org/svn/reactos?rev=33211&view=rev Log: Polish Translation Update by Olaf Siejka Updated German USETUP Translation. To Translators: kbswitch is open for translations now in my eyes. DXDiag maybe too. Ask Johannes Anderwald about it Added: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/mmc/lang/lt-LT.rc trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -16,7 +16,7 @@ BEGIN CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Nastêpna Strona", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Nastêpna", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -25,20 +25,20 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 443, 17 - LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 443, 25 - GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT - LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT - LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT - LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT - LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT - LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT - LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "Ten program dostarcza szczegó³owych danych o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17 + LTEXT "Jeli wiesz ju¿, gdzie tkwi b³¹d, kliknij na odpowiedni¹ zak³adkê. W innym wypadku mo¿esz przejæ przez wszystkie zak³adki przyciskiem Nastêpna", -1, 10, 30, 443, 25 + GROUPBOX "Informacje o systemie", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "Data i czas:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Nazwa komputera:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "System operacyjny:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Jêzyk:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Producent:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Model:", -1, 70, 120, 80, 10, SS_RIGHT LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT - LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT - LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT - LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT - LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Pamiêæ:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Plik wymiany:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "Wersja ReactX:", -1, 70, 170, 80, 10, SS_RIGHT LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT @@ -56,13 +56,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Device", -1, 10, 10, 220, 100 - RTEXT "Name:", -1, 20, 25, 70, 10 - RTEXT "Manufacturer:", -1, 20, 35, 70, 10 - RTEXT "Chip Type:", -1, 20, 45, 70, 10 - RTEXT "DAC Type:", -1, 20, 55, 70, 10 - RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10 - RTEXT "Current Display Mode:", -1, 20, 75, 70, 10 + GROUPBOX "Urz¹dzenie", -1, 10, 10, 220, 100 + RTEXT "Nazwa:", -1, 20, 25, 70, 10 + RTEXT "Producent:", -1, 20, 35, 70, 10 + RTEXT "GPU:", -1, 20, 45, 70, 10 + RTEXT "Typ DAC:", -1, 20, 55, 70, 10 + RTEXT "Pamiêæ:", -1, 20, 65, 70, 10 + RTEXT "Bierz¹ca rozdzielczoæ:", -1, 20, 75, 70, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10 @@ -72,14 +72,14 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Driver", -1, 240, 10, 190, 100 - RTEXT "Main Driver:", -1, 245, 30, 55, 10 - RTEXT "Version:", -1, 245, 40, 55, 10 - RTEXT "Date:", -1, 245, 50, 55, 10 - RTEXT "WHQL-Logo:", -1, 245, 60, 55, 10 + GROUPBOX "Sterownik", -1, 240, 10, 190, 100 + RTEXT "G³ówny sterownik:", -1, 245, 30, 55, 10 + RTEXT "Wersja:", -1, 245, 40, 55, 10 + RTEXT "Data:", -1, 245, 50, 55, 10 + RTEXT "WHQL:", -1, 245, 60, 55, 10 RTEXT "Mini-VDD:", -1, 245, 70, 55, 10 RTEXT " vvdddVDD:", -1, 245, 80, 55, 10 - RTEXT "DDI Version:", -1, 245, 90, 55, 10 + RTEXT "Wersja DDI:", -1, 245, 90, 55, 10 LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10 @@ -88,20 +88,20 @@ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10 - GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 - RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12 - RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12 - RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12 + GROUPBOX "ReactX", -1, 10, 115, 450, 60 + RTEXT "DirectDraw:", -1, 15, 130, 110, 12 + RTEXT "Direct3D:", -1, 15, 145, 110, 12 + RTEXT "Teksturowanie AGP:", -1, 15, 160, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 - PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED - PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED - PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED - PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12 - PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12, WS_DISABLED - - GROUPBOX "Notes", -1, 10, 180, 450, 40 + PUSHBUTTON "W³¹cz", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED + PUSHBUTTON "Testuj DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12 + PUSHBUTTON "Testuj Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12, WS_DISABLED + + GROUPBOX "Uwagi", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -110,37 +110,37 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Device", -1, 10, 10, 250, 100 - RTEXT "Name:", -1, 20, 25, 70, 10 - RTEXT "Device ID:", -1, 20, 35, 70, 10 - RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 - RTEXT "Product ID:", -1, 20, 55, 70, 10 - RTEXT "Type:", -1, 20, 65, 70, 10 - RTEXT "Default Device:", -1, 20, 75, 70, 10 + GROUPBOX "Urz¹dzenie", -1, 10, 10, 250, 100 + RTEXT "Nazwa:", -1, 20, 25, 70, 10 + RTEXT "ID Urz¹dzenia:", -1, 20, 35, 70, 10 + RTEXT "ID Producenta:", -1, 20, 45, 70, 10 + RTEXT "ID Produktu:", -1, 20, 55, 70, 10 + RTEXT "Typ:", -1, 20, 65, 70, 10 + RTEXT "Urz¹denie domylne:", -1, 20, 75, 70, 10 LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 - GROUPBOX "Driver", -1, 270, 10, 190, 100 - RTEXT "Name:", -1, 275, 25, 55, 10 - RTEXT "Version:", -1, 275, 35, 55, 10 - RTEXT "Datw:", -1, 275, 45, 55, 10 - RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 - RTEXT "Other Files:", -1, 275, 65, 55, 10 - RTEXT "Provider:", -1, 275, 75, 55, 10 + GROUPBOX "Sterownik", -1, 270, 10, 190, 100 + RTEXT "Nazwa:", -1, 275, 25, 55, 10 + RTEXT "Wersja:", -1, 275, 35, 55, 10 + RTEXT "Data:", -1, 275, 45, 55, 10 + RTEXT "Logo WHQL:", -1, 275, 55, 55, 10 + RTEXT "Inne pliki:", -1, 275, 65, 55, 10 + RTEXT "Dostawca:", -1, 275, 75, 55, 10 LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 - GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + GROUPBOX "ReactX-", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 - RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 - PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 - GROUPBOX "Notes", -1, 10, 180, 450, 40 + RTEXT "Przyspiesznie sprzêtowe\nPoziom:", -1, 20, 135, 90, 20 + PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Uwagi", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -155,11 +155,11 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80 + GROUPBOX "Urz¹dzenia DirectInput", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60 - GROUPBOX "Input Devices", -1, 10, 100, 452, 60 + GROUPBOX "Urz¹denia wejcia", -1, 10, 100, 452, 60 CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200 - GROUPBOX "Information", -1, 10, 170, 452, 50 + GROUPBOX "Informacje", -1, 10, 170, 452, 50 EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP END @@ -173,7 +173,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80 + GROUPBOX "Zarejestrowani dostawcy us³ug DirectPlay", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 END @@ -191,41 +191,41 @@ IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" - IDS_VERSION_UNKNOWN "Unknown Version" - IDS_DEVICE_STATUS_ATTACHED "Connected" - IDS_DEVICE_STATUS_MISSING "Disconnected" - IDS_DEVICE_STATUS_UNKNOWN "Unknown" - IDS_DEVICE_NAME "Device name" - IDS_DEVICE_STATUS "Status" - IDS_DEVICE_CONTROLLER "Controller ID" - IDS_DEVICE_MANUFACTURER "Manufacturer ID" - IDS_DEVICE_PRODUCT "Product ID" - IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" - IDS_NOT_APPLICABLE "Not applicable" - IDS_OPTION_YES "Yes" - IDS_DIRECTPLAY_COL_NAME1 "Name" - IDS_DIRECTPLAY_COL_NAME2 "Registry" - IDS_DIRECTPLAY_COL_NAME3 "File" - IDS_DIRECTPLAY_COL_NAME4 "Version" - IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" - IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" - IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" - IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" - IDS_DIRECTPLAY_TCPCONN "Internet TCP/IP Connection For DirectPlay" - IDS_DIRECTPLAY_IPXCONN "IPX Connection For DirectPlay" - IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay" - IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay" + IDS_VERSION_UNKNOWN "Wersja nieznana" + IDS_DEVICE_STATUS_ATTACHED "Po³¹czony" + IDS_DEVICE_STATUS_MISSING "Roz³¹czony" + IDS_DEVICE_STATUS_UNKNOWN "Nieznany" + IDS_DEVICE_NAME "Nazwa urz¹dzenia" + IDS_DEVICE_STATUS "Stan" + IDS_DEVICE_CONTROLLER "ID Kontrolera" + IDS_DEVICE_MANUFACTURER "ID Producenta" + IDS_DEVICE_PRODUCT "ID Produktu" + IDS_DEVICE_FORCEFEEDBACK "Sterowniki Force-Feedback" + IDS_NOT_APPLICABLE "Nie stosowane" + IDS_OPTION_YES "Tak" + IDS_DIRECTPLAY_COL_NAME1 "Nazwa" + IDS_DIRECTPLAY_COL_NAME2 "Rejestr" + IDS_DIRECTPLAY_COL_NAME3 "Plik" + IDS_DIRECTPLAY_COL_NAME4 "Wersja" + IDS_DIRECTPLAY8_MODEMSP "Dostawca us³ug modemowych DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "Dostawca us³ug portu szeregowego DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "Dostawca us³ug IPX DirectPlay8" + IDS_DIRECTPLAY8_TCPSP "Dostawca us³ug TCP/IP DirectPlay8" + IDS_DIRECTPLAY_TCPCONN "Po³¹czenie internetowe TCP/IP dla DirectPlay" + IDS_DIRECTPLAY_IPXCONN "Po³¹czenie IPX dla DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Po³¹czenie modemowe dla DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Po³¹czenie szeregowe dla DirectPlay" IDS_REG_SUCCESS "OK" - IDS_REG_FAIL "Error" - IDS_DDTEST_ERROR "Test failed!" - IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?" - IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?" - IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?" - IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?" - IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?" - IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" - IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" + IDS_REG_FAIL "B³¹d" + IDS_DDTEST_ERROR "Test nieudany!" + IDS_DDTEST_DESCRIPTION "Czy chcesz rozpocz¹æ test interface DirectDraw?" + IDS_DDPRIMARY_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania na powierzchni podstawowej. Narysowane zostan¹ czarne i bia³e prostok¹ty. Kontynuowaæ?" + IDS_DDPRIMARY_RESULT "Czy by³o widaæ czarne i bia³e prostok¹ty?" + IDS_DDOFFSCREEN_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania przy u¿yciu bufora pozaekranowego. Narysowany zostanie poruszaj¹cy siê bia³y kwadrat. Kontynuowaæ?" + IDS_DDOFFSCREEN_RESULT "Czy by³o widaæ poruszaj¹cy siê bia³y kwadrat?" + IDS_DDFULLSCREEN_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania w trybie pe³noekranowym. Narysowany zostanie poruszaj¹cy siê bia³y kwadrat. Kontynuowaæ?" + IDS_DDFULLSCREEN_RESULT "Czy by³o widaæ poruszaj¹cy siê bia³y kwadrat, w trybie pe³noekranowym?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" - IDS_OPTION_NO "No" -END + IDS_OPTION_NO "Nie" +END Added: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -1,0 +1,18 @@ +/* + * translated by Caemyr - Olaf Siejka (Apr,2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Ustawienia...", ID_PREFERENCES + MENUITEM "&Wyjcie", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -2,4 +2,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/mmc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -21,26 +21,3 @@ IDS_APPTITLE "ReactOS Valdymo Pultas" IDS_CONSOLETITLE "Pultas%1!u!" END -/* Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ - -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -IDM_CONSOLEROOT MENU DISCARDABLE -BEGIN - POPUP "&Byla" - BEGIN - MENUITEM SEPARATOR - MENUITEM "&Baigti\tAlt+F4", ID_FILE_EXIT - END - - POPUP "&Pagalba" - BEGIN - MENUITEM "&Apie ReactOS Valdymo Pultà...", ID_HELP_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS Valdymo Pultas" - IDS_CONSOLETITLE "Pultas%1!u!" -END Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Thu May 1 08:07:58 2008 @@ -1463,8 +1463,8 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "Setup konnte die Tastaturlayouts nicht in Registry eintragen.\n" + "ENTER = Computer neustarten" }, { NULL, @@ -1686,7 +1686,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "Tastaturlayout hinzufügen"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu May 1 08:07:58 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr (Jan-Feb, 2008) + * translated by Caemyr (Jan-Feb, Apr, 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -1470,8 +1470,8 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "Instalator nie m¢g doda ukad¢w klawiatury do rejestru.\n" + "ENTER = Restart komputera" }, { NULL, @@ -1693,7 +1693,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "Dodawanie ukad¢w klawiatury"}, {0, 0} };

1 0

[greatlrd] 33210: add regkey HKLM\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI\Timeout for dxg.sys it is the second timeout value for a surface lock see url for more informations http://www.microsoft.com/technet/prodtechnol/windows2000serv/reskit/regentry/28237.mspx?mfr=true thx irc:stefan100 for the url remove one hack in intEnableReactXDriver thx to this info.
by greatlrd＠svn.reactos.org 01 May '08

01 May '08

Author: greatlrd Date: Thu May 1 07:08:02 2008 New Revision: 33210 URL: http://svn.reactos.org/svn/reactos?rev=33210&view=rev Log: add regkey HKLM\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI\Timeout for dxg.sys it is the second timeout value for a surface lock see url for more informations http://www.microsoft.com/technet/prodtechnol/windows2000serv/reskit/regentr… thx irc:stefan100 for the url remove one hack in intEnableReactXDriver thx to this info. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c 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 May 1 07:08:02 2008 @@ -457,6 +457,9 @@ "PlugPlay", \ "Extended Base" +; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info +HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 + ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu May 1 07:08:02 2008 @@ -106,13 +106,13 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL { -/* 0x000 */ PVOID dhpdev; +/* 0x000 */ PVOID dhpdev; // 0x000 <-- verified to match Windows XP, dhpdev, the drv hPDev --> /* 0x004 */ DWORD dwReserved1; /* 0x008 */ DWORD dwReserved2; /* 0x00C */ ULONG unk_000c[3]; /* 0x018 */ LONG cDriverReferences; /* 0x01C */ ULONG unk_01c; -/* 0x020 */ DWORD dwCallbackFlags; /* <-- verified to match Windows XP, dwCallbackFlags +/* 0x020 */ DWORD dwCallbackFlags; /* 0x020 <-- verified to match Windows XP, dwCallbackFlags Flags value 0x0002 = ddVideoPortCallback and GUID_VideoPortCaps 0x0004 = GUID_ColorControlCallbacks @@ -125,7 +125,13 @@ /* 0x024 */ ULONG unk_024; #ifdef _WIN32 -/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; // 0x028 <-- verified to match Windows XP, llAssertModeTimeout +/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, it + using regkey + HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI + Specifies how long a DirectDraw application can keep a graphics-device frame-buffer locked + in second, if this value are set to 0 it disable directdraw acclatrions. + it is normal set to 7 (7 sec in windwos xp/2003) + */ #else /* 0x028 */ DWORD llAssertModeTimeoutLowPart; /* 0x02C */ DWORD llAssertModeTimeoutHighPart; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 07:08:02 2008 @@ -54,6 +54,7 @@ success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); dump_edd_directdraw_global(pEddgbl); + dump_halinfo(&pEddgbl->ddHalInfo); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } @@ -263,13 +264,6 @@ /* setup missing data in ddHalInfo */ //pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; - - - /* FIXME : hack ? it will let us DxDdQueryDirectDrawObject if the llAssertModeTimeout contain negtive value -1*/ - pEddgbl->llAssertModeTimeout.QuadPart = -1; - - - /* FIXME : remove this when we are done with debuging of dxg */ dump_edd_directdraw_global(pEddgbl);

1 0

[gedmurphy] 33209: - Add IMenuBand COM interface - Add IInitializeObject and IBanneredBar COM interfaces. Manually add the members, which is a bit of a hack. We need to fix DECLARE_INTERFACE_IID_ to pre-register interfaces - explorer_new no longer has redefinition errors when attempting to build with msvc9
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 06:01:10 2008 New Revision: 33209 URL: http://svn.reactos.org/svn/reactos?rev=33209&view=rev Log: - Add IMenuBand COM interface - Add IInitializeObject and IBanneredBar COM interfaces. Manually add the members, which is a bit of a hack. We need to fix DECLARE_INTERFACE_IID_ to pre-register interfaces - explorer_new no longer has redefinition errors when attempting to build with msvc9 Modified: trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/objbase.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Thu May 1 06:01:10 2008 @@ -80,7 +80,7 @@ #define IShellService_SetOwner(T,a) (T)->lpVtbl->SetOwner(T,a) #endif -#if 0 +#if _MSC_VER HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*);/* FIXME: Parameter should be PCIDLIST_ABSOLUTE */ #else typedef HRESULT (WINAPI *PSHGetViewStatePropertyBag)(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*); @@ -116,77 +116,4 @@ #define PIDLIST_ABSOLUTE LPITEMIDLIST PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); -enum -{ - BMICON_LARGE = 0, - BMICON_SMALL -}; -#define INTERFACE IBanneredBar -DECLARE_INTERFACE_(IBanneredBar,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IBanneredBar methods ***/ - STDMETHOD_(HRESULT,SetIconSize)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,GetIconSize)(THIS_ DWORD*) PURE; - STDMETHOD_(HRESULT,SetBitmap)(THIS_ HBITMAP) PURE; - STDMETHOD_(HRESULT,GetBitmap)(THIS_ HBITMAP*) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IBanneredBar_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IBanneredBar_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IBanneredBar_Release(T) (T)->lpVtbl->Release(T) -#define IBanneredBar_SetIconSize(T,a) (T)->lpVtbl->SetIconSize(T,a) -#define IBanneredBar_GetIconSize(T,a) (T)->lpVtbl->GetIconSize(T,a) -#define IBanneredBar_SetBitmap(T,a) (T)->lpVtbl->SetBitmap(T,a) -#define IBanneredBar_GetBitmap(T,a) (T)->lpVtbl->GetBitmap(T,a) -#endif - - - - -#define INTERFACE IMenuBand -DECLARE_INTERFACE_(IMenuBand,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IMenuBand methods ***/ - STDMETHOD_(HRESULT,IsMenuMessage)(THIS_ MSG*) PURE; - STDMETHOD_(HRESULT,TranslateMenuMessage)(THIS_ MSG*,LRESULT*) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IMenuBand_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IMenuBand_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IMenuBand_Release(T) (T)->lpVtbl->Release(T) -#define IMenuBand_IsMenuMessage(T,a) (T)->lpVtbl->IsMenuMessage(T,a) -#define IMenuBand_TranslateMenuMessage(T,a,b) (T)->lpVtbl->TranslateMenuMessage(T,a,b) -#endif - -#define INTERFACE IInitializeObject -DECLARE_INTERFACE_(IInitializeObject,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IInitializeObject methods ***/ - STDMETHOD_(HRESULT,Initialize)(THIS) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IInitializeObject_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IInitializeObject_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IInitializeObject_Release(T) (T)->lpVtbl->Release(T) -#define IInitializeObject_Initialize(T) (T)->lpVtbl->Initialize(T) -#endif - #endif /* __TODO_H */ Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Thu May 1 06:01:10 2008 @@ -227,6 +227,8 @@ #define interface struct #define DECLARE_INTERFACE(iface) interface iface #define DECLARE_INTERFACE_(iface,ibase) interface iface : public ibase +#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface +#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public baseiface #define BEGIN_INTERFACE #define END_INTERFACE Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Thu May 1 06:01:10 2008 @@ -1516,6 +1516,60 @@ const OPENASINFO *poainfo ); +/***************************************************************************** + * IInitializeObject interface + */ +#undef INTERFACE +#define INTERFACE IInitializeObject + +DECLARE_INTERFACE_(IInitializeObject, IUnknown)//, "4622AD16-FF23-11d0-8D34-00A0C90F2719") +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + STDMETHOD(Initialize)(THIS) PURE; +}; +#undef INTERFACE +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IInitializeObject_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IInitializeObject_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IInitializeObject_Release(T) (T)->lpVtbl->Release(T) +#define IInitializeObject_Initialize(T) (T)->lpVtbl->Initialize(T) +#endif + + +/***************************************************************************** + * IBanneredBar interface + */ +enum +{ + BMICON_LARGE = 0, + BMICON_SMALL +}; +#define INTERFACE IBanneredBar +DECLARE_INTERFACE_(IBanneredBar, IUnknown)//, "596A9A94-013E-11d1-8D34-00A0C90F2719") +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + STDMETHOD(SetIconSize)(THIS_ DWORD iIcon) PURE; + STDMETHOD(GetIconSize)(THIS_ DWORD* piIcon) PURE; + STDMETHOD(SetBitmap)(THIS_ HBITMAP hBitmap) PURE; + STDMETHOD(GetBitmap)(THIS_ HBITMAP* phBitmap) PURE; + +}; +#undef INTERFACE +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IBanneredBar_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IBanneredBar_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IBanneredBar_Release(T) (T)->lpVtbl->Release(T) +#define IBanneredBar_SetIconSize(T,a) (T)->lpVtbl->SetIconSize(T,a) +#define IBanneredBar_GetIconSize(T,a) (T)->lpVtbl->GetIconSize(T,a) +#define IBanneredBar_SetBitmap(T,a) (T)->lpVtbl->SetBitmap(T,a) +#define IBanneredBar_GetBitmap(T,a) (T)->lpVtbl->GetBitmap(T,a) +#endif #ifdef __cplusplus } /* extern "C" */ Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Thu May 1 06:01:10 2008 @@ -1742,6 +1742,26 @@ cpp_quote("#endif /* _WIN32_IE_IE40 */") - - - +/***************************************************************************** + * IMenuBand interface + */ +[ + uuid(568804CD-CBD7-11d0-9816-00C04FD91972), + object, + pointer_default(unique), + local +] +interface IMenuBand : IUnknown +{ + enum tagMENUBANDHANDLERCID { + MBHANDCID_PIDLSELECT = 0, + }; + + HRESULT IsMenuMessage([in] MSG* pmsg); + + HRESULT TranslateMenuMessage( + [in, out] MSG* pmsg, + [out] LRESULT* plRet); +} + + Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Thu May 1 06:01:10 2008 @@ -69,7 +69,7 @@ typedef PCUIDLIST_RELATIVE const *PCUIDLIST_RELATIVE_ARRAY; typedef PCIDLIST_ABSOLUTE const *PCIDLIST_ABSOLUTE_ARRAY; typedef PCUIDLIST_ABSOLUTE const *PCUIDLIST_ABSOLUTE_ARRAY; -cpp_quote("#else // !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus))") +cpp_quote("#else /* !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)) */") cpp_quote("#define PIDLIST_ABSOLUTE LPITEMIDLIST") cpp_quote("#define PCIDLIST_ABSOLUTE LPCITEMIDLIST") cpp_quote("#define PCUIDLIST_ABSOLUTE LPCITEMIDLIST") @@ -85,7 +85,7 @@ cpp_quote("#define PCUIDLIST_RELATIVE_ARRAY LPCITEMIDLIST *") cpp_quote("#define PCIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") cpp_quote("#define PCUIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") -cpp_quote("#endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +cpp_quote("#endif /* defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) */") #ifndef MAX_PATH

1 0

[greatlrd] 33208: Do not double set value that have already been set by ms dxg.sys
by greatlrd＠svn.reactos.org 01 May '08

01 May '08

Author: greatlrd Date: Thu May 1 04:51:25 2008 New Revision: 33208 URL: http://svn.reactos.org/svn/reactos?rev=33208&view=rev Log: Do not double set value that have already been set by ms dxg.sys Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 04:51:25 2008 @@ -56,11 +56,6 @@ dump_edd_directdraw_global(pEddgbl); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } - - /* setup hdev for edd_DdirectDraw_Global xp */ - edd_DdirectDraw_Global.hDev = pDC->pPDev; - /*FIXME : edd_DdirectDraw_Global.dhpdev = (PVOID)pDC->PDev; */ - /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || @@ -866,7 +861,7 @@ /* internal debug api */ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) { - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",(((DWORD)&pEddgbl->dhpdev) - (DWORD)pEddgbl), pEddgbl->dhpdev); + DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",(((DWORD)&pEddgbl->dhpdev) - (DWORD)pEddgbl), pEddgbl->dhpdev); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved1 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved1) - (DWORD)pEddgbl),pEddgbl->dwReserved1); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved2) - (DWORD)pEddgbl),pEddgbl->dwReserved2); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[0] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_000c[0]) - (DWORD)pEddgbl),pEddgbl->unk_000c[0]);

1 0

[gedmurphy] 33207: - Add IShellView2 and IShellView3 COM interfaces - Add IBandSite interface - Add COM object typedefs and #defines to shtypes.idl
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 04:39:37 2008 New Revision: 33207 URL: http://svn.reactos.org/svn/reactos?rev=33207&view=rev Log: - Add IShellView2 and IShellView3 COM interfaces - Add IBandSite interface - Add COM object typedefs and #defines to shtypes.idl Modified: trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Thu May 1 04:39:37 2008 @@ -46,145 +46,6 @@ #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) #endif -#include <pshpack8.h> -typedef struct -{ - DWORD dwMask; - DWORD dwState; - DWORD dwStyle; -} BANDSITEINFO; -#include <poppack.h> - -#define BSIM_STATE 0x1 -#define BSIM_STYLE 0x2 - -#define BSIS_AUTOGRIPPER 0x0 -#define BSIS_NOGRIPPER 0x1 -#define BSIS_ALWAYSGRIPPER 0x2 -#define BSIS_LOCKED 0x100 - -#define BSSF_UNDELETEABLE 0x1000 - -DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); - -#define INTERFACE IBandSite -DECLARE_INTERFACE_(IBandSite,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - /*** IBandSite methods ***/ - STDMETHOD_(HRESULT,AddBand) (THIS_ IUnknown *punk) PURE; - STDMETHOD_(HRESULT,EnumBands) (THIS_ UINT uBand, DWORD *pdwBandID) PURE; - STDMETHOD_(HRESULT,QueryBand) (THIS_ DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) PURE; - STDMETHOD_(HRESULT,SetBandState) (THIS_ DWORD dwBandID, DWORD dwMask, DWORD dwState) PURE; - STDMETHOD_(HRESULT,RemoveBand) (THIS_ DWORD dwBandID) PURE; - STDMETHOD_(HRESULT,GetBandObject) (THIS_ DWORD dwBandID, REFIID riid, VOID **ppv) PURE; - STDMETHOD_(HRESULT,SetBandSiteInfo) (THIS_ const BANDSITEINFO *pbsinfo) PURE; - STDMETHOD_(HRESULT,GetBandSiteInfo) (THIS_ BANDSITEINFO *pbsinfo) PURE; -}; -#undef INTERFACE - -#if defined(COBJMACROS) -/*** IUnknown methods ***/ -#define IBandSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IBandSite_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IBandSite_Release(p) (p)->lpVtbl->Release(p) -/*** IBandSite methods ***/ -#define IBandSite_AddBand(p,a) (p)->lpVtbl->AddBand(p,a) -#define IBandSite_EnumBands(p,a,b) (p)->lpVtbl->EnumBands(p,a,b) -#define IBandSite_QueryBand(p,a,b,c,d,e) (p)->lpVtbl->QueryBand(p,a,b,c,d,e) -#define IBandSite_SetBandState(p,a,b,c) (p)->lpVtbl->SetBandState(p,a,b,c) -#define IBandSite_RemoveBand(p,a) (p)->lpVtbl->RemoveBand(p,a) -#define IBandSite_GetBandObject(p,a,b,c) (p)->lpVtbl->GetBandObject(p,a,b,c) -#define IBandSite_SetBandSiteInfo(p,a) (p)->lpVtbl->SetBandSiteInfo(p,a) -#define IBandSite_GetBandSiteInfo(p,a) (p)->lpVtbl->GetBandSiteInfo(p,a) -#endif - -#include <pshpack8.h> -typedef struct _SV2CVW2_PARAMS -{ - DWORD cbSize; - IShellView *psvPrev; - LPCFOLDERSETTINGS pfs; - IShellBrowser *psbOwner; - RECT *prcView; - SHELLVIEWID const *pvid; - HWND hwndView; -} SV2CVW2_PARAMS, *LPSV2CVW2_PARAMS; -#include <poppack.h> - -typedef ITEMIDLIST ITEMID_CHILD; -#define PITEMID_CHILD LPITEMIDLIST -typedef const ITEMID_CHILD /* __unaligned */ *PCUITEMID_CHILD; - -enum tagSV3CVW3 -{ - SV3CVW3_DEFAULT = 0x0, - SV3CVW3_NONINTERACTIVE = 0x1, - SV3CVW3_FORCEVIEWMODE = 0x2, - SV3CVW3_FORCEFOLDERFLAGS = 0x4 -} ; -typedef DWORD SV3CVW3_FLAGS; -#define INTERFACE IShellView3 -DECLARE_INTERFACE_(IShellView3,IShellView) -{ - - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetWindow)(THIS_ HWND*) PURE; - STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE; - STDMETHOD(TranslateAccelerator) (THIS_ LPMSG) PURE; -#ifdef _FIX_ENABLEMODELESS_CONFLICT - STDMETHOD(EnableModelessSV)(THIS_ BOOL) PURE; -#else - STDMETHOD(EnableModeless)(THIS_ BOOL) PURE; -#endif - STDMETHOD(UIActivate)(THIS_ UINT) PURE; - STDMETHOD(Refresh) (THIS) PURE; - STDMETHOD(CreateViewWindow)(THIS_ IShellView*,LPCFOLDERSETTINGS,LPSHELLBROWSER,RECT*,HWND*) PURE; - STDMETHOD(DestroyViewWindow)(THIS) PURE; - STDMETHOD(GetCurrentInfo)(THIS_ LPFOLDERSETTINGS) PURE; - STDMETHOD(AddPropertySheetPages)(THIS_ DWORD,LPFNADDPROPSHEETPAGE,LPARAM) PURE; - STDMETHOD(SaveViewState)(THIS) PURE; - STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST,UINT) PURE; - STDMETHOD(GetItemObject)(THIS_ UINT,REFIID,PVOID*) PURE; - STDMETHOD(GetView)(THIS_ SHELLVIEWID*,ULONG) PURE; - STDMETHOD(CreateViewWindow2)(THIS_ LPSV2CVW2_PARAMS) PURE; - STDMETHOD(HandleRename)(THIS_ PCUITEMID_CHILD) PURE; - STDMETHOD(SelectAndPositionItem)(THIS_ PCUITEMID_CHILD,UINT,POINT*) PURE; - STDMETHOD(CreateViewWindow3)(THIS_ IShellBrowser*,IShellView*,SV3CVW3_FLAGS,FOLDERFLAGS,FOLDERFLAGS,FOLDERVIEWMODE,const SHELLVIEWID*,const RECT*,HWND*) PURE; -}; -#undef INTERFACE -#ifdef COBJMACROS -#define IShellView3_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IShellView3_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IShellView3_Release(T) (T)->lpVtbl->Release(T) -#define IShellView3_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IShellView3_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IShellView3_TranslateAccelerator(T,a) (T)->lpVtbl->TranslateAccelerator(T,a) -#ifdef _FIX_ENABLEMODELESS_CONFLICT -#define IShellView3_EnableModeless(T,a) (T)->lpVtbl->EnableModelessSV(T,a) -#else -#define IShellView3_EnableModeless(T,a) (T)->lpVtbl->EnableModeless(T,a) -#endif -#define IShellView3_UIActivate(T,a) (T)->lpVtbl->UIActivate(T,a) -#define IShellView3_Refresh(T) (T)->lpVtbl->Refresh(T) -#define IShellView3_CreateViewWindow(T,a,b,c,d,e) (T)->lpVtbl->CreateViewWindow(T,a,b,c,d,e) -#define IShellView3_DestroyViewWindow(T) (T)->lpVtbl->DestroyViewWindow(T) -#define IShellView3_GetCurrentInfo(T,a) (T)->lpVtbl->GetCurrentInfo(T,a) -#define IShellView3_AddPropertySheetPages(T,a,b,c) (T)->lpVtbl->AddPropertySheetPages(T,a,b,c) -#define IShellView3_SaveViewState(T) (T)->lpVtbl->SaveViewState(T) -#define IShellView3_SelectItem(T,a,b) (T)->lpVtbl->SelectItem(T,a,b) -#define IShellView3_GetItemObject(T,a,b,c) (T)->lpVtbl->GetItemObject(T,a,b,c) -#define IShellView3_GetView(T,a,b) (T)->lpVtbl->GetView(T,a,b) -#define IShellView3_CreateViewWindow2(T,a) (T)->lpVtbl->CreateViewWindow2(T,a) -#define IShellView3_HandleRename(T,a) (T)->lpVtbl->HandleRename(T,a) -#define IShellView3_SelectAndPositionItem(T,a,b,c) (T)->lpVtbl->SelectAndPositionItem(T,a,b,c) -#define IShellView3_CreateViewWindow3(T,a,b,c,d,e,f,g,h,i) (T)->lpVtbl->CreateViewWindow3(T,a,b,c,d,e,f,g,h,i) -#endif #define SHGVSPB_PERUSER 0x1 #define SHGVSPB_PERFOLDER 0x4 @@ -192,7 +53,6 @@ #define SHGVSPB_NOAUTODEFAULTS 0x80000000 #define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) #define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) - #define DBC_SHOW 1 Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Thu May 1 04:39:37 2008 @@ -145,7 +145,6 @@ * IShellView interface */ -typedef GUID SHELLVIEWID; #define SV_CLASS_NAME ("SHELLDLL_DefView") #define FCIDM_SHVIEWFIRST 0x0000 Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Thu May 1 04:39:37 2008 @@ -388,7 +388,7 @@ /***************************************************************************** * IShellView interface */ -interface IShellBrowser; /* forward declaration */ +interface IShellBrowser; [ object, uuid(000214e3-0000-0000-c000-000000000046), @@ -412,7 +412,7 @@ typedef UINT SVSIF; - typedef enum + typedef enum tagSVGIO { SVGIO_BACKGROUND = 0x00000000, SVGIO_SELECTION = 0x00000001, @@ -422,7 +422,7 @@ SVGIO_FLAG_VIEWORDER = 0x80000000, } SVGIO; - typedef enum + typedef enum tagSVUIA_STATUS { SVUIA_DEACTIVATE = 0, SVUIA_ACTIVATE_NOFOCUS = 1, @@ -457,6 +457,80 @@ [in] UINT uItem, [in] REFIID riid, [out, iid_is(riid)] void **ppv); +} + + +[ + uuid(88E39E80-3578-11CF-AE69-08002B2E1262), + object, + pointer_default(unique) +] +interface IShellView2 : IShellView +{ + typedef GUID SHELLVIEWID; + + cpp_quote("#define SV2GV_CURRENTVIEW ((UINT)-1)") + cpp_quote("#define SV2GV_DEFAULTVIEW ((UINT)-2)") + + cpp_quote("#include <pshpack8.h>") + typedef struct _SV2CVW2_PARAMS + { + DWORD cbSize; + + IShellView *psvPrev; + LPCFOLDERSETTINGS pfs; + IShellBrowser *psbOwner; + RECT *prcView; + SHELLVIEWID const *pvid; + HWND hwndView; + + } SV2CVW2_PARAMS, *LPSV2CVW2_PARAMS; + + cpp_quote("#include <poppack.h>") + + HRESULT GetView( + [in, out] SHELLVIEWID* pvid, + [in] ULONG uView); + + HRESULT CreateViewWindow2( + [in] LPSV2CVW2_PARAMS lpParams); + + HRESULT HandleRename( + [in, unique] PCUITEMID_CHILD pidlNew); + + HRESULT SelectAndPositionItem( + [in] PCUITEMID_CHILD pidlItem, + [in] UINT uFlags, + [in, unique] POINT *ppt); +} + + +[ + uuid(ec39fa88-f8af-41c5-8421-38bed28f4673), + object, + pointer_default(unique) +] +interface IShellView3 : IShellView2 +{ + enum tagSV3CVW3 + { + SV3CVW3_DEFAULT = 0x00000000, + SV3CVW3_NONINTERACTIVE = 0x00000001, + SV3CVW3_FORCEVIEWMODE = 0x00000002, + SV3CVW3_FORCEFOLDERFLAGS = 0x00000004, + }; + typedef DWORD SV3CVW3_FLAGS; + + HRESULT CreateViewWindow3( + [in] IShellBrowser *psbOwner, + [in, unique] IShellView *psvPrev, + [in] SV3CVW3_FLAGS dwViewFlags, + [in] FOLDERFLAGS dwMask, + [in] FOLDERFLAGS dwFlags, + [in] FOLDERVIEWMODE fvMode, + [in, unique] const SHELLVIEWID *pvid, + [in] const RECT *prcView, + [out] HWND *phwndView); } @@ -1583,3 +1657,91 @@ } cpp_quote("#endif /* _WIN32_IE_IE60 */") + +cpp_quote("#if (_WIN32_IE >= _WIN32_IE_IE40)") + +/***************************************************************************** + * IBandSite interface + */ +cpp_quote("#include <pshpack8.h>") + +typedef struct tagBANDSITEINFO +{ + DWORD dwMask; + DWORD dwState; + DWORD dwStyle; +} BANDSITEINFO; + +cpp_quote("#include <poppack.h>") + + +enum tagBANDSITECID { + BSID_BANDADDED, + BSID_BANDREMOVED, +}; + +cpp_quote("#define BSIM_STATE 0x00000001") +cpp_quote("#define BSIM_STYLE 0x00000002") + +cpp_quote("#define BSSF_VISIBLE 0x00000001") +cpp_quote("#define BSSF_NOTITLE 0x00000002") +cpp_quote("#define BSSF_UNDELETEABLE 0x00001000") + +cpp_quote("#define BSIS_AUTOGRIPPER 0x00000000") +cpp_quote("#define BSIS_NOGRIPPER 0x00000001") +cpp_quote("#define BSIS_ALWAYSGRIPPER 0x00000002") +cpp_quote("#define BSIS_LEFTALIGN 0x00000004") +cpp_quote("#define BSIS_SINGLECLICK 0x00000008") +cpp_quote("#define BSIS_NOCONTEXTMENU 0x00000010") +cpp_quote("#define BSIS_NODROPTARGET 0x00000020") +cpp_quote("#define BSIS_NOCAPTION 0x00000040") +cpp_quote("#define BSIS_PREFERNOLINEBREAK 0x00000080") +cpp_quote("#define BSIS_LOCKED 0x00000100") +cpp_quote("#if (_WIN32_IE >= _WIN32_IE_IE70)") +cpp_quote("#define BSIS_PRESERVEORDERDURINGLAYOUT 0x00000200") +cpp_quote("#endif /* _WIN32_IE_IE70 */") + +cpp_quote("#define SID_SBandSite IID_IBandSite") +cpp_quote("#define CGID_BandSite IID_IBandSite") + +[ + object, + uuid(4CF504B0-DE96-11D0-8B3F-00A0C911E8E5) +] +interface IBandSite : IUnknown +{ + HRESULT AddBand([in] IUnknown* punk); + + HRESULT EnumBands( + [in] UINT uBand, + [out] DWORD* pdwBandID); + + HRESULT QueryBand( + [in] DWORD dwBandID, + [out] IDeskBand** ppstb, + [out] DWORD* pdwState, + [out, string, size_is(cchName)] LPWSTR pszName, + [in] int cchName); + + HRESULT SetBandState( + [in] DWORD dwBandID, + [in] DWORD dwMask, + [in] DWORD dwState); + + HRESULT RemoveBand([in] DWORD dwBandID); + + HRESULT GetBandObject( + [in] DWORD dwBandID, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT SetBandSiteInfo([in] const BANDSITEINFO *pbsinfo); + + HRESULT GetBandSiteInfo([in, out] BANDSITEINFO *pbsinfo); +} + +cpp_quote("#endif /* _WIN32_IE_IE40 */") + + + + Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Thu May 1 04:39:37 2008 @@ -21,6 +21,8 @@ import "wtypes.idl"; + + cpp_quote("#include <pshpack1.h>") typedef struct { @@ -32,9 +34,59 @@ typedef struct _ITEMIDLIST { SHITEMID mkid; /* first itemid in list */ -} ITEMIDLIST,*LPITEMIDLIST; -typedef const ITEMIDLIST *LPCITEMIDLIST; +} ITEMIDLIST; + +cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +cpp_quote("typedef struct _ITEMIDLIST_RELATIVE : ITEMIDLIST {} ITEMIDLIST_RELATIVE;") +cpp_quote("typedef struct _ITEMID_CHILD : ITEMIDLIST_RELATIVE {} ITEMID_CHILD;") +cpp_quote("typedef struct _ITEMIDLIST_ABSOLUTE : ITEMIDLIST_RELATIVE {} ITEMIDLIST_ABSOLUTE;") +cpp_quote("#else /* !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)) */") +typedef ITEMIDLIST ITEMIDLIST_RELATIVE; +typedef ITEMIDLIST ITEMID_CHILD; +typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE; +cpp_quote("#endif /* defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) */") + cpp_quote("#include <poppack.h>") + +typedef [unique] BYTE_BLOB * wirePIDL; +typedef ITEMIDLIST /*__unaligned*/ * LPITEMIDLIST; +typedef const ITEMIDLIST /*__unaligned*/ * LPCITEMIDLIST; + +cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +typedef ITEMIDLIST_ABSOLUTE * PIDLIST_ABSOLUTE; +typedef const ITEMIDLIST_ABSOLUTE * PCIDLIST_ABSOLUTE; +typedef const ITEMIDLIST_ABSOLUTE /*__unaligned*/ * PCUIDLIST_ABSOLUTE; +typedef ITEMIDLIST_RELATIVE * PIDLIST_RELATIVE; +typedef const ITEMIDLIST_RELATIVE * PCIDLIST_RELATIVE; +typedef ITEMIDLIST_RELATIVE /*__unaligned*/ * PUIDLIST_RELATIVE; +typedef const ITEMIDLIST_RELATIVE /*__unaligned*/ * PCUIDLIST_RELATIVE; +typedef ITEMID_CHILD * PITEMID_CHILD; +typedef const ITEMID_CHILD * PCITEMID_CHILD; +typedef ITEMID_CHILD /*__unaligned*/ * PUITEMID_CHILD; +typedef const ITEMID_CHILD /*__unaligned*/ * PCUITEMID_CHILD; + +typedef PCUITEMID_CHILD const *PCUITEMID_CHILD_ARRAY; +typedef PCUIDLIST_RELATIVE const *PCUIDLIST_RELATIVE_ARRAY; +typedef PCIDLIST_ABSOLUTE const *PCIDLIST_ABSOLUTE_ARRAY; +typedef PCUIDLIST_ABSOLUTE const *PCUIDLIST_ABSOLUTE_ARRAY; +cpp_quote("#else // !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus))") +cpp_quote("#define PIDLIST_ABSOLUTE LPITEMIDLIST") +cpp_quote("#define PCIDLIST_ABSOLUTE LPCITEMIDLIST") +cpp_quote("#define PCUIDLIST_ABSOLUTE LPCITEMIDLIST") +cpp_quote("#define PIDLIST_RELATIVE LPITEMIDLIST") +cpp_quote("#define PCIDLIST_RELATIVE LPCITEMIDLIST") +cpp_quote("#define PUIDLIST_RELATIVE LPITEMIDLIST") +cpp_quote("#define PCUIDLIST_RELATIVE LPCITEMIDLIST") +cpp_quote("#define PITEMID_CHILD LPITEMIDLIST") +cpp_quote("#define PCITEMID_CHILD LPCITEMIDLIST") +cpp_quote("#define PUITEMID_CHILD LPITEMIDLIST") +cpp_quote("#define PCUITEMID_CHILD LPCITEMIDLIST") +cpp_quote("#define PCUITEMID_CHILD_ARRAY LPCITEMIDLIST *") +cpp_quote("#define PCUIDLIST_RELATIVE_ARRAY LPCITEMIDLIST *") +cpp_quote("#define PCIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") +cpp_quote("#define PCUIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") +cpp_quote("#endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") + #ifndef MAX_PATH #define MAX_PATH 260 Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=33… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Thu May 1 04:39:37 2008 @@ -122,5 +122,4 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1);

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 May 2008