Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[cwittich] 26403: fix a bug and some warnings in ddraw
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 23:51:21 2007 New Revision: 26403 URL: http://svn.reactos.org/svn/reactos?rev=26403&view=rev Log: fix a bug and some warnings in ddraw Modified: trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Wed Apr 18 23:51:21 2007 @@ -15,7 +15,7 @@ VOID Cleanup(LPDIRECTDRAW7 iface) { - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Wed Apr 18 23:51:21 2007 @@ -171,7 +171,8 @@ LPDDRAWI_DDRAWSURFACE_LCL *lpLcl; DWORD dwHowManySurface = 1; DWORD i; - LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl; + //LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl; + if (pUnkOuter!=NULL) { return CLASS_E_NOAGGREGATION; @@ -232,7 +233,7 @@ } /* Calc how many surface we need setup */ - if (pDDSD->ddsCaps.dwCaps &DDSD_BACKBUFFERCOUNT) + if (pDDSD->ddsCaps.dwCaps & DDSD_BACKBUFFERCOUNT) { /* One primary + xx backbuffer */ dwHowManySurface |= pDDSD->dwBackBufferCount; Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Apr 18 23:51:21 2007 @@ -497,7 +497,7 @@ This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - *phDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; + *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC; return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed Apr 18 23:51:21 2007 @@ -926,7 +926,7 @@ } /* we need check the GUID lpGUID what type it is */ - if (pGUID != DDCREATE_HARDWAREONLY) + if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) { if (pGUID !=NULL) {

1 0

[cwittich] 26402: disable IntEngGradientFillTriangle because of an endless loop and add a FIXME
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 23:07:11 2007 New Revision: 26402 URL: http://svn.reactos.org/svn/reactos?rev=26402&view=rev Log: disable IntEngGradientFillTriangle because of an endless loop and add a FIXME Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c Wed Apr 18 23:07:11 2007 @@ -318,19 +318,19 @@ { SURFOBJ *OutputObj; PTRIVERTEX v1, v2, v3; - RECT_ENUM RectEnum; - BOOL EnumMore; - ULONG i; + //RECT_ENUM RectEnum; + //BOOL EnumMore; + //ULONG i; POINTL Translate; INTENG_ENTER_LEAVE EnterLeave; RECTL FillRect; - ULONG Color; - - BOOL sx[NLINES]; - LONG x[NLINES], dx[NLINES], dy[NLINES], incx[NLINES], ex[NLINES], destx[NLINES]; - LONG c[NLINES][3], dc[NLINES][3], ec[NLINES][3], ic[NLINES][3]; /* colors on lines */ - LONG g, gx, gxi, gc[3], gd[3], ge[3], gi[3]; /* colors in triangle */ - LONG sy, y, bt; + //ULONG Color; + + //BOOL sx[NLINES]; + //LONG x[NLINES], dx[NLINES], dy[NLINES], incx[NLINES], ex[NLINES], destx[NLINES]; + //LONG c[NLINES][3], dc[NLINES][3], ec[NLINES][3], ic[NLINES][3]; /* colors on lines */ + //LONG g, gx, gxi, gc[3], gd[3], ge[3], gi[3]; /* colors in triangle */ + //LONG sy, y, bt; v1 = (pVertex + gTriangle->Vertex1); v2 = (pVertex + gTriangle->Vertex2); @@ -353,100 +353,102 @@ } DbgPrint("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x, v2->y, v3->x, v3->y); + /* FIXME: commented out because of an endless loop - fix triangles first */ + DbgPrint("FIXME: IntEngGradientFillTriangle is broken"); if(!IntEngEnter(&EnterLeave, psoDest, &FillRect, FALSE, &Translate, &OutputObj)) { return FALSE; } - if(VCMPCLRS(v1, v2, v3)) - { - CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); - do - { - EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); - for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) - { - if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) - { - BOOL InY; - - DOINIT(v1, v3, 0); - DOINIT(v1, v2, 1); - DOINIT(v2, v3, 2); - - y = v1->y; - sy = v1->y + pptlDitherOrg->y; - bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); - - while(sy < bt) - { - InY = !(sy < FillRect.top || sy >= FillRect.bottom); - GOLINE(v1, v3, 0); - DOLINE(v1, v3, 0); - ENDLINE(v1, v3, 0); - - GOLINE(v1, v2, 1); - DOLINE(v1, v2, 1); - FILLLINE(0, 1); - ENDLINE(v1, v2, 1); - - GOLINE(v2, v3, 2); - DOLINE(v2, v3, 2); - FILLLINE(0, 2); - ENDLINE(23, v3, 2); - - y++; - sy++; - } - } - } - } while(EnumMore); - - return IntEngLeave(&EnterLeave); - } - - /* fill triangle with one solid color */ - - Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8, v1->Blue >> 8)); - CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); - do - { - EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); - for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) - { - if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) - { - S_INITLINE(v1, v3, 0); - S_INITLINE(v1, v2, 1); - S_INITLINE(v2, v3, 2); - - y = v1->y; - sy = v1->y + pptlDitherOrg->y; - bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); - - while(sy < bt) - { - S_GOLINE(v1, v3, 0); - S_DOLINE(v1, v3, 0); - S_ENDLINE(v1, v3, 0); - - S_GOLINE(v1, v2, 1); - S_DOLINE(v1, v2, 1); - S_FILLLINE(0, 1); - S_ENDLINE(v1, v2, 1); - - S_GOLINE(v2, v3, 2); - S_DOLINE(v2, v3, 2); - S_FILLLINE(0, 2); - S_ENDLINE(23, v3, 2); - - y++; - sy++; - } - } - } - } while(EnumMore); + //if(VCMPCLRS(v1, v2, v3)) + //{ + // CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); + // do + // { + // EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + // for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) + // { + // if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) + // { + // BOOL InY; + + // DOINIT(v1, v3, 0); + // DOINIT(v1, v2, 1); + // DOINIT(v2, v3, 2); + + // y = v1->y; + // sy = v1->y + pptlDitherOrg->y; + // bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); + + // while(sy < bt) + // { + // InY = !(sy < FillRect.top || sy >= FillRect.bottom); + // GOLINE(v1, v3, 0); + // DOLINE(v1, v3, 0); + // ENDLINE(v1, v3, 0); + + // GOLINE(v1, v2, 1); + // DOLINE(v1, v2, 1); + // FILLLINE(0, 1); + // ENDLINE(v1, v2, 1); + + // GOLINE(v2, v3, 2); + // DOLINE(v2, v3, 2); + // FILLLINE(0, 2); + // ENDLINE(23, v3, 2); + + // y++; + // sy++; + // } + // } + // } + // } while(EnumMore); + + // return IntEngLeave(&EnterLeave); + //} + + ///* fill triangle with one solid color */ + + //Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8, v1->Blue >> 8)); + //CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); + //do + //{ + // EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + // for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) + // { + // if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) + // { + // S_INITLINE(v1, v3, 0); + // S_INITLINE(v1, v2, 1); + // S_INITLINE(v2, v3, 2); + + // y = v1->y; + // sy = v1->y + pptlDitherOrg->y; + // bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); + + // while(sy < bt) + // { + // S_GOLINE(v1, v3, 0); + // S_DOLINE(v1, v3, 0); + // S_ENDLINE(v1, v3, 0); + + // S_GOLINE(v1, v2, 1); + // S_DOLINE(v1, v2, 1); + // S_FILLLINE(0, 1); + // S_ENDLINE(v1, v2, 1); + + // S_GOLINE(v2, v3, 2); + // S_DOLINE(v2, v3, 2); + // S_FILLLINE(0, 2); + // S_ENDLINE(23, v3, 2); + + // y++; + // sy++; + // } + // } + // } + //} while(EnumMore); return IntEngLeave(&EnterLeave); }

1 0

[cwittich] 26401: fix build of d3d8.dll and add it to bootcd (needed by Trillian)
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 22:19:26 2007 New Revision: 26401 URL: http://svn.reactos.org/svn/reactos?rev=26401&view=rev Log: fix build of d3d8.dll and add it to bootcd (needed by Trillian) Added: trunk/reactos/dll/directx/d3d8/d3d8.rbuild Modified: trunk/reactos/dll/directx/d3d8/d3d8.c trunk/reactos/dll/directx/directx.rbuild Modified: trunk/reactos/dll/directx/d3d8/d3d8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.c (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.c Wed Apr 18 22:19:26 2007 @@ -1,26 +1,28 @@ #include <windows.h> #include "d3d8.h" +#include <debug.h> + HRESULT DLLAPI ValidatePixelShader(void) { - OutputDebugString("ValidateVertexShader not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI ValidateVertexShader(void) { - OutputDebugString("ValidateVertexShader not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI DebugSetMute(DWORD dw1) { - OutputDebugString("DebugSetMute not implemented."); + UNIMPLEMENTED return 0; } DWORD DLLAPI Direct3DCreate8( UINT SDKVersion ) { - OutputDebugString("Direct3DCreate8 not implemented."); + UNIMPLEMENTED return 0; } Added: trunk/reactos/dll/directx/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rbuild (added) +++ trunk/reactos/dll/directx/d3d8/d3d8.rbuild Wed Apr 18 22:19:26 2007 @@ -1,0 +1,5 @@ +<module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll"> + <importlibrary definition="d3d8.def" /> + <file>d3d8.c</file> + <file>d3d8.rc</file> +</module> Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild (original) +++ trunk/reactos/dll/directx/directx.rbuild Wed Apr 18 22:19:26 2007 @@ -28,6 +28,9 @@ <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> </directory> +<directory name="d3d8"> + <xi:include href="d3d8/d3d8.rbuild" /> +</directory> <directory name="d3d9"> <xi:include href="d3d9/d3d9.rbuild" /> </directory>

1 0

[cwittich] 26400: implemented SPI_GETKEYBOARDCUES (hardcoded to TRUE)
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 20:45:09 2007 New Revision: 26400 URL: http://svn.reactos.org/svn/reactos?rev=26400&view=rev Log: implemented SPI_GETKEYBOARDCUES (hardcoded to TRUE) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Apr 18 20:45:09 2007 @@ -953,6 +953,7 @@ switch(uiAction) { + case SPI_GETKEYBOARDCUES: case SPI_SETDOUBLECLKWIDTH: case SPI_SETDOUBLECLKHEIGHT: case SPI_SETDOUBLECLICKTIME: @@ -984,6 +985,9 @@ switch(uiAction) { + case SPI_GETKEYBOARDCUES: + ASSERT(pvParam); + *((BOOL*)pvParam) = TRUE; case SPI_GETFLATMENU: ASSERT(pvParam); *((UINT*)pvParam) = WinStaObject->FlatMenu; @@ -1412,6 +1416,7 @@ } return( TRUE); } + case SPI_GETKEYBOARDCUES: case SPI_GETFONTSMOOTHING: case SPI_GETGRADIENTCAPTIONS: case SPI_GETFOCUSBORDERHEIGHT:

1 0

[ekohl] 26399: - Show the current cursor scheme upon page initialization. - Update the cursor list and the cursor preview when a new cursor scheme is selected. - Update the cursor preview when another cursor is selected.
by ekohl＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: ekohl Date: Wed Apr 18 19:42:13 2007 New Revision: 26399 URL: http://svn.reactos.org/svn/reactos?rev=26399&view=rev Log: - Show the current cursor scheme upon page initialization. - Update the cursor list and the cursor preview when a new cursor scheme is selected. - Update the cursor preview when another cursor is selected. 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 Wed Apr 18 19:42:13 2007 @@ -515,6 +515,10 @@ HWND hDlgCtrl; LRESULT lResult; BOOL ProcessedHKLM = FALSE; + TCHAR szCurrentScheme[MAX_PATH]; + DWORD dwCurrentScheme; + INT nSchemeIndex; + INT i, nCount; if (RegOpenCurrentUser(KEY_READ, &hCuKey) != ERROR_SUCCESS) return FALSE; @@ -572,23 +576,55 @@ RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); + /* Add the "(none)" entry */ LoadString(hApplet, IDS_NONE, szSystemScheme, MAX_PATH); lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szSystemScheme); SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)NULL); - SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); + + + /* Get the name of the current cursor scheme */ + szCurrentScheme[0] = 0; + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Cursors"), 0, KEY_READ, &hCuCursorKey) == ERROR_SUCCESS) + { + dwCurrentScheme = sizeof(szCurrentScheme) / sizeof(TCHAR); + if (RegQueryValueEx(hCuCursorKey, NULL, NULL, NULL, (LPBYTE)szCurrentScheme, &dwCurrentScheme)) + szCurrentScheme[0] = 0; + RegCloseKey(hCuCursorKey); + } + + 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) + { + nSchemeIndex = (INT)i; + } + } + + if (nSchemeIndex != -1) + SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)nSchemeIndex, (LPARAM)0); + else + { + SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); + EnableWindow(hDlgCtrl, FALSE); + } return TRUE; } static VOID -RefreshCursorList(HWND hwndDlg) +RefreshCursorList(HWND hwndDlg, BOOL bInit) { // TCHAR szCursorName[MAX_PATH]; // HWND hDlgCtrl; // LV_ITEM listItem; // LV_COLUMN column; - INT index = 0, i; + INT index = 0, i, nSel; #if 0 hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); @@ -667,12 +703,21 @@ (void)ListView_InsertItem(hDlgCtrl, &listItem); #endif + if (bInit) + nSel = 0; + else + nSel = 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++) { LoadString(hApplet, index, g_CursorData[i].szCursorName, MAX_PATH); SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_ADDSTRING, 0, (LPARAM)i); } + + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_SETCURSEL, nSel, 0); + SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, + (LPARAM)g_CursorData[nSel].hCursor); } @@ -854,18 +899,48 @@ DestroyCursor(g_CursorData[i].hCursor); g_CursorData[i].hCursor = 0; } + g_CursorData[i].szCursorPath[0] = 0; } if (lpName == NULL) { - for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) +// for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) +// { +// g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); +// } + } + else + { + LPTSTR pStart = lpName; + LPTSTR pEnd = pStart; + INT nLength; + + i = 0; + while (pEnd) { + pEnd = _tcschr(pStart, _T(',')); + if (pEnd) + nLength = ((INT_PTR)pEnd - (INT_PTR)pStart) / sizeof(TCHAR); + else + nLength = _tcslen(pStart); + + _tcsncpy(g_CursorData[i].szCursorPath, pStart, nLength); + g_CursorData[i].szCursorPath[nLength] = 0; + + pStart = pStart + (nLength + 1); + i++; + } + + } + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (g_CursorData[i].szCursorPath[0] == 0) g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); - } - } - else - { - + else + g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].szCursorPath, + IMAGE_CURSOR, 0, 0, + LR_LOADFROMFILE | LR_DEFAULTSIZE); } } @@ -950,8 +1025,8 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pPointerData); EnumerateCursorSchemes(hwndDlg); - RefreshCursorList(hwndDlg); - SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_SETCURSEL, 0, 0); + LoadCurrentCursorScheme(NULL, FALSE); + RefreshCursorList(hwndDlg, TRUE); /* Get drop shadow setting */ if (!SystemParametersInfo(SPI_GETDROPSHADOW, 0, &pPointerData->bDropShadow, 0)) @@ -1005,31 +1080,29 @@ switch (LOWORD(wParam)) { case IDC_COMBO_CURSOR_SCHEME: - switch(HIWORD(wParam)) - { - case CBN_SELENDOK: - { - BOOL bEnable; - LPTSTR lpName; - - wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); - if(wParam == CB_ERR) - break; - SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted - bEnable = FALSE; - else - bEnable = TRUE; - - /* delete button */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); - EnableWindow(hDlgCtrl, bEnable); - - lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); - LoadCurrentCursorScheme(lpName, !bEnable); + if (HIWORD(wParam) == CBN_SELENDOK) + { + BOOL bEnable; + LPTSTR lpName; + + wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); + if(wParam == CB_ERR) break; - } + + SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted + bEnable = FALSE; + else + bEnable = TRUE; + + /* delete button */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); + EnableWindow(hDlgCtrl, bEnable); + + lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); + LoadCurrentCursorScheme(lpName, !bEnable); + RefreshCursorList(hwndDlg, FALSE); } break;

1 0

[cwittich] 26398: revert the translation patches for wine-autosynced modules
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 19:30:04 2007 New Revision: 26398 URL: http://svn.reactos.org/svn/reactos?rev=26398&view=rev Log: revert the translation patches for wine-autosynced modules Removed: trunk/reactos/dll/win32/crypt32/crypt32_Pl.rc trunk/reactos/dll/win32/msi/msi_Pl.rc trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/mpr/mpr_Pl.rc trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc Wed Apr 18 19:30:04 2007 @@ -34,4 +34,3 @@ #include "crypt32_En.rc" #include "crypt32_Ko.rc" #include "crypt32_No.rc" -#include "crypt32_Pl.rc" Removed: trunk/reactos/dll/win32/crypt32/crypt32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Pl.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Pl.rc (removed) @@ -1,154 +1,0 @@ -/* - * translated by TestamenT - * testament(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * - *specialne thanks for Caemyr - */ - -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_AUTHORITY_KEY_ID "Identyfikator klucza urzêdu" - IDS_KEY_ATTRIBUTES "Atrybuty klucza" - IDS_KEY_USAGE_RESTRICTION "Ograniczenia u¿ycia klucza" - IDS_SUBJECT_ALT_NAME "Alternatywna nazwa podmiotu" - IDS_ISSUER_ALT_NAME "Alternatywna nazwa wystawcy" - IDS_BASIC_CONSTRAINTS "Podstawowe warunki ograniczaj¹ce" - IDS_KEY_USAGE "U¿ycie klucza" - IDS_CERT_POLICIES "Zasady certyfikatu" - IDS_SUBJECT_KEY_IDENTIFIER "Identyfikator klucza podmiotu" - IDS_CRL_REASON_CODE "Kod przyczyny listy CRL" - IDS_CRL_DIST_POINTS "Punkty dystrybucji listy CRL" - IDS_ENHANCED_KEY_USAGE "U¿ycie klucza rozszerzonego" - IDS_AUTHORITY_INFO_ACCESS "Dostêp do informacji o urzêdach" - IDS_CERT_EXTENSIONS "Rozszerzenia certyfikatu" - IDS_NEXT_UPDATE_LOCATION "Lokalizacja nastêpnej aktualizacji" - IDS_YES_OR_NO_TRUST "Zaufanie Tak lub Nie" - IDS_EMAIL_ADDRESS "Adres e-mail" - IDS_UNSTRUCTURED_NAME "Nazwa bez struktury" - IDS_CONTENT_TYPE "Typ zawartoci" - IDS_MESSAGE_DIGEST "Odtwarzanie wiadomoci" - IDS_SIGNING_TIME "Czas podpisu" - IDS_COUNTER_SIGN "Znak licznika" - IDS_CHALLENGE_PASSWORD "Has³o wezwania" - IDS_UNSTRUCTURED_ADDRESS "Adres bez struktury" - IDS_SMIME_CAPABILITIES "Mo¿liwoci edytora SMIME" - IDS_PREFER_SIGNED_DATA "Preferuj dane podpisane" - IDS_CPS "CPS" - IDS_USER_NOTICE "Powiadomienie u¿ytkownika" - IDS_OCSP "Protokó³ stanu certyfikatu online" - IDS_CA_ISSUER "Urz¹d certyfikacji - wystawca" - IDS_CERT_TEMPLATE_NAME "Nazwa szablonu certyfikatu" - IDS_CERT_TYPE "Typ certyfikatu" - IDS_CERT_MANIFOLD "Wielokrotnoæ certyfikatu" - IDS_NETSCAPE_CERT_TYPE "Typ certyfikatu Netscape" - IDS_NETSCAPE_BASE_URL "Bazowy adres URL Netscape" - IDS_NETSCAPE_REVOCATION_URL "Adres URL odwo³ywania Netscape" - IDS_NETSCAPE_CA_REVOCATION_URL "Adres CA odwo³ywania Netscape" - IDS_NETSCAPE_CERT_RENEWAL_URL "Adres URL odnawiania certyfikatu Netscape" - IDS_NETSCAPE_CA_POLICY_URL "Adres URL zasad CA Netscape" - IDS_NETSCAPE_SSL_SERVER_NAME "Nazwa serwera SSL Netscape" - IDS_NETSCAPE_COMMENT "Komentarz Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" - IDS_COUNTRY "Kraj/region" - IDS_ORGANIZATION "Organizacja" - IDS_ORGANIZATIONAL_UNIT "Jednostka organizacyjna" - IDS_COMMON_NAME "Przydomek" - IDS_LOCALITY "Miasto" - IDS_STATE_OR_PROVINCE "Województwo" - IDS_TITLE "Tytu³" - IDS_GIVEN_NAME "Imiê" - IDS_INITIALS "Inicja³y" - IDS_SUR_NAME "Nazwisko" - IDS_DOMAIN_COMPONENT "Sk³adnik domeny" - IDS_STREET_ADDRESS "Ulica" - IDS_SERIAL_NUMBER "Numer seryjny" - IDS_CA_VERSION "Wersja urzêdu certyfikacji" - IDS_CROSS_CA_VERSION "Krzy¿owa Wersja urzêdu certyfikacji" - IDS_SERIALIZED_SIG_SERIAL_NUMBER "Numer seryjny podpisu" - IDS_PRINCIPAL_NAME "Nazwa g³ówna" - IDS_WINDOWS_PRODUCT_UPDATE "Aktualizacja produktu Windows" - IDS_ENROLLMENT_NAME_VALUE_PAIR "Para wartoci nazwy rejestracyjnej" - IDS_OS_VERSION "Wersja systemu operacyjnego" - IDS_ENROLLMENT_CSP "Dostawca us³ug kryptograficznych rejestracji" - IDS_CRL_NUMBER "Numer listy CRL" - IDS_DELTA_CRL_INDICATOR "Wskanik ró¿nicowej listy CRL" - IDS_ISSUING_DIST_POINT "Wystawianie punktu dystrybucji" - IDS_FRESHEST_CRL "Najnowsza lista CRL" - IDS_NAME_CONSTRAINTS "Warunki ograniczaj¹ce nazw" - IDS_POLICY_MAPPINGS "Mapowania zasad" - IDS_POLICY_CONSTRAINTS "Warunki ograniczaj¹ce zasad" - IDS_CROSS_CERT_DIST_POINTS "Punkty dystrybucji certyfikatów krzy¿owych" - IDS_APPLICATION_POLICIES "Zasady aplikacji" - IDS_APPLICATION_POLICY_MAPPINGS "Mapowania zasad aplikacji" - IDS_APPLICATION_POLICY_CONSTRAINTS "Warunki ograniczaj¹ce zasad aplikacji" - IDS_CMC_DATA "Dane CMC" - IDS_CMC_RESPONSE "Odpowied CMC" - IDS_UNSIGNED_CMC_REQUEST "Niepodpisane ¿¹danie CMC" - IDS_CMC_STATUS_INFO "Informacja o stanie CMC" - IDS_CMC_EXTENSIONS "Rozszerzenia CMC" - IDS_CMC_ATTRIBUTES "Atrybuty CMC" - IDS_PKCS_7_DATA "Dane certyfikatu PKCS 7" - IDS_PKCS_7_SIGNED "Podpisany certyfikat PKCS 7" - IDS_PKCS_7_ENVELOPED "Opakowany certyfikat PKCS 7" - IDS_PKCS_7_SIGNED_ENVELOPED "Opakowany podpisany certyfikat PKCS 7" - IDS_PKCS_7_DIGESTED "Porz¹dkowany certyfikat PKCS 7" - IDS_PKCS_7_ENCRYPTED "Szyfrowany certyfikat PKCS 7" - IDS_PREVIOUS_CA_CERT_HASH "Mieszanie certyfikatu poprzedniego urzêdu certyfikacji" - IDS_CRL_VIRTUAL_BASE "Numer wirtualnej listy podstawowej CRL" - IDS_CRL_NEXT_PUBLISH "Publikowanie nastêpnej listy CRL" - IDS_CA_EXCHANGE "Certyfikat szyfrowania urzêdu certyfikacji" - IDS_KEY_RECOVERY_AGENT "Agent odzyskiwania kluczy" - IDS_CERTIFICATE_TEMPLATE "Informacje o szablonie certyfikatu" - IDS_ENTERPRISE_ROOT_OID "G³ówny identyfikator OID przedsiêbiorstwa" - IDS_RDN_DUMMY_SIGNER "Fikcyjny podpisuj¹cy" - IDS_ARCHIVED_KEY_ATTR "Szyfrowany klucz prywatny" - IDS_CRL_SELF_CDP "Publikowane lokalizacje listy CRL" - IDS_REQUIRE_CERT_CHAIN_POLICY "Zasada wymuszania ³añcucha certyfikatów" - IDS_TRANSACTION_ID "ID transakcji" - IDS_SENDER_NONCE "Nadawca identyfikatora jednorazowego" - IDS_RECIPIENT_NONCE "Odbiorca identyfikatora jednorazowego" - IDS_REG_INFO "Informacja o rejestrze" - IDS_GET_CERTIFICATE "Pobierz certyfikat" - IDS_GET_CRL "Pobierz CRL" - IDS_REVOKE_REQUEST "Odwo³aj ¿¹danie" - IDS_QUERY_PENDING "Zapytanie w toku" - IDS_SORTED_CTL "Lista zaufanych certyfikatów" - IDS_ARCHIVED_KEY_CERT_HASH "Zarchiwizowany hash certyfikatu kluczowego" - IDS_PRIVATE_KEY_USAGE_PERIOD "Okres U¿ycia klucza prywatnego" - IDS_CLIENT_INFORMATION "Informacja o kliencie" - IDS_SERVER_AUTHENTICATION "Uwierzytelnienie serwera" - IDS_CLIENT_AUTHENTICATION "Uwierzytelnienie klienta" - IDS_CODE_SIGNING "Podpisywanie kodu" - IDS_SECURE_EMAIL "Bezpieczna poczta e-mail" - IDS_TIME_STAMPING "Sygnatura czasowa" - IDS_MICROSOFT_TRUST_LIST_SIGNING "Podpisywanie listy zaufania firmy Microsoft" - IDS_MICROSOFT_TIME_STAMPING "Oznaczanie sygnatur¹ czasow¹ firmy Microsoft" - IDS_IPSEC_END_SYSTEM "System koñcowy zabezpieczeñ IP" - IDS_IPSEC_TUNNEL "Terminacja tunelu zabezpieczeñ IP" - IDS_IPSEC_USER "U¿ytkownik zabezpieczeñ IP" - IDS_EFS "System plików szyfrowania" - IDS_WHQL_CRYPTO "Weryfikacja sprzêtowych sterowników systemu Windows" - IDS_NT5_CRYPTO "Weryfikacja sk³adników systemowych Windows" - IDS_OEM_WHQL_CRYPTO "Weryfikacja sk³adników systemu Windows OEM" - IDS_EMBEDDED_NT_CRYPTO "Weryfikacja osadzonych sk³adników systemu Windows" - IDS_KEY_PACK_LICENSES "Licencje pakietu kluczy" - IDS_LICENSE_SERVER "Weryfikacja serwera licencji" - IDS_SMART_CARD_LOGON "Logowanie karty inteligentnej" - IDS_DIGITAL_RIGHTS "Prawa cyfrowe" - IDS_QUALIFIED_SUBORDINATION "Subordynacja kwalifikowana" - IDS_KEY_RECOVERY "Odzyskiwanie kluczy" - IDS_DOCUMENT_SIGNING "Podpisywanie dokumentu" - IDS_IPSEC_IKE_INTERMEDIATE "Porednie szyfrowanie IKE zabezpieczeñ IP" - IDS_FILE_RECOVERY "Odzyskiwanie plików" - IDS_ROOT_LIST_SIGNER "Modu³ podpisywania listy g³ównej" - IDS_ANY_APPLICATION_POLICIES "Wszystkie zasady aplikacji" - IDS_DS_EMAIL_REPLICATION "Replikacja poczty e-mail us³ugi katalogowej" - IDS_ENROLLMENT_AGENT "Agent ¿¹dania certyfikatu" - IDS_LIFETIME_SIGNING "Agent odzyskiwania kluczy" - IDS_ANY_CERT_POLICY "Wszystkie zasady wystawiania" -} Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Pl.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Pl.rc Wed Apr 18 19:30:04 2007 @@ -1,32 +1,46 @@ /* - * translated by TestamenT - * testament(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl + * MPR dll resources * + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Sieæ wy³¹czna" + IDS_ENTIRENETWORK "Ca³a sieæ" } IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wpisz has³o sieci" +CAPTION "Wprowad has³o do sieci" FONT 8, "MS Shell Dlg" { - LTEXT "Proszê wpisaæ swoj¹ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "U¿ytkownika", -1, 40, 66, 50, 10 +/* LTEXT "Obszar", -1, 40, 46, 50, 10 */ + LTEXT "U¿ytkownik", -1, 40, 66, 50, 10 LTEXT "Has³o", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Zapisz to has³o (ryzykowne)", IDC_SAVEPASSWORD, + CHECKBOX "&Zapamiêtaj to has³o (nie bezpieczne)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=2… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc (original) +++ trunk/reactos/dll/win32/msi/msi.rc Wed Apr 18 19:30:04 2007 @@ -39,7 +39,6 @@ #include "msi_Ko.rc" #include "msi_Nl.rc" #include "msi_No.rc" -#include "msi_Pl.rc" #include "msi_Pt.rc" #include "msi_Ru.rc" #include "msi_Tr.rc" Removed: trunk/reactos/dll/win32/msi/msi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msi_Pl.rc (original) +++ trunk/reactos/dll/win32/msi/msi_Pl.rc (removed) @@ -1,21 +1,0 @@ -/* - * translated by TestamenT - * testament(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * - */ - -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - 4 "Okrelona paczka instalacji nie mog³aby zostaæ otwarta. Proszê sprawd cie¿kê pliku i spróbowaæ ponownie." - 5 "cie¿ka %s nie znaleziona" - 9 "wstaw dysk %s" - 10 "z³e parametry" - 11 "wejd, który folder zawiera %s" - 12 "zainstaluj ród³o dla brakuj¹cych plików" - 13 "napêd dyskowy sieci dla brakuj¹cych plików" - 14 "Plik od:" - 15 "wybierz, który folder zawiera %s" -} Removed: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc (removed) @@ -1,44 +1,0 @@ -/* - * translated by TestamenT - * testament(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * - */ - -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wstaw Object" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Typ Obiektu:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Anuluj",IDCANCEL,221,24,66,14 - GROUPBOX "Wynik",IDC_RESULT,7,103,208,41 - CONTROL "Utwórz Nowy",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Utwórz Kontrolê",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Utwórz Od Pliku",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Dodaj Kontrolê...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Pokaz Jako Ikona",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Przejrzyj...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Plik:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Wstaw ja nowy %s obiekt do twojego dokumentu" - IDS_RESULTFILEOBJDESC "Wstaw ja zawartoci pliku jako obiekt do twojego dokumentu, ¿eby móg³ aktywowaæ siê to u¿ywaj¹cego programu, który utworzy³ to." - IDS_BROWSE "Przejrzyj" - IDS_NOTOLEMOD "Plik nie ukazuje siê, by byæ wa¿nym modu³em OLE. Niezdolny do rejestr kontroli OLE." - IDS_NOTOLEMODCAPTION "Dodaj Kontrolê" -} Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc Wed Apr 18 19:30:04 2007 @@ -42,7 +42,6 @@ #include "oledlg_Ko.rc" #include "oledlg_Nl.rc" #include "oledlg_No.rc" -#include "oledlg_Pl.rc" #include "oledlg_Pt.rc" #include "oledlg_Tr.rc" #include "oledlg_Uk.rc"

1 0

[cwittich] 26397: polish translation from the polish translation team See issue #2181 for more details.
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 19:21:29 2007 New Revision: 26397 URL: http://svn.reactos.org/svn/reactos?rev=26397&view=rev Log: polish translation from the polish translation team See issue #2181 for more details. Added: trunk/reactos/base/applications/cacls/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/charmap/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/mmc/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/network/ipconfig/pl-PL.rc trunk/reactos/base/applications/regedit/clb/lang/pl-PL.rc trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/wordpad/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc trunk/reactos/base/setup/welcome/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/system/expand/lang/pl-PL.rc trunk/reactos/base/system/format/lang/pl-PL.rc trunk/reactos/base/system/regsvr32/lang/pl-PL.rc trunk/reactos/base/system/rundll32/lang/pl-PL.rc trunk/reactos/base/system/userinit/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc trunk/reactos/dll/cpl/liccpa/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/win32/console/lang/pl-PL.rc trunk/reactos/dll/win32/crypt32/crypt32_Pl.rc trunk/reactos/dll/win32/msacm/msacm_Pl.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msi/msi_Pl.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/newdev/lang/pl-PL.rc trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc trunk/reactos/dll/win32/serialui/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/mmc/mmc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/intl_new/intl.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/win32/console/rsrc.rc trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/mpr/mpr_Pl.rc trunk/reactos/dll/win32/msacm/msacm.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/oledlg/rsrc.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/res/lang/Pl.rc trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/user32/Pl.rc trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/subsystems/ntvdm/ntvdm.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/cacls/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… Added: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… Added: trunk/reactos/base/applications/charmap/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Added: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mmc/mmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… Added: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/ipconfig/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Added: trunk/reactos/base/applications/regedit/clb/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Added: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Added: trunk/reactos/base/applications/wordpad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Added: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Added: trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/pl… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Added: trunk/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pl… Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… Added: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… Added: trunk/reactos/base/system/expand/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/pl… Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… Added: trunk/reactos/base/system/format/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/pl… Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… Added: trunk/reactos/base/system/regsvr32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… Added: trunk/reactos/base/system/rundll32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… Added: trunk/reactos/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… Added: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/intl_new/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.rc?r… Added: trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/pl-P… Added: trunk/reactos/dll/cpl/liccpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… Added: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=2… Added: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Added: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=2… Added: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… Added: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… Added: trunk/reactos/dll/win32/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/pl-… Modified: trunk/reactos/dll/win32/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/rsrc.rc?… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Added: trunk/reactos/dll/win32/crypt32/crypt32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… Modified: trunk/reactos/dll/win32/msacm/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm/msacm.rc?r… Added: trunk/reactos/dll/win32/msacm/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm/msacm_Pl.r… Added: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=2… Added: trunk/reactos/dll/win32/msi/msi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Pl.rc?re… Added: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… Added: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Added: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pl… Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… Added: trunk/reactos/dll/win32/serialui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/pl… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Modified: trunk/reactos/dll/win32/setupapi/res/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/lan… Modified: trunk/reactos/dll/win32/shdocvw/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pl.rc?re… Added: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Modified: trunk/reactos/dll/win32/user32/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/Pl.rc?rev… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Added: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Added: trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pl-P… Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…

1 0

[tkreuzer] 26396: NtGdiGetObject: - return 0 if buffer != 0 and count == 0 - don't write beyond umode buffer size (max count bytes!) - use SEH only once - No need for Ret & RetCount, use only RetCount - document the function
by tkreuzer＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: tkreuzer Date: Wed Apr 18 17:46:11 2007 New Revision: 26396 URL: http://svn.reactos.org/svn/reactos?rev=26396&view=rev Log: NtGdiGetObject: - return 0 if buffer != 0 and count == 0 - don't write beyond umode buffer size (max count bytes!) - use SEH only once - No need for Ret & RetCount, use only RetCount - document the function Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Apr 18 17:46:11 2007 @@ -1808,26 +1808,73 @@ return Result; } + +/*********************************************************************** + * NtGdiGetObject + * + * Copies information of the specified gdi object to a buffer + * and returns the size of the data. + * + * @param + * handle + * [in] Handle to the gdi object to retrieve the data from. + * + * count + * [in] Size of the buffer to copy the data to. + * + * buffer + * [out] Pointer to the buffer to copy the data to. + * This parameter can be NULL. + * + * @return + * Size of the data of the GDI object, if the function succeeds. + * 0 if the function fails. + * + * @remarks + * The function will always return the complete size of the object's data, + * but will copy only a maximum of count bytes to the specified buffer. + * If the handle is invalid, the function will fail. + * If buffer is NULL the function will only return the size of the data. + * If buffer is not NULL and count is 0, the function will fail. + */ INT STDCALL NtGdiGetObject(HANDLE handle, INT count, LPVOID buffer) { - INT Ret = 0; + INT RetCount; LPVOID SafeBuf; NTSTATUS Status = STATUS_SUCCESS; - INT RetCount = 0; /* From Wine: GetObject does not SetLastError() on a null object */ - if (!handle) return Ret; + if (!handle) return 0; RetCount = IntGdiGetObject(handle, 0, NULL); - if ((count <= 0) || (!buffer)) + if (!buffer) { return RetCount; } + if (!count || !RetCount) + { + return 0; + } + + if (count > RetCount) + { + count = RetCount; + } + + SafeBuf = ExAllocatePoolWithTag(PagedPool, RetCount, TAG_GDIOBJ); + if(!SafeBuf) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + IntGdiGetObject(handle, RetCount, SafeBuf); + _SEH_TRY { ProbeForWrite(buffer, count, 1); + RtlCopyMemory(buffer, SafeBuf, count); } _SEH_HANDLE { @@ -1835,43 +1882,15 @@ } _SEH_END; + ExFreePool(SafeBuf); + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - return Ret; - } - - if (RetCount) - { - SafeBuf = ExAllocatePoolWithTag(PagedPool, RetCount, TAG_GDIOBJ); - if(!SafeBuf) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return Ret; - } - Ret = IntGdiGetObject(handle, RetCount, SafeBuf); - - _SEH_TRY - { - /* pointer already probed! */ - RtlCopyMemory(buffer, SafeBuf, RetCount); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - ExFreePool(SafeBuf); - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - } - - return Ret; + return 0; + } + + return RetCount; } DWORD STDCALL

1 0

[cwittich] 26395: use the correct index in Module32Next
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 17:39:26 2007 New Revision: 26395 URL: http://svn.reactos.org/svn/reactos?rev=26395&view=rev Log: use the correct index in Module32Next Modified: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c Modified: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/to… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/toolhelp.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/toolhelp.c Wed Apr 18 17:39:26 2007 @@ -760,11 +760,11 @@ { BOOL Ret; - if(Snapshot->ModuleListCount > 0 && - Snapshot->ModuleListIndex < Snapshot->ModuleListCount) + if((Snapshot->ModuleListCount > 0) && + (Snapshot->ModuleListIndex < Snapshot->ModuleListCount)) { LPMODULEENTRY32W Entries = (LPMODULEENTRY32W)OffsetToPtr(Snapshot, Snapshot->ModuleListOffset); - RtlCopyMemory(lpme, &Entries[Snapshot->ProcessListIndex++], sizeof(MODULEENTRY32W)); + RtlCopyMemory(lpme, &Entries[Snapshot->ModuleListIndex++], sizeof(MODULEENTRY32W)); Ret = TRUE; } else

1 0

[cwittich] 26394: fix formatting
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 16:50:21 2007 New Revision: 26394 URL: http://svn.reactos.org/svn/reactos?rev=26394&view=rev Log: fix formatting Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c Wed Apr 18 16:50:21 2007 @@ -68,45 +68,45 @@ ZeroMemory(&pActCtxW, sizeof(ACTCTXW)); pActCtxW.cbSize = sizeof(ACTCTXW); pActCtxW.dwFlags = pActCtx->dwFlags; - pActCtxW.wLangId = pActCtx->wLangId; - pActCtxW.hModule = pActCtx->hModule; + pActCtxW.wLangId = pActCtx->wLangId; + pActCtxW.hModule = pActCtx->hModule; pActCtxW.wProcessorArchitecture = pActCtx->wProcessorArchitecture; pActCtxW.hModule = pActCtx->hModule; /* Convert ActCtx Strings */ - if (pActCtx->lpSource) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpSource, - (LPWSTR*) &pActCtxW.lpSource); - } - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpAssemblyDirectory, - (LPWSTR*) &pActCtxW.lpAssemblyDirectory); - } - if (HIWORD(pActCtx->lpResourceName)) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpResourceName, - (LPWSTR*) &pActCtxW.lpResourceName); - } - else - { - pActCtxW.lpResourceName = (LPWSTR) pActCtx->lpResourceName; - } - if (pActCtx->lpApplicationName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpApplicationName, - (LPWSTR*) &pActCtxW.lpApplicationName); - } + if (pActCtx->lpSource) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpSource, + (LPWSTR*) &pActCtxW.lpSource); + } + if (pActCtx->lpAssemblyDirectory) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpAssemblyDirectory, + (LPWSTR*) &pActCtxW.lpAssemblyDirectory); + } + if (HIWORD(pActCtx->lpResourceName)) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpResourceName, + (LPWSTR*) &pActCtxW.lpResourceName); + } + else + { + pActCtxW.lpResourceName = (LPWSTR) pActCtx->lpResourceName; + } + if (pActCtx->lpApplicationName) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpApplicationName, + (LPWSTR*) &pActCtxW.lpApplicationName); + } /* Call the Unicode function */ hRetVal = CreateActCtxW(&pActCtxW); /* Clean up */ RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpSource); RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpAssemblyDirectory); - if (HIWORD(pActCtx->lpResourceName)) - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpResourceName); + if (HIWORD(pActCtx->lpResourceName)) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpResourceName); RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpApplicationName); return hRetVal;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
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