Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[dgorbachev] 26423: Zhangbing's Solitaire translation (bug #2186).
by dgorbachev＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: dgorbachev Date: Thu Apr 19 19:25:54 2007 New Revision: 26423 URL: http://svn.reactos.org/svn/reactos?rev=26423&view=rev Log: Zhangbing's Solitaire translation (bug #2186). Added: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc Added: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Thu Apr 19 19:25:54 2007 @@ -1,0 +1,129 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/zh-CN.rc + * PURPOSE: Simplified Chinese Language resources File for Solitaire + * TRANSLATOR: zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + */ + +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// ¼òÌåÖÐÎÄ×ÊÔ´ + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "È·¶¨", IDOK, 129, 7, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 129, 24, 50, 14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "ÓÎÏ·(&G)" + BEGIN + MENUITEM "·¢ÅÆ(&D)\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK + MENUITEM "Ñ¡Ïî(&O)...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "ÍË³ö(&X)", IDM_GAME_EXIT + END + POPUP "°ïÖú(&H)" + BEGIN + MENUITEM "Ä¿Â¼(&C)\tF1", IDM_HELP_CONTENTS + MENUITEM "¹ØÓÚÖ½ÅÆ(&A)", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // ÖÐÎÄ×ÊÔ´ + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Thu Apr 19 19:25:54 2007 @@ -10,4 +10,4 @@ #include "lang/pl-PL.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" - +#include "lang/zh-CN.rc"

1 0

[ekohl] 26422: - Fix a bug in EnumerateCursorSchemes that caused the selection of the wrong cursor scheme upon page initialization. - Remove obsolete global variables.
by ekohl＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: ekohl Date: Thu Apr 19 19:00:56 2007 New Revision: 26422 URL: http://svn.reactos.org/svn/reactos?rev=26422&view=rev Log: - Fix a bug in EnumerateCursorSchemes that caused the selection of the wrong cursor scheme upon page initialization. - Remove obsolete global variables. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Thu Apr 19 19:00:56 2007 @@ -44,6 +44,8 @@ #include <math.h> #include <limits.h> +#include <stdio.h> + #include "main.h" #include "resource.h" @@ -122,7 +124,7 @@ {IDS_WAIT, IDC_WAIT, 0, _T(""), _T("")}, {IDS_CROSSHAIR, IDC_CROSS, 0, _T(""), _T("")}, {IDS_IBEAM, IDC_IBEAM, 0, _T(""), _T("")}, - {IDS_NWPEN, 0/*IDC_NWPEN*/, 0, _T(""), _T("")}, + {IDS_NWPEN, 0/*IDC_NWPEN*/, 0, _T(""), _T("")}, /* FIXME */ {IDS_NO, IDC_NO, 0, _T(""), _T("")}, {IDS_SIZENS, IDC_SIZENS, 0, _T(""), _T("")}, {IDS_SIZEWE, IDC_SIZEWE, 0, _T(""), _T("")}, @@ -133,26 +135,22 @@ {IDS_HAND, IDC_HAND, 0, _T(""), _T("")}}; -TCHAR g_CurrentScheme[MAX_PATH]; -TCHAR g_szArrow[MAX_PATH]; -TCHAR g_szHelp[MAX_PATH]; -TCHAR g_szAppStarting[MAX_PATH]; -TCHAR g_szWait[MAX_PATH]; -TCHAR g_szCrosshair[MAX_PATH]; -TCHAR g_szIBeam[MAX_PATH]; -TCHAR g_szNWPen[MAX_PATH]; -TCHAR g_szNo[MAX_PATH]; -TCHAR g_szSizeNS[MAX_PATH]; -TCHAR g_szSizeWE[MAX_PATH]; -TCHAR g_szSizeNWSE[MAX_PATH]; -TCHAR g_szSizeNESW[MAX_PATH]; -TCHAR g_szSizeAll[MAX_PATH]; -TCHAR g_szUpArrow[MAX_PATH]; -TCHAR g_szHand[MAX_PATH]; - TCHAR g_szNewScheme[MAX_PATH]; - +#if 0 +static VOID +DebugMsg(LPTSTR fmt, ...) +{ + TCHAR szBuffer[2048]; + va_list marker; + + va_start(marker, fmt); + _vstprintf(szBuffer, fmt, marker); + va_end(marker); + + MessageBox(NULL, szBuffer, _T("Debug message"), MB_OK); +} +#endif /* Property page dialog callback */ @@ -519,6 +517,7 @@ DWORD dwCurrentScheme; INT nSchemeIndex; INT i, nCount; + LPTSTR p; if (RegOpenCurrentUser(KEY_READ, &hCuKey) != ERROR_SUCCESS) return FALSE; @@ -592,18 +591,31 @@ RegCloseKey(hCuCursorKey); } + /* Search for the matching entry in the cursor scheme list */ + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); nSchemeIndex = -1; nCount = (INT)SendMessage(hDlgCtrl, CB_GETCOUNT, 0, 0); for (i = 0; i < nCount; i++) { SendMessage(hDlgCtrl, CB_GETLBTEXT, i, (LPARAM)szValueName); - if (_tcsnicmp(szValueName, szCurrentScheme, _tcslen(szCurrentScheme)) == 0) + p = _tcsstr(szValueName, szSystemScheme); + if (p) + { + p -= 1; + *p = 0; + } + +// DebugMsg(_T("szCurrentScheme: \"%s\"\nszValueName: \"%s\""), szCurrentScheme, szValueName); + + if (_tcscmp(szValueName, szCurrentScheme) == 0) { nSchemeIndex = (INT)i; + break; } } + /* Select the matching entry */ if (nSchemeIndex != -1) SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)nSchemeIndex, (LPARAM)0); else @@ -620,93 +632,11 @@ static VOID RefreshCursorList(HWND hwndDlg, BOOL bInit) { -// TCHAR szCursorName[MAX_PATH]; -// HWND hDlgCtrl; -// LV_ITEM listItem; -// LV_COLUMN column; - INT index = 0, i, nSel; - -#if 0 - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); - (void)ListView_DeleteAllItems(hDlgCtrl); - - ZeroMemory(&column, sizeof(LV_COLUMN)); - column.mask = LVCF_SUBITEM | LVCF_WIDTH; - column.iSubItem = 0; - column.cx = 200; - - (void)ListView_InsertColumn(hDlgCtrl, 0, &column); - - LoadString(hApplet, IDS_ARROW, szCursorName, MAX_PATH); - - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = szCursorName; - listItem.state = 0; - listItem.iImage = -1; - listItem.iItem = index++; - listItem.lParam = 0; - - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_HELP, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_APPSTARTING, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_WAIT, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_CROSSHAIR, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_IBEAM, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_NWPEN, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_NO, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_SIZENS, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - - LoadString(hApplet, IDS_SIZENWSE, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_SIZENESW, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_SIZEALL, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_UPARROW, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); - - LoadString(hApplet, IDS_HAND, szCursorName, MAX_PATH); - listItem.iItem = index++; - (void)ListView_InsertItem(hDlgCtrl, &listItem); -#endif - - if (bInit) - nSel = 0; - else - nSel = SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_GETCURSEL, 0, 0); + INT index; + INT i; + INT nSel; + + nSel = bInit ? 0 : SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_GETCURSEL, 0, 0); SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_RESETCONTENT, 0, 0); for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) @@ -804,92 +734,6 @@ static VOID LoadCurrentCursorScheme(LPTSTR lpName, BOOL bSystem) { -#if 0 - HKEY hCursorKey; - TCHAR szValue[2048]; - TCHAR szRaw[256]; - DWORD dwValueLen; - LONG lError; - LPTSTR ptrStart, ptrEnd; - INT_PTR len; - int i; - - if (lpName == NULL) - { - memset(g_szArrow, 0x0, sizeof(g_szArrow)); - memset(g_szHelp, 0x0, sizeof(g_szHelp)); - memset(g_szAppStarting, 0x0, sizeof(g_szAppStarting)); - memset(g_szWait, 0x0, sizeof(g_szWait)); - memset(g_szCrosshair, 0x0, sizeof(g_szCrosshair)); - memset(g_szIBeam, 0x0, sizeof(g_szIBeam)); - memset(g_szNWPen, 0x0, sizeof(g_szNWPen)); - memset(g_szNo, 0x0, sizeof(g_szNo)); - memset(g_szSizeNS, 0x0, sizeof(g_szSizeNS)); - memset(g_szSizeWE, 0x0, sizeof(g_szSizeWE)); - memset(g_szSizeNWSE, 0x0, sizeof(g_szSizeNWSE)); - memset(g_szSizeNESW, 0x0, sizeof(g_szSizeNESW)); - memset(g_szSizeAll, 0x0, sizeof(g_szSizeAll)); - memset(g_szUpArrow, 0x0, sizeof(g_szUpArrow)); - memset(g_szHand, 0x0, sizeof(g_szHand)); - } - else - { - if (bSystem) - { - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"), - 0, KEY_READ, &hCursorKey)) - return; - } - else - { - if (RegOpenKeyEx(HKEY_CURRENT_USER, - _T("Control Panel\\Cursors\\Schemes"), - 0, KEY_READ, &hCursorKey) != ERROR_SUCCESS) - return; - } - - dwValueLen = 2048 * sizeof(TCHAR); - lError = RegQueryValueEx(hCursorKey, lpName, NULL, NULL, (LPBYTE)szValue, &dwValueLen); - - RegCloseKey(hCursorKey); - - if (lError == ERROR_SUCCESS) - { - ptrStart = szValue; - for (i = 0; ; i++) - { - ptrEnd = _tcschr(ptrStart, TEXT(',')); - if (ptrEnd != NULL) - { - len = (ptrEnd - ptrStart) / sizeof(TCHAR); - _tcsncpy(szRaw, ptrStart, len); - szRaw[len] = 0; - } - else - { - _tcscpy(szRaw, ptrStart); - } - - switch (i) - { - case 0: - ExpandEnvironmentStrings(szRaw, g_szArrow, MAX_PATH); - break; - - } - - - - if (ptrEnd == NULL) - break; - - ptrStart = ptrEnd + 1; - } - } - } -#endif - UINT index, i; for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) @@ -946,6 +790,26 @@ static VOID +ReloadCurrentCursorScheme(VOID) +{ + UINT index, i; + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (g_CursorData[i].hCursor != NULL) + DestroyCursor(g_CursorData[i].hCursor); + + if (g_CursorData[i].szCursorPath[0] == 0) + g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); + else + g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].szCursorPath, + IMAGE_CURSOR, 0, 0, + LR_LOADFROMFILE | LR_DEFAULTSIZE); + } +} + + +static VOID OnDrawItem(UINT idCtl, LPDRAWITEMSTRUCT lpdis) { @@ -1010,8 +874,6 @@ TCHAR buffer[MAX_PATH]; TCHAR szSystemScheme[MAX_PATH]; HWND hDlgCtrl; - HDC memDC; - HCURSOR hCursor; LRESULT lResult; PPOINTER_DATA pPointerData; @@ -1120,8 +982,7 @@ case IDC_BUTTON_SAVEAS_SCHEME: if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), hwndDlg, SaveSchemeProc)) { - //FIXME - //save cursor scheme + /* FIXME: save the cursor scheme */ } break; @@ -1130,36 +991,16 @@ lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult != CB_ERR) { - if ((INT)lResult == 0) - memset(g_szArrow, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 1) - memset(g_szHelp, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 2) - memset(g_szAppStarting, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 3) - memset(g_szWait, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 4) - memset(g_szCrosshair, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 5) - memset(g_szIBeam, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 6) - memset(g_szNWPen, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 7) - memset(g_szNo, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 8) - memset(g_szSizeNS, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 9) - memset(g_szSizeWE,0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 10) - memset(g_szSizeNWSE, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 11) - memset(g_szSizeNESW, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 12) - memset(g_szSizeAll, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 13) - memset(g_szUpArrow, 0x0, MAX_PATH * sizeof(TCHAR)); - else if ((INT)lResult == 14) - memset(g_szHand, 0x0, MAX_PATH * sizeof(TCHAR)); + UINT uIndex; + + /* FIXME */ + uIndex = (UINT)SendMessage(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lResult, 0); + + /* Clean the path of the currently selected cursor */ + memset(g_CursorData[uIndex].szCursorPath, 0x0, MAX_PATH * sizeof(TCHAR)); + + ReloadCurrentCursorScheme(); + RefreshCursorList(hwndDlg, FALSE); } break; @@ -1168,52 +1009,19 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult == CB_ERR) - MessageBox(hwndDlg, _T("CB_ERR"), _T(""),MB_ICONERROR); + MessageBox(hwndDlg, _T("CB_ERR"), _T(""),MB_ICONERROR); if (BrowseCursor(buffer, hwndDlg)) { - if ((INT)lResult == 0) - _tcsncpy(g_szArrow, buffer, MAX_PATH); - else if ((INT)lResult == 1) - _tcsncpy(g_szHelp, buffer, MAX_PATH); - else if ((INT)lResult == 2) - _tcsncpy(g_szAppStarting, buffer, MAX_PATH); - else if ((INT)lResult == 3) - _tcsncpy(g_szWait, buffer, MAX_PATH); - else if ((INT)lResult == 4) - _tcsncpy(g_szCrosshair, buffer, MAX_PATH); - else if ((INT)lResult == 5) - _tcsncpy(g_szIBeam, buffer, MAX_PATH); - else if ((INT)lResult == 6) - _tcsncpy(g_szNWPen, buffer, MAX_PATH); - else if ((INT)lResult == 7) - _tcsncpy(g_szNo, buffer, MAX_PATH); - else if ((INT)lResult == 8) - _tcsncpy(g_szSizeNS, buffer, MAX_PATH); - else if ((INT)lResult == 9) - _tcsncpy(g_szSizeWE, buffer, MAX_PATH); - else if ((INT)lResult == 10) - _tcsncpy(g_szSizeNWSE, buffer, MAX_PATH); - else if ((INT)lResult == 11) - _tcsncpy(g_szSizeNESW, buffer, MAX_PATH); - else if ((INT)lResult == 12) - _tcsncpy(g_szSizeAll, buffer, MAX_PATH); - else if ((INT)lResult == 13) - _tcsncpy(g_szUpArrow, buffer, MAX_PATH); - else if ((INT)lResult == 14) - _tcsncpy(g_szHand, buffer, MAX_PATH); - - //FIXME - //clear screen - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_IMAGE_CURRENT_CURSOR); - memDC = GetDC(hDlgCtrl); - hCursor = (HCURSOR) LoadImage(NULL, buffer, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE | LR_SHARED); - if (hCursor) - { - DrawIcon(memDC, 10, 10, (HICON)hCursor); - DestroyCursor(hCursor); - } - ReleaseDC(hDlgCtrl, memDC); + UINT uIndex; + + /* FIXME */ + uIndex = (UINT)SendMessage(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lResult, 0); + + /* Store the new cursor file path */ + _tcsncpy(g_CursorData[uIndex].szCursorPath, buffer, MAX_PATH); + + ReloadCurrentCursorScheme(); + RefreshCursorList(hwndDlg, FALSE); } break;

1 0

[gedmurphy] 26421: revert base changes. The original test case was wrong
by gedmurphy＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: gedmurphy Date: Thu Apr 19 13:33:53 2007 New Revision: 26421 URL: http://svn.reactos.org/svn/reactos?rev=26421&view=rev Log: revert base changes. The original test case was wrong Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Thu Apr 19 13:33:53 2007 @@ -1564,18 +1564,24 @@ if( buffer == NULL ) return sizeof(BITMAP); if (Count < sizeof(BITMAP)) return 0; - Count = sizeof(BITMAP); - if(bmp->dib) { + + if(Count < (INT) sizeof(DIBSECTION)) + { + if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP); + } + else + { + if (Count > (INT) sizeof(DIBSECTION)) Count = sizeof(DIBSECTION); + } memcpy(buffer, bmp->dib, Count); - /* Windows returns bytes copied, not DIBSECTION size */ return Count; } else { BITMAP Bitmap; - + if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP); Bitmap.bmType = 0; Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy;

1 0

[ekohl] 26420: Fix the tab order on the wheel page and replace generic CONTROL statements by RADIOBUTTON statements.
by ekohl＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: ekohl Date: Thu Apr 19 12:37:27 2007 New Revision: 26420 URL: http://svn.reactos.org/svn/reactos?rev=26420&view=rev Log: Fix the tab order on the wheel page and replace generic CONTROL statements by RADIOBUTTON statements. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Posouvání", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Otoèení koleèka o jeden krok posune o:", -1, 60, 15, 150, 10 - CONTROL "&tento poèet øádkù", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "&tento poèet øádkù", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Thu Apr 19 12:37:27 2007 @@ -131,12 +131,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bildlauf", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 - CONTROL "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Défilement", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Bouger la roulette pour défiler", -1, 60, 15, 150, 10 - CONTROL "Le nombre suivant de &lignes à la fois", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&Une page à la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "Le nombre suivant de &lignes à la fois", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Une page à la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Menggulung", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Putar roda satu derajat untuk menggulung", -1, 60, 15, 150, 10 - CONTROL "&Jumlah baris berikut sekali waktu", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&Satu layar sekali waktu", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "&Jumlah baris berikut sekali waktu", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Satu layar sekali waktu", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Thu Apr 19 12:37:27 2007 @@ -132,12 +132,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scorrimento", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Gira la rotella una tacca per scorrere", -1, 60, 15, 150, 10 - CONTROL "Il seguente numero di linee per volta", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "Il seguente numero di linee per volta", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Thu Apr 19 12:37:27 2007 @@ -129,12 +129,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Thu Apr 19 12:37:27 2007 @@ -130,12 +130,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Thu Apr 19 12:37:27 2007 @@ -138,12 +138,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Ïîâîðîò êîëèñ÷àòêà íà îäíå êëàöàííÿ ïðîêðó÷óº", -1, 60, 15, 150, 10 - CONTROL "Íà âêàçàíó ê³ëüê³ñòü &ðÿäê³â:", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "Íà îäèí &åêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "Íà âêàçàíó ê³ëüê³ñòü &ðÿäê³â:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "Íà îäèí &åêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE

1 0

[ekohl] 26419: Update indentation, no code changes.
by ekohl＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: ekohl Date: Thu Apr 19 11:10:37 2007 New Revision: 26419 URL: http://svn.reactos.org/svn/reactos?rev=26419&view=rev Log: Update indentation, no code changes. Modified: trunk/reactos/dll/cpl/main/keyboard.c trunk/reactos/dll/cpl/main/main.c Modified: trunk/reactos/dll/cpl/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?re… ============================================================================== --- trunk/reactos/dll/cpl/main/keyboard.c (original) +++ trunk/reactos/dll/cpl/main/keyboard.c Thu Apr 19 11:10:37 2007 @@ -281,16 +281,12 @@ switch(uMsg) { case WM_INITDIALOG: - { - - - /* create the hardware page */ + /* Create the hardware page */ DeviceCreateHardwarePageEx(hwndDlg, Guids, sizeof(Guids) / sizeof(Guids[0]), HWPD_STANDARDLIST); break; - } } return FALSE; Modified: trunk/reactos/dll/cpl/main/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.c?rev=26… ============================================================================== --- trunk/reactos/dll/cpl/main/main.c (original) +++ trunk/reactos/dll/cpl/main/main.c Thu Apr 19 11:10:37 2007 @@ -52,77 +52,73 @@ VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; } /* Control Panel Callback */ LONG CALLBACK CPlApplet(HWND hwndCpl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { - switch(uMsg) - { - case CPL_INIT: - return TRUE; + switch(uMsg) + { + case CPL_INIT: + return TRUE; - case CPL_GETCOUNT: - return NUM_APPLETS; + case CPL_GETCOUNT: + return NUM_APPLETS; - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + UINT uAppIndex = (UINT)lParam1; - CPlInfo->lData = lParam1; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; - break; + CPlInfo->lData = lParam1; + CPlInfo->idIcon = Applets[uAppIndex].idIcon; + CPlInfo->idName = Applets[uAppIndex].idName; + CPlInfo->idInfo = Applets[uAppIndex].idDescription; + break; + } + + case CPL_DBLCLK: + { + UINT uAppIndex = (UINT)lParam1; + Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; + } } - case CPL_DBLCLK: - { - UINT uAppIndex = (UINT)lParam1; - Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2); - break; - } - } - - return FALSE; + return FALSE; } BOOL STDCALL DllMain(HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpReserved) + DWORD dwReason, + LPVOID lpReserved) { - INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(lpReserved); + INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; + InitCommonControlsEx(&InitControls); - + hApplet = hinstDLL; + break; + } - InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; - InitCommonControlsEx(&InitControls); - - hApplet = hinstDLL; - break; - } - - return TRUE; + return TRUE; }

1 0

[winesync] 26418: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: winesync Date: Thu Apr 19 11:10:09 2007 New Revision: 26418 URL: http://svn.reactos.org/svn/reactos?rev=26418&view=rev Log: Autosyncing with Wine HEAD Removed: trunk/reactos/dll/win32/wldap32/Makefile.in Modified: trunk/reactos/dll/win32/wldap32/add.c (props changed) trunk/reactos/dll/win32/wldap32/ber.c (props changed) trunk/reactos/dll/win32/wldap32/bind.c (props changed) trunk/reactos/dll/win32/wldap32/compare.c (props changed) trunk/reactos/dll/win32/wldap32/control.c (props changed) trunk/reactos/dll/win32/wldap32/delete.c (props changed) trunk/reactos/dll/win32/wldap32/dn.c (props changed) trunk/reactos/dll/win32/wldap32/error.c (props changed) trunk/reactos/dll/win32/wldap32/extended.c (props changed) trunk/reactos/dll/win32/wldap32/init.c (props changed) trunk/reactos/dll/win32/wldap32/main.c (props changed) trunk/reactos/dll/win32/wldap32/misc.c (props changed) trunk/reactos/dll/win32/wldap32/modify.c (props changed) trunk/reactos/dll/win32/wldap32/modrdn.c (props changed) trunk/reactos/dll/win32/wldap32/option.c (props changed) trunk/reactos/dll/win32/wldap32/page.c (props changed) trunk/reactos/dll/win32/wldap32/parse.c (props changed) trunk/reactos/dll/win32/wldap32/rename.c (props changed) trunk/reactos/dll/win32/wldap32/search.c (props changed) trunk/reactos/dll/win32/wldap32/value.c (props changed) trunk/reactos/dll/win32/wldap32/winldap_private.h (props changed) trunk/reactos/dll/win32/wldap32/wldap32.h (props changed) trunk/reactos/dll/win32/wldap32/wldap32.rbuild (contents, props changed) trunk/reactos/dll/win32/wldap32/wldap32.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32.spec (props changed) trunk/reactos/dll/win32/wldap32/wldap32_De.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_En.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_Es.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_No.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc (props changed) trunk/reactos/dll/win32/wldap32/wldap32_Tr.rc (props changed) Removed: trunk/reactos/dll/win32/wldap32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/Makefile… ============================================================================== --- trunk/reactos/dll/win32/wldap32/Makefile.in (original) +++ trunk/reactos/dll/win32/wldap32/Makefile.in (removed) @@ -1,36 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = wldap32.dll -IMPORTLIB = libwldap32.$(IMPLIBEXT) -IMPORTS = user32 kernel32 -EXTRALIBS = @LDAPLIBS@ - -C_SRCS = \ - add.c \ - ber.c \ - bind.c \ - compare.c \ - control.c \ - delete.c \ - dn.c \ - error.c \ - extended.c \ - init.c \ - main.c \ - misc.c \ - modify.c \ - modrdn.c \ - option.c \ - page.c \ - parse.c \ - rename.c \ - search.c \ - value.c - -RC_SRCS = wldap32.rc - -@MAKE_DLL_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend Propchange: trunk/reactos/dll/win32/wldap32/add.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/ber.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/bind.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/compare.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/control.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/delete.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/dn.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/error.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/extended.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/init.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/modify.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/modrdn.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/option.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/page.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/parse.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/rename.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/search.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/value.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/winldap_private.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wldap32/wldap32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rbuild (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rbuild Thu Apr 19 11:10:09 2007 @@ -1,34 +1,37 @@ -<module name="wldap32" type="win32dll" baseaddress="${BASEADDRESS_WLDAP32}" installbase="system32" installname="wldap32.dll"> - <importlibrary definition="wldap32.spec.def" /> - <include base="ReactOS">include/reactos/wine</include> - <define name="_DISABLE_TIDENTS" /> - <define name="UNICODE" /> - <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0500</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>user32</library> - <file>add.c</file> - <file>ber.c</file> - <file>bind.c</file> - <file>compare.c</file> - <file>control.c</file> - <file>delete.c</file> - <file>dn.c</file> - <file>error.c</file> - <file>extended.c</file> - <file>init.c</file> - <file>main.c</file> - <file>misc.c</file> - <file>modify.c</file> - <file>modrdn.c</file> - <file>option.c</file> - <file>page.c</file> - <file>parse.c</file> - <file>rename.c</file> - <file>search.c</file> - <file>value.c</file> - <file>wldap32.spec</file> - <file>wldap32.rc</file> -</module> +<module name="wldap32" type="win32dll" baseaddress="${BASEADDRESS_WLDAP32}" installbase="system32" installname="wldap32.dll" allowwarnings="true"> + <importlibrary definition="wldap32.spec.def" /> + <include base="wldap32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>add.c</file> + <file>ber.c</file> + <file>bind.c</file> + <file>compare.c</file> + <file>control.c</file> + <file>delete.c</file> + <file>dn.c</file> + <file>error.c</file> + <file>extended.c</file> + <file>init.c</file> + <file>main.c</file> + <file>misc.c</file> + <file>modify.c</file> + <file>modrdn.c</file> + <file>option.c</file> + <file>page.c</file> + <file>parse.c</file> + <file>rename.c</file> + <file>search.c</file> + <file>value.c</file> + <file>wldap32.rc</file> + <file>wldap32.spec</file> +</module> Propchange: trunk/reactos/dll/win32/wldap32/wldap32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_De.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_En.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Es.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_No.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 26417: Prepare autosync of Wine wldap32 dll
by hpoussin＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: hpoussin Date: Thu Apr 19 11:09:34 2007 New Revision: 26417 URL: http://svn.reactos.org/svn/reactos?rev=26417&view=rev Log: Prepare autosync of Wine wldap32 dll Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Apr 19 11:09:34 2007 @@ -85,6 +85,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 +reactos/dll/win32/wldap32 # Autosync reactos/dll/directx/dinput # Synced to Wine-0_9_5 reactos/dll/directx/dinput8 # Synced to Wine-0_9_5 reactos/dll/directx/dplay # Synced to Wine-0_9_5

1 0

[greatlrd] 26416: Wrote one new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: greatlrd Date: Thu Apr 19 10:42:57 2007 New Revision: 26416 URL: http://svn.reactos.org/svn/reactos?rev=26416&view=rev Log: Wrote one new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/d3dx9xof.h (with props) Added: trunk/reactos/include/dxsdk/d3dx9xof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9xof.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9xof.h (added) +++ trunk/reactos/include/dxsdk/d3dx9xof.h Thu Apr 19 10:42:57 2007 @@ -1,0 +1,173 @@ + + +#include "d3dx9.h" + +#if !defined( __D3DX9XOF_H__ ) +#define __D3DX9XOF_H__ + +#if defined( __cplusplus ) +extern "C" { +#endif + +#if defined( _WIN32 ) && !defined( _NO_COM ) +DEFINE_GUID( IID_ID3DXFile, 0xcef08CF9, 0x7B4F, 0x4429, 0x96, 0x24, 0x2A, 0x69, 0x0A, 0x93, 0x32, 0x01 ); +DEFINE_GUID( IID_ID3DXFileSaveObject, 0xcef08CFA, 0x7B4F, 0x4429, 0x96, 0x24, 0x2A, 0x69, 0x0A, 0x93, 0x32, 0x01 ); +DEFINE_GUID( IID_ID3DXFileSaveData, 0xcef08CFB, 0x7B4F, 0x4429, 0x96, 0x24, 0x2A, 0x69, 0x0A, 0x93, 0x32, 0x01 ); +DEFINE_GUID( IID_ID3DXFileEnumObject, 0xcef08CFC, 0x7B4F, 0x4429, 0x96, 0x24, 0x2A, 0x69, 0x0A, 0x93, 0x32, 0x01 ); +DEFINE_GUID( IID_ID3DXFileData, 0xcef08CFD, 0x7B4F, 0x4429, 0x96, 0x24, 0x2A, 0x69, 0x0A, 0x93, 0x32, 0x01 ); +#endif + +#define D3DXF_FILEFORMAT_BINARY 0 +#define D3DXF_FILEFORMAT_TEXT 1 +#define D3DXF_FILEFORMAT_COMPRESSED 2 +#define D3DXF_FILESAVE_TOFILE 0x00 +#define D3DXF_FILESAVE_TOWFILE 0x01 +#define D3DXF_FILELOAD_FROMFILE 0x00 +#define D3DXF_FILELOAD_FROMWFILE 0x01 +#define D3DXF_FILELOAD_FROMRESOURCE 0x02 +#define D3DXF_FILELOAD_FROMMEMORY 0x03 +#define _FACD3DXF 0x876 +#define D3DXFERR_BADOBJECT MAKE_HRESULT( 1, _FACD3DXF, 900 ) +#define D3DXFERR_BADVALUE MAKE_HRESULT( 1, _FACD3DXF, 901 ) +#define D3DXFERR_BADTYPE MAKE_HRESULT( 1, _FACD3DXF, 902 ) +#define D3DXFERR_NOTFOUND MAKE_HRESULT( 1, _FACD3DXF, 903 ) +#define D3DXFERR_NOTDONEYET MAKE_HRESULT( 1, _FACD3DXF, 904 ) +#define D3DXFERR_FILENOTFOUND MAKE_HRESULT( 1, _FACD3DXF, 905 ) +#define D3DXFERR_RESOURCENOTFOUND MAKE_HRESULT( 1, _FACD3DXF, 906 ) +#define D3DXFERR_BADRESOURCE MAKE_HRESULT( 1, _FACD3DXF, 907 ) +#define D3DXFERR_BADFILETYPE MAKE_HRESULT( 1, _FACD3DXF, 908 ) +#define D3DXFERR_BADFILEVERSION MAKE_HRESULT( 1, _FACD3DXF, 909 ) +#define D3DXFERR_BADFILEFLOATSIZE MAKE_HRESULT( 1, _FACD3DXF, 910 ) +#define D3DXFERR_BADFILE MAKE_HRESULT( 1, _FACD3DXF, 911 ) +#define D3DXFERR_PARSEERROR MAKE_HRESULT( 1, _FACD3DXF, 912 ) +#define D3DXFERR_BADARRAYSIZE MAKE_HRESULT( 1, _FACD3DXF, 913 ) +#define D3DXFERR_BADDATAREFERENCE MAKE_HRESULT( 1, _FACD3DXF, 914 ) +#define D3DXFERR_NOMOREOBJECTS MAKE_HRESULT( 1, _FACD3DXF, 915 ) +#define D3DXFERR_NOMOREDATA MAKE_HRESULT( 1, _FACD3DXF, 916 ) +#define D3DXFERR_BADCACHEFILE MAKE_HRESULT( 1, _FACD3DXF, 917 ) + +typedef DWORD D3DXF_FILEFORMAT; +typedef DWORD D3DXF_FILESAVEOPTIONS; +typedef DWORD D3DXF_FILELOADOPTIONS; + +typedef struct _D3DXF_FILELOADMEMORY +{ + LPCVOID lpMemory; + SIZE_T dSize; +} D3DXF_FILELOADMEMORY; + +typedef struct _D3DXF_FILELOADRESOURCE +{ + HMODULE hModule; + LPCSTR lpName; + LPCSTR lpType; +} D3DXF_FILELOADRESOURCE; + + +#if defined( __cplusplus ) + #if !defined( DECLSPEC_UUID ) + #if _MSC_VER >= 1100 + #define DECLSPEC_UUID( x ) __declspec( uuid( x ) ) + #else + #define DECLSPEC_UUID( x ) + #endif + #endif + + #if defined( _COM_SMARTPTR_TYPEDEF ) + interface DECLSPEC_UUID( "CEF08CF9-7B4F-4429-9624-2A690A933201" ) ID3DXFile; + interface DECLSPEC_UUID( "CEF08CFA-7B4F-4429-9624-2A690A933201" ) ID3DXFileSaveObject; + interface DECLSPEC_UUID( "CEF08CFB-7B4F-4429-9624-2A690A933201" ) ID3DXFileSaveData; + interface DECLSPEC_UUID( "CEF08CFC-7B4F-4429-9624-2A690A933201" ) ID3DXFileEnumObject; + interface DECLSPEC_UUID( "CEF08CFD-7B4F-4429-9624-2A690A933201" ) ID3DXFileData; + #endif +#endif + +#undef INTERFACE +#define INTERFACE ID3DXFile +DECLARE_INTERFACE_( ID3DXFile, IUnknown ) +{ + STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE; + STDMETHOD_( ULONG, AddRef )( THIS ) PURE; + STDMETHOD_( ULONG, Release )( THIS ) PURE; + STDMETHOD( CreateEnumObject )( THIS_ LPCVOID, D3DXF_FILELOADOPTIONS, ID3DXFileEnumObject** ) PURE; + STDMETHOD( CreateSaveObject )( THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, ID3DXFileSaveObject** ) PURE; + STDMETHOD( RegisterTemplates )( THIS_ LPCVOID, SIZE_T ) PURE; + STDMETHOD( RegisterEnumTemplates )( THIS_ ID3DXFileEnumObject* ) PURE; +}; + +#undef INTERFACE +#define INTERFACE ID3DXFileEnumObject +DECLARE_INTERFACE_( ID3DXFileEnumObject, IUnknown ) +{ + STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE; + STDMETHOD_( ULONG, AddRef )( THIS ) PURE; + STDMETHOD_( ULONG, Release )( THIS ) PURE; + STDMETHOD( GetFile )( THIS_ ID3DXFile** ) PURE; + STDMETHOD( GetChildren )( THIS_ SIZE_T* ) PURE; + STDMETHOD( GetChild )( THIS_ SIZE_T, ID3DXFileData** ) PURE; + STDMETHOD( GetDataObjectById )( THIS_ REFGUID, ID3DXFileData** ) PURE; + STDMETHOD( GetDataObjectByName )( THIS_ LPCSTR, ID3DXFileData** ) PURE; +}; + + +#undef INTERFACE +#define INTERFACE ID3DXFileData + +DECLARE_INTERFACE_( ID3DXFileData, IUnknown ) +{ + STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE; + STDMETHOD_( ULONG, AddRef )( THIS ) PURE; + STDMETHOD_( ULONG, Release )( THIS ) PURE; + STDMETHOD( GetEnum )( THIS_ ID3DXFileEnumObject** ) PURE; + STDMETHOD( GetName )( THIS_ LPSTR, SIZE_T* ) PURE; + STDMETHOD( GetId )( THIS_ LPGUID ) PURE; + STDMETHOD( Lock )( THIS_ SIZE_T*, LPCVOID* ) PURE; + STDMETHOD( Unlock )( THIS ) PURE; + STDMETHOD( GetType )( THIS_ GUID* ) PURE; + STDMETHOD_( BOOL, IsReference )( THIS ) PURE; + STDMETHOD( GetChildren )( THIS_ SIZE_T* ) PURE; + STDMETHOD( GetChild )( THIS_ SIZE_T, ID3DXFileData** ) PURE; +}; + +#undef INTERFACE +#define INTERFACE ID3DXFileSaveData +DECLARE_INTERFACE_( ID3DXFileSaveData, IUnknown ) +{ + STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE; + STDMETHOD_( ULONG, AddRef )( THIS ) PURE; + STDMETHOD_( ULONG, Release )( THIS ) PURE; + STDMETHOD( GetSave )( THIS_ ID3DXFileSaveObject** ) PURE; + STDMETHOD( GetName )( THIS_ LPSTR, SIZE_T* ) PURE; + STDMETHOD( GetId )( THIS_ LPGUID ) PURE; + STDMETHOD( GetType )( THIS_ GUID* ) PURE; + STDMETHOD( AddDataObject )( THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, ID3DXFileSaveData** ) PURE; + STDMETHOD( AddDataReference )( THIS_ LPCSTR, CONST GUID* ) PURE; +}; + +#undef INTERFACE +#define INTERFACE ID3DXFileSaveObject +DECLARE_INTERFACE_( ID3DXFileSaveObject, IUnknown ) +{ + STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE; + STDMETHOD_( ULONG, AddRef )( THIS ) PURE; + STDMETHOD_( ULONG, Release )( THIS ) PURE; + STDMETHOD( GetFile )( THIS_ ID3DXFile** ) PURE; + STDMETHOD( AddDataObject )( THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, ID3DXFileSaveData** ) PURE; + STDMETHOD( Save )( THIS ) PURE; +}; + +#ifndef WIN_TYPES +#define WIN_TYPES(itype, ptype) typedef interface itype *LP##ptype, **LPLP##ptype +#endif +WIN_TYPES(ID3DXFile, D3DXFILE); +WIN_TYPES(ID3DXFileEnumObject, D3DXFILEENUMOBJECT); +WIN_TYPES(ID3DXFileSaveObject, D3DXFILESAVEOBJECT); +WIN_TYPES(ID3DXFileData, D3DXFILEDATA); +WIN_TYPES(ID3DXFileSaveData, D3DXFILESAVEDATA); +#if defined( __cplusplus ) +} +#endif + +#endif + + Propchange: trunk/reactos/include/dxsdk/d3dx9xof.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[arty] 26415: Some stragglers.
by arty＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: arty Date: Thu Apr 19 09:36:21 2007 New Revision: 26415 URL: http://svn.reactos.org/svn/reactos?rev=26415&view=rev Log: Some stragglers. Modified: branches/powerpc/reactos/boot/freeldr/bootsect/bootsect.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h branches/powerpc/reactos/boot/freeldr/freeldr/mm/mm.c Modified: branches/powerpc/reactos/boot/freeldr/bootsect/bootsect.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/bootsect.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/bootsect.rbuild Thu Apr 19 09:36:21 2007 @@ -18,9 +18,3 @@ <bootstrap base="loader" nameoncd="isoboot.bin" /> <file>isoboot.asm</file> </module> -<if property="ARCH" value="powerpc"> - <module name="ofwldr" type="bootprogram" payload="freeldr"> - <bootstrap base="loader" nameoncd="boot/ofwldr" /> - <file>ofwboot.s</file> - </module> -</if> Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h Thu Apr 19 09:36:21 2007 @@ -6,7 +6,10 @@ int GetDEC(); int GetMSR(); int GetPhys( int addr ); +int GetPhysHalf( int addr ); +int GetPhysByte( int addr ); void SetPhys( int addr, int val ); +void SetPhysHalf( int addr, int val ); void SetPhysByte( int addr, int val ); int GetSR(int n); void GetBat( int bat, int inst, int *batHi, int *batLo ); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/mm/mm.c Thu Apr 19 09:36:21 2007 @@ -95,7 +95,7 @@ ULONG ptr; printf("Allocating %d bytes directly ...\n", MemorySize); ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE); - MemPointer = (PVOID)(REV(ptr)); + MemPointer = (PVOID)(ptr); #endif if( !MemPointer ) {

1 0

[dgorbachev] 26414: Fix Ukrainian translation.
by dgorbachev＠svn.reactos.org 19 Apr '07

19 Apr '07

Author: dgorbachev Date: Thu Apr 19 04:31:15 2007 New Revision: 26414 URL: http://svn.reactos.org/svn/reactos?rev=26414&view=rev Log: Fix Ukrainian translation. Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Thu Apr 19 04:31:15 2007 @@ -12,7 +12,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON @@ -96,7 +95,7 @@ CAPTION "Ìîâè ³ ðîçêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - + LTEXT "Input Locale Page",-1,73,74,90,8 END

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
38
Older →

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 April 2007