Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66221: [GDI32_APITEST] Add more tests for MaskBlt
by tkreuzer＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: tkreuzer Date: Tue Feb 10 22:33:19 2015 New Revision: 66221 URL: http://svn.reactos.org/svn/reactos?rev=66221&view=rev Log: [GDI32_APITEST] Add more tests for MaskBlt Modified: trunk/rostests/apitests/gdi32/MaskBlt.c Modified: trunk/rostests/apitests/gdi32/MaskBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?… ============================================================================== --- trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] Tue Feb 10 22:33:19 2015 @@ -9,6 +9,7 @@ #include <wingdi.h> #include <winuser.h> +#include "init.h" void Test_MaskBlt_1bpp() { @@ -42,7 +43,7 @@ pjBitsMsk[0] = 0xF0; ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); ok(ret == 1, "MaskBlt failed (%d)\n", ret); - ok (pjBitsDst[0] == 0xCA, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + ok(pjBitsDst[0] == 0xCA, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); pjBitsDst[0] = 0x00; pjBitsSrc[0] = 0xFF; @@ -52,9 +53,10 @@ ok (pjBitsDst[0] == 0xF0, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); /* Do the masking (NOTSRCERASE / SRCINVERT) */ - pjBitsDst[0] = 0xF0; - pjBitsSrc[0] = 0xCC; - pjBitsMsk[0] = 0xAA; + pjBitsDst[0] = 0xF0; // 11110000 + pjBitsSrc[0] = 0xCC; // 11001100 + pjBitsMsk[0] = 0xAA; // 10101010 + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(NOTSRCERASE, SRCINVERT)); // 22 ok(ret == 1, "MaskBlt failed (%d)\n", ret); ok (pjBitsDst[0] == 0x16, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); @@ -66,6 +68,28 @@ ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(MERGEPAINT, 0x990000)); ok(ret == 1, "MaskBlt failed (%d)\n", ret); ok (pjBitsDst[0] == 0xE3, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + + /* Try a ROP that needs a mask with a NULL mask bitmap handle */ + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, NULL, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + ok(pjBitsDst[0] == 0xCC, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + + /* Try a ROP that needs a mask with an invalid mask bitmap handle */ + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, (HBITMAP)0x123456, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); + + /* Try a ROP that needs a mask with an invalid mask bitmap */ + ok(ghbmp24 != NULL, "ghbmp24 is NULL!\n"); + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, ghbmp24, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); + + /* Try a ROP that needs no mask with an invalid mask bitmap */ + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, (HBITMAP)0x123456, 0, 0, MAKEROP4(SRCCOPY, SRCCOPY)); + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + + /* Try (PATCOPY / NOOP) with a NULL source mask and bitmap */ + ret = MaskBlt(hdcDst, 0, 0, 8, 1, NULL, 0, 0, NULL, 0, 0, MAKEROP4(PATCOPY, 0xAA0000)); + ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); } @@ -159,6 +183,7 @@ START_TEST(MaskBlt) { + InitStuff(); Test_MaskBlt_1bpp(); switch (GetDeviceCaps(GetDC(NULL), BITSPIXEL)) {

1 0

[tkreuzer] 66220: [GDI32_APITEST] Add more helper code
by tkreuzer＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: tkreuzer Date: Tue Feb 10 22:31:17 2015 New Revision: 66220 URL: http://svn.reactos.org/svn/reactos?rev=66220&view=rev Log: [GDI32_APITEST] Add more helper code Modified: trunk/rostests/apitests/gdi32/init.c trunk/rostests/apitests/gdi32/init.h Modified: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Tue Feb 10 22:31:17 2015 @@ -2,21 +2,18 @@ #include <stdio.h> #include <windef.h> #include <wingdi.h> +#include "init.h" -HBITMAP ghbmpDIB32; -HDC ghdcDIB32; +HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; +HDC ghdcBmp1, ghdcBmp4, ghdcBmp8, ghdcBmp16, ghdcBmp24, ghdcBmp32; +HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32; +HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; +PVOID gpvDIB1, gpvDIB4, gpvDIB8, gpvDIB16, gpvDIB24, gpvDIB32; PULONG pulDIB32Bits; -HBITMAP ghbmpDIB4; -HDC ghdcDIB4; PULONG pulDIB4Bits; HPALETTE ghpal; -struct -{ - WORD palVersion; - WORD palNumEntries; - PALETTEENTRY logpalettedata[8]; -} gpal = +MYPAL gpal = { 0x300, 8, { @@ -31,23 +28,77 @@ } }; +BOOL +InitPerBitDepth( + _In_ ULONG cBitsPerPixel, + _In_ ULONG cx, + _In_ ULONG cy, + _Out_ HDC *phdcBmp, + _Out_ HBITMAP *phbmp, + _Out_ HDC *phdcDIB, + _Out_ HBITMAP *phbmpDIB, + _Out_ PVOID *ppvBits) +{ + struct + { + BITMAPCOREHEADER bmiHeader; + RGBQUAD bmiColors[256]; + } bmiBuffer; + LPBITMAPINFO pbmi = (LPBITMAPINFO)&bmiBuffer; + + /* Create a compatible DC for the bitmap */ + *phdcBmp = CreateCompatibleDC(0); + if (*phdcBmp == NULL) + { + printf("CreateCompatibleDC failed for %lu bpp\n", cBitsPerPixel); + return FALSE; + } + + /* Create a bitmap */ + *phbmp = CreateBitmap(cx, cy, 1, cBitsPerPixel, NULL); + if (*phbmp == NULL) + { + printf("CreateBitmap failed %lu\n", cBitsPerPixel); + return FALSE; + } + + SelectObject(*phdcBmp, *phbmp); + + /* Get info about the bitmap */ + memset(&bmiBuffer, 0, sizeof(bmiBuffer)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (!GetDIBits(*phdcBmp, *phbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS)) + { + printf("GetDIBits failed %lu\n", cBitsPerPixel); + return FALSE; + } + + /* Create a compatible DC for the DIB */ + *phdcDIB = CreateCompatibleDC(0); + if (*phdcDIB == NULL) + { + printf("CreateCompatibleDC failed %lu\n", cBitsPerPixel); + return FALSE; + } + + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight; + + /* Create the DIB section with the same values */ + *phbmpDIB = CreateDIBSection(*phdcDIB, pbmi, DIB_RGB_COLORS, ppvBits, 0, 0 ); + if (*phbmpDIB == NULL) + { + printf("CreateDIBSection failed. %lu\n", cBitsPerPixel); + return FALSE; + } + + SelectObject(*phdcDIB, *phbmpDIB); + + return TRUE; +} + BOOL InitStuff(void) { - BITMAPINFO bmi32 = - {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 32, BI_RGB, 0, 1, 1, 0, 0}}; - BITMAPINFO bmi4 = - {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 4, BI_RGB, 0, 1, 1, 0, 0}}; - - ghdcDIB32 = CreateCompatibleDC(0); - ghdcDIB4 = CreateCompatibleDC(0); - - ghbmpDIB32 = CreateDIBSection(ghdcDIB32, &bmi32, DIB_PAL_COLORS, (PVOID*)&pulDIB32Bits, 0, 0 ); - if (!ghbmpDIB32) return FALSE; - - ghbmpDIB4 = CreateDIBSection(ghdcDIB4, &bmi4, DIB_PAL_COLORS, (PVOID*)&pulDIB4Bits, 0, 0 ); - if (!ghbmpDIB32) return FALSE; - - SelectObject(ghdcDIB32, ghbmpDIB32); /* Initialize a logical palette */ ghpal = CreatePalette((LOGPALETTE*)&gpal); @@ -57,5 +108,19 @@ return FALSE; } + if (!InitPerBitDepth(1, 9, 9, &ghdcBmp1, &ghbmp1, &ghdcDIB1, &ghbmpDIB1, &gpvDIB1) || + !InitPerBitDepth(4, 5, 5, &ghdcBmp4, &ghbmp4, &ghdcDIB4, &ghbmpDIB4, &gpvDIB4) || + !InitPerBitDepth(8, 5, 5, &ghdcBmp8, &ghbmp8, &ghdcDIB8, &ghbmpDIB8, &gpvDIB8) || + !InitPerBitDepth(16, 5, 5, &ghdcBmp16, &ghbmp16, &ghdcDIB16, &ghbmpDIB16, &gpvDIB16) || + !InitPerBitDepth(24, 5, 5, &ghdcBmp24, &ghbmp24, &ghdcDIB24, &ghbmpDIB24, &gpvDIB24) || + !InitPerBitDepth(32, 4, 4, &ghdcBmp32, &ghbmp32, &ghdcDIB32, &ghbmpDIB32, &gpvDIB32)) + { + printf("failed to create objects \n"); + return FALSE; + } + + pulDIB32Bits = gpvDIB32; + pulDIB4Bits = gpvDIB4; + return TRUE; } Modified: trunk/rostests/apitests/gdi32/init.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.h?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.h [iso-8859-1] Tue Feb 10 22:31:17 2015 @@ -1,16 +1,22 @@ + +extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; +extern HDC ghdcBmp1, ghdcBmp4, ghdcBmp8, ghdcBmp16, ghdcBmp24, ghdcBmp32; +extern HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32; +extern HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; +extern PVOID pvBits1Bpp, pvBits4Bpp, pvBits8Bpp, pvBits16Bpp, pvBits24Bpp, pvBits32Bpp; extern HBITMAP ghbmpDIB32; -extern HDC ghdcDIB32; extern PULONG pulDIB32Bits; -extern HBITMAP ghbmpDIB4; -extern HDC ghdcDIB4; extern PULONG pulDIB4Bits; extern HPALETTE ghpal; -extern struct +typedef struct { - LOGPALETTE logpal; + WORD palVersion; + WORD palNumEntries; PALETTEENTRY logpalettedata[8]; -} gpal; +} MYPAL; + +extern MYPAL gpal; BOOL InitStuff(void);

1 0

[dreimer] 66219: [BROWSEUI] Fix german layout to... look better.
by dreimer＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: dreimer Date: Tue Feb 10 21:02:11 2015 New Revision: 66219 URL: http://svn.reactos.org/svn/reactos?rev=66219&view=rev Log: [BROWSEUI] Fix german layout to... look better. Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Tue Feb 10 21:02:11 2015 @@ -125,10 +125,10 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Te&xt Optionen:", -1, 4, 2, 48, 15 - COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Symboloptio&nen:", -1, 4, 20, 48, 15 - COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Te&xtoptionen:", -1, 4, 2, 53, 15 + COMBOBOX IDC_TEXTOPTIONS, 60, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Symboloptio&nen:", -1, 4, 20, 53, 15 + COMBOBOX IDC_ICONOPTIONS, 60, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END /* Accelerators */ @@ -155,7 +155,7 @@ STRINGTABLE BEGIN IDS_CANCELLING "Abbrechen..." - IDS_REMAINING "Ãbrig" + IDS_REMAINING "Verbleibend" END STRINGTABLE

1 0

[tfaber] 66218: [GDI32_APITEST] - Fix flakiness in GetDIBits test
by tfaber＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: tfaber Date: Tue Feb 10 20:29:54 2015 New Revision: 66218 URL: http://svn.reactos.org/svn/reactos?rev=66218&view=rev Log: [GDI32_APITEST] - Fix flakiness in GetDIBits test Modified: trunk/rostests/apitests/gdi32/GetDIBits.c Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Tue Feb 10 20:29:54 2015 @@ -50,7 +50,7 @@ //ok_int(GetDIBits(NULL, hbmp, 0, 0, NULL, pbmi, DIB_RGB_COLORS), 1); /* Test a bitmap with values partly set */ - ZeroMemory(pbmi, sizeof(BITMAPINFO)); + ZeroMemory(pbmi, sizeof(ajBuffer)); pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbmi->bmiHeader.biWidth = 12; pbmi->bmiHeader.biHeight = 14; @@ -102,6 +102,7 @@ HDC hdcScreen, hdcMem; HBITMAP hbmp; PBITMAPINFO pbi; + DWORD bisize; PBITMAPCOREHEADER pbch; PBITMAPV5HEADER pbV5Header; INT ScreenBpp; @@ -109,7 +110,8 @@ PVOID pvBits; ULONG cjSizeImage; - pbi = malloc(sizeof(BITMAPV5HEADER) + 256 * sizeof(DWORD)); + bisize = sizeof(BITMAPV5HEADER) + 256 * sizeof(DWORD); + pbi = malloc(bisize); pbch = (PVOID)pbi; pbV5Header = (PVOID)pbi; @@ -145,21 +147,21 @@ /* null hdc */ SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok(GetDIBits(NULL, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "\n"); ok_err(ERROR_INVALID_PARAMETER); /* null bitmap */ SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok(GetDIBits(hdcScreen, NULL, 0, 15, NULL, pbi, DIB_RGB_COLORS) == 0, "\n"); ok_err(ERROR_SUCCESS); /* 0 scan lines */ SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); ok_err(ERROR_SUCCESS); @@ -171,7 +173,7 @@ /* bad bmi colours (uUsage) */ SetLastError(0); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, 100) == 0, "\n"); ok_err(ERROR_SUCCESS); @@ -182,7 +184,7 @@ /* basic call */ SetLastError(ERROR_SUCCESS); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS) > 0, "\n"); ok_err(ERROR_SUCCESS); @@ -193,7 +195,7 @@ ok(pbi->bmiHeader.biSizeImage == (16 * 16) * (ScreenBpp / 8), "\n"); /* Test if COREHEADER is supported */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPCOREHEADER); ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biSize, sizeof(BITMAPCOREHEADER)); @@ -203,27 +205,27 @@ //ok_int(pbch->bcBitCount, ScreenBpp > 16 ? 24 : ScreenBpp); // fails on XP with screenbpp == 16 /* Test different header sizes */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPCOREHEADER) + 4; ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 0); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER) + 4; ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPV4HEADER); ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPV4HEADER) + 4; ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPV5HEADER); ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPV5HEADER) + 4; ok_int(GetDIBits(hdcScreen, hbmp, 0, 15, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbV5Header->bV5RedMask, 0); @@ -240,7 +242,7 @@ ok_int(pbV5Header->bV5ProfileSize, 0); ok_int(pbV5Header->bV5Reserved, 0); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok_int(GetDIBits(hdcScreen, hbmp, 234, 43, NULL, pbi, DIB_RGB_COLORS), 1); @@ -249,7 +251,7 @@ /* Test a mono bitmap */ hbmp = CreateBitmap(13, 7, 1, 1, ajBits); ok(hbmp != 0, "failed to create bitmap\n"); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biWidth, 13); @@ -280,32 +282,32 @@ /* Set bitmap dimensions */ ok_int(SetBitmapDimensionEx(hbmp, 110, 220, NULL), 1); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biXPelsPerMeter, 0); ok_int(pbi->bmiHeader.biYPelsPerMeter, 0); /* Set individual values */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbi->bmiHeader.biWidth = 12; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biWidth, 13); ok_int(pbi->bmiHeader.biSizeImage, 28); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbi->bmiHeader.biSizeImage = 123; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbi->bmiHeader.biCompression = BI_RGB; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); /* Set only biBitCount */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbi->bmiHeader.biBitCount = 5; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); @@ -384,7 +386,7 @@ ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); /* Set only biBitCount and pjInit */ - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbi->bmiHeader.biBitCount = 5; ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); @@ -395,7 +397,7 @@ /* Test a 4 bpp bitmap */ hbmp = CreateBitmap(3, 5, 1, 4, NULL); ok(hbmp != 0, "failed to create bitmap\n"); - ZeroMemory(pbi, sizeof(BITMAPINFO)); + ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biWidth, 3);

1 0

[hbelusca] 66217: [CONSRV]: Fix a DPRINT.
by hbelusca＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: hbelusca Date: Tue Feb 10 18:27:34 2015 New Revision: 66217 URL: http://svn.reactos.org/svn/reactos?rev=66217&view=rev Log: [CONSRV]: Fix a DPRINT. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Tue Feb 10 18:27:34 2015 @@ -715,7 +715,7 @@ { WORD ActivationState = LOWORD(wParam); - DPRINT("WM_ACTIVATE - ActivationState = %d\n"); + DPRINT("WM_ACTIVATE - ActivationState = %d\n", ActivationState); if ( ActivationState == WA_ACTIVE || ActivationState == WA_CLICKACTIVE )

1 0

[aandrejevic] 66216: [FAST486] Implement Fast486FpuMultiply properly.
by aandrejevic＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: aandrejevic Date: Tue Feb 10 17:29:26 2015 New Revision: 66216 URL: http://svn.reactos.org/svn/reactos?rev=66216&view=rev Log: [FAST486] Implement Fast486FpuMultiply properly. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6621… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue Feb 10 17:29:26 2015 @@ -696,6 +696,37 @@ PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; + LONG Exponent; + + if (FPU_IS_INDEFINITE(FirstOperand) + || FPU_IS_INDEFINITE(SecondOperand) + || (FPU_IS_ZERO(FirstOperand) && FPU_IS_INFINITY(SecondOperand)) + || (FPU_IS_INFINITY(FirstOperand) && FPU_IS_ZERO(SecondOperand))) + { + /* The result will be indefinite */ + Result->Sign = TRUE; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_INDEFINITE_MANTISSA; + return; + } + + if (FPU_IS_ZERO(FirstOperand) || FPU_IS_ZERO(SecondOperand)) + { + /* The result will be zero */ + Result->Sign = FirstOperand->Sign ^ SecondOperand->Sign; + Result->Exponent = 0; + Result->Mantissa = 0ULL; + return; + } + + if (FPU_IS_INFINITY(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) + { + /* The result will be infinity */ + Result->Sign = FirstOperand->Sign ^ SecondOperand->Sign; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_MANTISSA_HIGH_BIT; + return; + } if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) { @@ -709,12 +740,51 @@ } } + /* Calculate the sign */ + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + /* Calculate the exponent */ + Exponent = (LONG)FirstOperand->Exponent + (LONG)SecondOperand->Exponent - FPU_REAL10_BIAS; + + /* Calculate the mantissa */ UnsignedMult128(FirstOperand->Mantissa, SecondOperand->Mantissa, &TempResult.Mantissa); - TempResult.Exponent = FirstOperand->Exponent + SecondOperand->Exponent; - TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + if (Exponent < 0) + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + + if (!State->FpuControl.Um) + { + Fast486FpuException(State); + return; + } + + /* The exponent will be zero */ + TempResult.Exponent = 0; + + /* If possible, denormalize the result, otherwise make it zero */ + if (Exponent > -64) TempResult.Mantissa >>= (-Exponent); + else TempResult.Mantissa = 0ULL; + } + else if (Exponent > FPU_MAX_EXPONENT) + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + + if (!State->FpuControl.Om) + { + Fast486FpuException(State); + return; + } + + /* Make the result infinity */ + TempResult.Exponent = FPU_MAX_EXPONENT + 1; + TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else TempResult.Exponent = (USHORT)Exponent; /* Normalize the result */ Fast486FpuNormalize(State, &TempResult);

1 0

[dreimer] 66215: [BROWSEUI] German update. (Is it possible that our browseui is not even similar to the one from Win 5.2?)
by dreimer＠svn.reactos.org 10 Feb '15

10 Feb '15

Author: dreimer Date: Tue Feb 10 02:03:35 2015 New Revision: 66215 URL: http://svn.reactos.org/svn/reactos?rev=66215&view=rev Log: [BROWSEUI] German update. (Is it possible that our browseui is not even similar to the one from Win 5.2?) Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Tue Feb 10 02:03:35 2015 @@ -118,7 +118,7 @@ LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 - PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE } IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 @@ -154,8 +154,8 @@ STRINGTABLE BEGIN - IDS_CANCELLING "Canceling..." - IDS_REMAINING "Remaining" + IDS_CANCELLING "Abbrechen..." + IDS_REMAINING "Ãbrig" END STRINGTABLE

1 0

[dreimer] 66214: [BROWSEUI] Sync all languages with the once more not synced English one... Every language has a different state and no one sees that if the new strings are not added in there. At l...
by dreimer＠svn.reactos.org 09 Feb '15

09 Feb '15

Author: dreimer Date: Mon Feb 9 23:25:49 2015 New Revision: 66214 URL: http://svn.reactos.org/svn/reactos?rev=66214&view=rev Log: [BROWSEUI] Sync all languages with the once more not synced English one... Every language has a different state and no one sees that if the new strings are not added in there. At least add the English original. Thx for understanding. DIALOG -> DIALOGEX Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -77,7 +77,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 36 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -101,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -108,6 +133,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -236,3 +267,8 @@ IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -108,6 +108,19 @@ /* Dialogs */ +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} + IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -130,6 +143,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -137,6 +151,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -271,4 +291,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|ZurÃ¼ck|VorwÃ¤rts|Ãbergeordneter Ordner|Suchen|Ordner|Verschieben nach|Kopieren nach|LÃ¶schen|RÃ¼ckgÃ¤ngig|Ansicht|Stop|Aktualisieren|Startseite|Netzlaufwerk verbinden|Netzlaufwerk trennen|Favoriten|Verlauf|Vollbild|Eigenschaften|Ausschneiden|Kopieren|EinfÃ¼gen|Ordneroptionen||" END - Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -108,7 +108,7 @@ /* Dialogs */ -IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" @@ -286,7 +286,6 @@ IDS_FORWARD "Forward" END - STRINGTABLE BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -78,7 +78,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -102,6 +126,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "Q", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -109,6 +134,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -237,3 +268,8 @@ IDS_BACK "AtrÃ¡s" IDS_FORWARD "Adelante" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -79,7 +79,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -103,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -110,6 +135,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -238,3 +269,8 @@ IDS_BACK "Back" IDS_FORWARD "Forward" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -77,7 +77,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -101,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -108,6 +133,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -236,3 +267,8 @@ IDS_BACK "Indietro" IDS_FORWARD "Avanti" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -85,7 +85,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -109,6 +133,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -116,6 +141,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -244,3 +275,8 @@ IDS_BACK "Wstecz" IDS_FORWARD "NaprzÃ³d" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -92,6 +92,19 @@ /* Dialogs */ +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} + IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -114,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -121,6 +135,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -249,3 +269,8 @@ IDS_BACK "Ãnapoi" IDS_FORWARD "Ãnainte" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -1,9 +1,9 @@ /* Russian language resource file by Petr Akhlamov (petr-akhlamov(a)yandex.ru) */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - + /* Menus */ - + IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED @@ -18,7 +18,7 @@ MENUITEM "&ÐÐ½Ð¾Ð¿ÐºÐ° ÐÐµÑÐµÑÐ¾Ð´", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED END END - + IDM_CABINET_MAINMENU MENUEX BEGIN POPUP "&Ð¤Ð°Ð¹Ð»", FCIDM_MENU_FILE @@ -91,7 +91,20 @@ END /* Dialogs */ - + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} + IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -101,9 +114,9 @@ LTEXT "Ico&n options:", -1, 4, 20, 48, 15 COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END - + /* Accelerators */ - + IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT @@ -120,52 +133,58 @@ "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT END - + /* Strings */ - + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END + STRINGTABLE BEGIN 800 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐ¼Ð¸ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼Ð¸." END - + STRINGTABLE BEGIN 864 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ." END - + STRINGTABLE BEGIN 928 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÐµÐ¼." END - + STRINGTABLE BEGIN 992 "Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ." END - + STRINGTABLE BEGIN 1056 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° ÑÐ¿ÑÐ°Ð²ÐºÐ¸." END - + STRINGTABLE BEGIN 9025 "ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾." 9026 "ÐÐ²ÐµÑÑ." END - + STRINGTABLE BEGIN 9121 "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº." 9122 "ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº." END - + STRINGTABLE BEGIN 9250 "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ, Ð½Ð¾Ð¼ÐµÑÐµ Ð²ÐµÑÑÐ¸Ð¸ Ð¸ Ð°Ð²ÑÐ¾ÑÑÐºÐ¸Ñ Ð¿ÑÐ°Ð²Ð°Ñ." 9252 "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¾ÑÐ»Ð°Ð´ÐºÐ¸." END - + STRINGTABLE BEGIN 9281 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° Ð¿ÑÐµÐ´ÑÐ´ÑÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." @@ -173,13 +192,13 @@ 9283 "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸." 9285 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." END - + STRINGTABLE BEGIN 9362 "ÐÑÐºÑÑÑÑ Ð¿Ð°Ð¿ÐºÑ ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ." 9363 "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ." END - + STRINGTABLE BEGIN 9505 "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸Ð»Ð¸ ÑÐ¿ÑÑÑÐ°ÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸." @@ -189,12 +208,12 @@ 9510 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ ÑÑÑÐ»Ð¾Ðº." 9516 "ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²." END - + STRINGTABLE BEGIN 9533 "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²." END - + STRINGTABLE BEGIN 9552 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¸Ð»Ð¸ ÑÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ" @@ -204,54 +223,53 @@ 9557 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¿Ð°Ð¿Ð¾Ðº" 9559 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¼ÐµÐ´Ð¸Ð°" END - + STRINGTABLE BEGIN IDS_SMALLICONS "ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" IDS_LARGEICONS "ÐÑÑÐ¿Ð½ÑÐµ Ð·Ð½Ð°ÑÐºÐ¸" IDS_SHOWTEXTLABELS "Ð¢ÐµÐºÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸" END - + STRINGTABLE BEGIN IDS_NOTEXTLABELS "ÐÐµÐ· Ð¿Ð¾Ð´Ð¿Ð¸ÑÐµÐ¹ Ðº ÐºÐ½Ð¾Ð¿ÐºÐ°Ð¼" IDS_SELECTIVETEXTONRIGHT "ÐÑÐ±Ð¾ÑÐ¾ÑÐ½Ð¾ ÑÐµÐºÑÑ ÑÐ¿ÑÐ°Ð²Ð°" END - + STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|ÐÐµÑÐµÑÐ¾Ð´||" IDS_GOBUTTONTIPTEMPLATE "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ""%s""" END - + STRINGTABLE BEGIN IDS_SEARCHLABEL "ÐÐ¾Ð¸ÑÐº" IDS_ADDRESSBANDLABEL "Ð&Ð´ÑÐµÑ" END - + STRINGTABLE BEGIN IDS_FOLDERSLABEL "ÐÐ°Ð¿ÐºÐ¸" END - + STRINGTABLE BEGIN IDS_HISTORYTEXT "&ÐÑÑÐ¾ÑÐ¸Ñ\tCtrl+H" END - + STRINGTABLE BEGIN IDS_UP "ÐÐ²ÐµÑÑ" END - + STRINGTABLE BEGIN IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" END - STRINGTABLE BEGIN IDS_STANDARD_TOOLBAR, "|ÐÐ°Ð·Ð°Ð´|ÐÐ¿ÐµÑÐµÐ´|ÐÐ²ÐµÑÑ|ÐÐ¾Ð¸ÑÐº|ÐÐ°Ð¿ÐºÐ¸|ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð²|ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð²|Ð£Ð´Ð°Ð»Ð¸ÑÑ|ÐÑÐ¼ÐµÐ½Ð¸ÑÑ|ÐÐ¸Ð´|ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ|ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ|ÐÐ¾Ð¼Ð¾Ð¹|ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¸ÑÐº|ÐÑÐºÐ»ÑÑÐ¸ÑÑ|ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ|ÐÑÑÐ½Ð°Ð»|ÐÐ¾ Ð²ÐµÑÑ ÑÐºÑÐ°Ð½|Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°|ÐÑÑÐµÐ·Ð°ÑÑ|ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ|ÐÑÑÐ°Ð²Ð¸ÑÑ|Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸||" Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -96,7 +96,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -120,6 +144,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -127,6 +152,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -255,3 +286,8 @@ IDS_BACK "Mrapa" IDS_FORWARD "Perpara" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -77,7 +77,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -101,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -108,6 +133,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -236,3 +267,8 @@ IDS_BACK "Geri" IDS_FORWARD "Ä°leri" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Mon Feb 9 23:25:49 2015 @@ -79,7 +79,31 @@ END END +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Toolbars", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&Quick Launch", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&New Toolbar...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION @@ -103,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT @@ -110,6 +135,12 @@ END /* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END STRINGTABLE BEGIN @@ -238,3 +269,8 @@ IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END

1 0

[gadamopoulos] 66213: Fix build on unix hosts
by gadamopoulos＠svn.reactos.org 09 Feb '15

09 Feb '15

Author: gadamopoulos Date: Mon Feb 9 22:31:53 2015 New Revision: 66213 URL: http://svn.reactos.org/svn/reactos?rev=66213&view=rev Log: Fix build on unix hosts Modified: trunk/reactos/dll/win32/browseui/precomp.h Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Mon Feb 9 22:31:53 2015 @@ -22,7 +22,7 @@ #include <atlwin.h> #include <perhist.h> #include <exdispid.h> -#include <Strsafe.h> +#include <strsafe.h> #include <shlwapi.h> #include <shlwapi_undoc.h> #include <undocshell.h>

1 0

[gadamopoulos] 66212: [BROWSEUI] - Implement CProgressDialog based on wine - Patch by Huw Campbell, improved by me CORE-4476
by gadamopoulos＠svn.reactos.org 09 Feb '15

09 Feb '15

Author: gadamopoulos Date: Mon Feb 9 22:29:23 2015 New Revision: 66212 URL: http://svn.reactos.org/svn/reactos?rev=66212&view=rev Log: [BROWSEUI] - Implement CProgressDialog based on wine - Patch by Huw Campbell, improved by me CORE-4476 Added: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp (with props) trunk/reactos/dll/win32/browseui/CProgressDialog.h (with props) trunk/reactos/dll/win32/browseui/res/progressdialog.rgs (with props) Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/resource.h Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -28,6 +28,7 @@ toolsband.cpp travellog.cpp utility.cpp + CProgressDialog.cpp precomp.h) add_library(browseui SHARED Added: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgre… ============================================================================== --- trunk/reactos/dll/win32/browseui/CProgressDialog.cpp (added) +++ trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -0,0 +1,453 @@ +/* + * Progress dialog + * + * Copyright 2007 Mikolaj Zalewski + * Copyright 2014 Huw Campbell + * + * 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 + */ + +#include <precomp.h> + +#define COBJMACROS + +#define CANCEL_MSG_LINE 2 + +/* Note: to avoid a deadlock we don't want to send messages to the dialog + * with the critical section held. Instead we only mark what fields should be + * updated and the dialog proc does the update */ +#define UPDATE_PROGRESS 0x1 +#define UPDATE_TITLE 0x2 +#define UPDATE_LINE1 0x4 +#define UPDATE_LINE2 (UPDATE_LINE1<<1) +#define UPDATE_LINE3 (UPDATE_LINE1<<2) + + +#define WM_DLG_UPDATE (WM_APP+1) /* set to the dialog when it should update */ +#define WM_DLG_DESTROY (WM_APP+2) /* DestroyWindow must be called from the owning thread */ + +#define ID_3SECONDS 101 + +CProgressDialog::CProgressDialog() +{ + ULONG cb = 32 *sizeof(WCHAR); + this->lines[0] = (LPWSTR) heap_alloc_zero(cb); + this->lines[1] = (LPWSTR) heap_alloc_zero(cb); + this->lines[2] = (LPWSTR) heap_alloc_zero(cb); + this->cancelMsg = (LPWSTR) heap_alloc_zero(cb); + this->title = (LPWSTR) heap_alloc_zero(cb); + + this->clockHand = -1; + this->progressClock[29].ullMark = 0ull; + this->dwStartTime = GetTickCount(); + + InitializeCriticalSection(&this->cs); + this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); +} + +CProgressDialog::~CProgressDialog() +{ + if (this->hwnd) + this->end_dialog(); + heap_free(this->lines[0]); + heap_free(this->lines[1]); + heap_free(this->lines[2]); + heap_free(this->cancelMsg); + heap_free(this->title); + this->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&this->cs); +} + +static void set_buffer(LPWSTR *buffer, LPCWSTR string) +{ + static const WCHAR empty_string[] = {0}; + ULONG len; + + if (string == NULL) + string = empty_string; + len = (wcslen(string) + 1)*sizeof(WCHAR); + + LPWSTR tmp = (LPWSTR) heap_realloc(*buffer, len); + if (tmp) + *buffer = tmp; + else + len = wcslen(*buffer) + 1; + + StringCchCopyW(*buffer, len, string); +} + +struct create_params +{ + CProgressDialog *This; + HANDLE hEvent; + HWND hwndParent; +}; + +static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) +{ + WCHAR string[256]; + LPWSTR ret; + + LoadStringW(hInstance, uiResourceId, string, sizeof(string)/sizeof(string[0])); + ret = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (wcslen(string) + 1) * sizeof(WCHAR)); + StrCpyW(ret, string); + return ret; +} + +void CProgressDialog::set_progress_marquee() +{ + HWND hProgress = GetDlgItem(this->hwnd, IDC_PROGRESS_BAR); + SetWindowLongW(hProgress, GWL_STYLE, + GetWindowLongW(hProgress, GWL_STYLE)|PBS_MARQUEE); +} + +void CProgressDialog::update_dialog(DWORD dwUpdate) +{ + WCHAR empty[] = {0}; + + if (dwUpdate & UPDATE_TITLE) + SetWindowTextW(this->hwnd, this->title); + + if (dwUpdate & UPDATE_LINE1) + SetDlgItemTextW(this->hwnd, IDC_TEXT_LINE, (this->isCancelled ? empty : this->lines[0])); + if (dwUpdate & UPDATE_LINE2) + SetDlgItemTextW(this->hwnd, IDC_TEXT_LINE+1, (this->isCancelled ? empty : this->lines[1])); + if (dwUpdate & UPDATE_LINE3) + SetDlgItemTextW(this->hwnd, IDC_TEXT_LINE+2, (this->isCancelled ? this->cancelMsg : this->lines[2])); + + if (dwUpdate & UPDATE_PROGRESS) + { + ULONGLONG ullTotal = this->ullTotal; + ULONGLONG ullCompleted = this->ullCompleted; + + /* progress bar requires 32-bit coordinates */ + while (ullTotal >> 32) + { + ullTotal >>= 1; + ullCompleted >>= 1; + } + + SendDlgItemMessageW(this->hwnd, IDC_PROGRESS_BAR, PBM_SETRANGE32, 0, (DWORD)ullTotal); + SendDlgItemMessageW(this->hwnd, IDC_PROGRESS_BAR, PBM_SETPOS, (DWORD)ullCompleted, 0); + } +} + +void CProgressDialog::end_dialog() +{ + SendMessageW(this->hwnd, WM_DLG_DESTROY, 0, 0); + /* native doesn't re-enable the window? */ + if (this->hwndDisabledParent) + EnableWindow(this->hwndDisabledParent, TRUE); + this->hwnd = NULL; +} + +static INT_PTR CALLBACK dialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + CProgressDialog *This = (CProgressDialog *)GetWindowLongPtrW(hwnd, DWLP_USER); + + switch (msg) + { + case WM_INITDIALOG: + { + struct create_params *params = (struct create_params *)lParam; + + /* Note: until we set the hEvent, the object is protected by + * the critical section held by StartProgress */ + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)params->This); + This = params->This; + This->hwnd = hwnd; + + if (This->dwFlags & PROGDLG_NOPROGRESSBAR) + ShowWindow(GetDlgItem(hwnd, IDC_PROGRESS_BAR), SW_HIDE); + if (This->dwFlags & PROGDLG_NOCANCEL) + ShowWindow(GetDlgItem(hwnd, IDCANCEL), SW_HIDE); + if (This->dwFlags & PROGDLG_MARQUEEPROGRESS) + This->set_progress_marquee(); + if (This->dwFlags & PROGDLG_NOMINIMIZE) + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & (~WS_MINIMIZEBOX)); + + This->update_dialog(0xffffffff); + This->dwUpdate = 0; + This->isCancelled = FALSE; + + SetTimer(hwnd, ID_3SECONDS, 3 * 1000, NULL); + + SetEvent(params->hEvent); + return TRUE; + } + + case WM_DLG_UPDATE: + EnterCriticalSection(&This->cs); + This->update_dialog(This->dwUpdate); + This->dwUpdate = 0; + LeaveCriticalSection(&This->cs); + return TRUE; + + case WM_DLG_DESTROY: + DestroyWindow(hwnd); + PostThreadMessageW(GetCurrentThreadId(), WM_NULL, 0, 0); /* wake up the GetMessage */ + KillTimer(hwnd, ID_3SECONDS); + + return TRUE; + + case WM_CLOSE: + case WM_COMMAND: + if (msg == WM_CLOSE || wParam == IDCANCEL) + { + EnterCriticalSection(&This->cs); + This->isCancelled = TRUE; + + if (!This->cancelMsg[0]) { + heap_free(This->cancelMsg); + This->cancelMsg = load_string(_AtlBaseModule.GetResourceInstance(), IDS_CANCELLING); + } + + This->set_progress_marquee(); + EnableWindow(GetDlgItem(This->hwnd, IDCANCEL), FALSE); + This->update_dialog(UPDATE_LINE1|UPDATE_LINE2|UPDATE_LINE3); + LeaveCriticalSection(&This->cs); + } + return TRUE; + + case WM_TIMER: + EnterCriticalSection(&This->cs); + if (This->progressClock[29].ullMark != 0ull) { + // We have enough info to take a guess + ULONGLONG sizeDiff = This->progressClock[This->clockHand].ullMark - + This->progressClock[(This->clockHand + 29) % 30].ullMark; + DWORD timeDiff = This->progressClock[This->clockHand].dwTime - + This->progressClock[(This->clockHand + 29) % 30].dwTime; + DWORD runDiff = This->progressClock[This->clockHand].dwTime - + This->dwStartTime; + ULONGLONG sizeLeft = This->ullTotal - This->progressClock[This->clockHand].ullMark; + + // A guess for time remaining based on the recent slope. + DWORD timeLeftD = (DWORD) timeDiff * ((double) sizeLeft) / ((double) sizeDiff); + // A guess for time remaining based on the start time and current position + DWORD timeLeftI = (DWORD) runDiff * ((double) sizeLeft) / ((double) This->progressClock[This->clockHand].ullMark); + + heap_realloc(&This->lines[2], 128); + StrFromTimeIntervalW(This->lines[2], 128, timeLeftD * 0.3 + timeLeftI * 0.7 , 2); + This->update_dialog( UPDATE_LINE1 << 2 ); + } + LeaveCriticalSection(&This->cs); + + return TRUE; + } + return FALSE; +} + +static DWORD WINAPI dialog_thread(LPVOID lpParameter) +{ + /* Note: until we set the hEvent in WM_INITDIALOG, the ProgressDialog object + * is protected by the critical section held by StartProgress */ + struct create_params *params = (struct create_params *) lpParameter; + HWND hwnd; + MSG msg; + + hwnd = CreateDialogParamW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCEW(IDD_PROGRESS_DLG), + params->hwndParent, + dialog_proc, + (LPARAM)params); + + while (GetMessageW(&msg, NULL, 0, 0) > 0) + { + if (!IsWindow(hwnd)) + break; + if(!IsDialogMessageW(hwnd, &msg)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + return 0; +} + +HRESULT WINAPI CProgressDialog::StartProgressDialog(HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) +{ + static const INITCOMMONCONTROLSEX init = { sizeof(init), ICC_ANIMATE_CLASS }; + + struct create_params params; + HANDLE hThread; + + // TRACE("(%p, %p, %x, %p)\n", this, punkEnableModeless, dwFlags, reserved); + if (punkEnableModeless || reserved) + FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved); + if (dwFlags & PROGDLG_AUTOTIME) + FIXME("Flags PROGDLG_AUTOTIME not supported\n"); + if (dwFlags & PROGDLG_NOTIME) + FIXME("Flags PROGDLG_NOTIME not supported\n"); + + InitCommonControlsEx( &init ); + + EnterCriticalSection(&this->cs); + + if (this->hwnd) + { + LeaveCriticalSection(&this->cs); + return S_OK; /* as on XP */ + } + this->dwFlags = dwFlags; + params.This = this; + params.hwndParent = hwndParent; + params.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + hThread = CreateThread(NULL, 0, dialog_thread, &params, 0, NULL); + WaitForSingleObject(params.hEvent, INFINITE); + CloseHandle(params.hEvent); + CloseHandle(hThread); + + this->hwndDisabledParent = NULL; + if (hwndParent && (dwFlags & PROGDLG_MODAL)) + { + HWND hwndDisable = GetAncestor(hwndParent, GA_ROOT); + if (EnableWindow(hwndDisable, FALSE)) + this->hwndDisabledParent = hwndDisable; + } + + LeaveCriticalSection(&this->cs); + + return S_OK; +} + +HRESULT WINAPI CProgressDialog::StopProgressDialog() +{ + EnterCriticalSection(&this->cs); + if (this->hwnd) + this->end_dialog(); + LeaveCriticalSection(&this->cs); + + return S_OK; +} + +HRESULT WINAPI CProgressDialog::SetTitle(LPCWSTR pwzTitle) +{ + HWND hwnd; + + EnterCriticalSection(&this->cs); + set_buffer(&this->title, pwzTitle); + this->dwUpdate |= UPDATE_TITLE; + hwnd = this->hwnd; + LeaveCriticalSection(&this->cs); + + if (hwnd) + SendMessageW(hwnd, WM_DLG_UPDATE, 0, 0); + + return S_OK; +} + +HRESULT WINAPI CProgressDialog::SetAnimation(HINSTANCE hInstance, UINT uiResourceId) +{ + return S_OK; +} + +BOOL WINAPI CProgressDialog::HasUserCancelled() +{ + return this->isCancelled; +} + +HRESULT WINAPI CProgressDialog::SetProgress64(ULONGLONG ullCompleted, ULONGLONG ullTotal) +{ + HWND hwnd; + + EnterCriticalSection(&this->cs); + this->ullTotal = ullTotal; + this->ullCompleted = ullCompleted; + + if (GetTickCount() - this->progressClock[(this->clockHand + 29) % 30].dwTime > 20) { + this->clockHand = (this->clockHand + 1) % 30; + this->progressClock[this->clockHand].ullMark = ullCompleted; + this->progressClock[this->clockHand].dwTime = GetTickCount(); + } + + this->dwUpdate |= UPDATE_PROGRESS; + hwnd = this->hwnd; + LeaveCriticalSection(&this->cs); + + if (hwnd) + SendMessageW(hwnd, WM_DLG_UPDATE, 0, 0); + + return S_OK; /* Windows sometimes returns S_FALSE */ +} + +HRESULT WINAPI CProgressDialog::SetProgress(DWORD dwCompleted, DWORD dwTotal) +{ + return this->SetProgress64(dwCompleted, dwTotal); +} + +HRESULT WINAPI CProgressDialog::SetLine(DWORD dwLineNum, LPCWSTR pwzLine, BOOL bPath, LPCVOID reserved) +{ + HWND hwnd; + + if (reserved) + FIXME("reserved pointer not null (%p)\n", reserved); + + dwLineNum--; + if (dwLineNum >= 3) /* Windows seems to do something like that */ + dwLineNum = 0; + + EnterCriticalSection(&this->cs); + set_buffer(&this->lines[dwLineNum], pwzLine); + this->dwUpdate |= UPDATE_LINE1 << dwLineNum; + hwnd = (this->isCancelled ? NULL : this->hwnd); /* no sense to send the message if window cancelled */ + LeaveCriticalSection(&this->cs); + + if (hwnd) + SendMessageW(hwnd, WM_DLG_UPDATE, 0, 0); + + return S_OK; +} + +HRESULT WINAPI CProgressDialog::SetCancelMsg(LPCWSTR pwzMsg, LPCVOID reserved) +{ + HWND hwnd; + + if (reserved) + FIXME("reserved pointer not null (%p)\n", reserved); + + EnterCriticalSection(&this->cs); + set_buffer(&this->cancelMsg, pwzMsg); + this->dwUpdate |= UPDATE_LINE1 << CANCEL_MSG_LINE; + hwnd = (this->isCancelled ? this->hwnd : NULL); /* no sense to send the message if window not cancelled */ + LeaveCriticalSection(&this->cs); + + if (hwnd) + SendMessageW(hwnd, WM_DLG_UPDATE, 0, 0); + + return S_OK; +} + +HRESULT WINAPI CProgressDialog::Timer(DWORD dwTimerAction, LPCVOID reserved) +{ + if (reserved) + FIXME("Reserved field not NULL but %p\n", reserved); + + return S_OK; +} + +HRESULT WINAPI CProgressDialog::GetWindow(HWND* phwnd) +{ + EnterCriticalSection(&this->cs); + *phwnd = this->hwnd; + LeaveCriticalSection(&this->cs); + return S_OK; +} + +HRESULT WINAPI CProgressDialog::ContextSensitiveHelp(BOOL fEnterMode) +{ + return E_NOTIMPL; +} Propchange: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/CProgressDialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgre… ============================================================================== --- trunk/reactos/dll/win32/browseui/CProgressDialog.h (added) +++ trunk/reactos/dll/win32/browseui/CProgressDialog.h [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -0,0 +1,101 @@ +/* + * Progress dialog + * + * Copyright 2014 Huw Campbell + * + * 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 + */ + +#ifndef _PROGRESSDIALOG_H_ +#define _PROGRESSDIALOG_H_ + +class CProgressDialog : + public CComCoClass<CProgressDialog, &CLSID_ProgressDialog>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IProgressDialog, + public IOleWindow +{ +public: + CRITICAL_SECTION cs; + HWND hwnd; + DWORD dwFlags; + DWORD dwUpdate; + LPWSTR lines[3]; + LPWSTR cancelMsg; + LPWSTR title; + BOOL isCancelled; + ULONGLONG ullCompleted; + ULONGLONG ullTotal; + HWND hwndDisabledParent; + void set_progress_marquee(); + void update_dialog(DWORD dwUpdate); + void end_dialog(); + + UINT clockHand; + struct progressMark { + ULONGLONG ullMark; + DWORD dwTime; + }; + progressMark progressClock[30]; + DWORD dwStartTime; + + CProgressDialog(); + ~CProgressDialog(); + + // IProgressDialog + virtual HRESULT WINAPI StartProgressDialog(HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved); + virtual HRESULT WINAPI StopProgressDialog(); + virtual HRESULT WINAPI SetTitle(LPCWSTR pwzTitle); + virtual HRESULT WINAPI SetAnimation(HINSTANCE hInstance, UINT uiResourceId); + virtual BOOL WINAPI HasUserCancelled(); + virtual HRESULT WINAPI SetProgress64(ULONGLONG ullCompleted, ULONGLONG ullTotal); + virtual HRESULT WINAPI SetProgress(DWORD dwCompleted, DWORD dwTotal); + virtual HRESULT WINAPI SetLine(DWORD dwLineNum, LPCWSTR pwzLine, BOOL bPath, LPCVOID reserved); + virtual HRESULT WINAPI SetCancelMsg(LPCWSTR pwzMsg, LPCVOID reserved); + virtual HRESULT WINAPI Timer(DWORD dwTimerAction, LPCVOID reserved); + + //////// IOleWindow + virtual HRESULT WINAPI GetWindow(HWND* phwnd); + virtual HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode); + +DECLARE_REGISTRY_RESOURCEID(IDR_PROGRESSDIALOG) +DECLARE_NOT_AGGREGATABLE(CProgressDialog) + +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CProgressDialog) + COM_INTERFACE_ENTRY_IID(IID_IProgressDialog, IProgressDialog) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) +END_COM_MAP() +}; + +static inline void *heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} +static inline void *heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} +static inline void *heap_realloc(void *mem, size_t size) +{ + return mem ? HeapReAlloc(GetProcessHeap(), 0, mem, size) : heap_alloc(size); +} +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* _PROGRESSDIALOG_H_ */ Propchange: trunk/reactos/dll/win32/browseui/CProgressDialog.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -39,6 +39,7 @@ OBJECT_ENTRY(CLSID_InternetToolbar, CInternetToolbar) OBJECT_ENTRY(CLSID_CRegTreeOptions, CRegTreeOptions) OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) +OBJECT_ENTRY(CLSID_ProgressDialog, CProgressDialog) END_OBJECT_MAP() CBrowseUIModule gModule; Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -42,6 +42,7 @@ IDR_INTERNETTOOLBAR REGISTRY "res/internettoolbar.rgs" IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" +IDR_PROGRESSDIALOG REGISTRY "res/progressdialog.rgs" /* * Everything specific to any language goes Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -108,6 +108,19 @@ /* Dialogs */ +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} + IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -141,6 +154,12 @@ STRINGTABLE BEGIN + IDS_CANCELLING "Canceling..." + IDS_REMAINING "Remaining" +END + +STRINGTABLE +BEGIN 800 "Contains commands for manipulating the selected items." END Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -22,6 +22,7 @@ #include <atlwin.h> #include <perhist.h> #include <exdispid.h> +#include <Strsafe.h> #include <shlwapi.h> #include <shlwapi_undoc.h> #include <undocshell.h> @@ -43,6 +44,7 @@ #include "globalfoldersettings.h" #include "regtreeoptions.h" #include "explorerband.h" +#include "CProgressDialog.h" #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(browseui); Added: trunk/reactos/dll/win32/browseui/res/progressdialog.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/pro… ============================================================================== --- trunk/reactos/dll/win32/browseui/res/progressdialog.rgs (added) +++ trunk/reactos/dll/win32/browseui/res/progressdialog.rgs [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {F8383852-FCD3-11D1-A6B9-006097DF5BD4} = s 'Progress Dialog' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/browseui/res/progressdialog.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Mon Feb 9 22:29:23 2015 @@ -83,6 +83,7 @@ #define IDR_GLOBALFOLDERSETTINGS 137 #define IDR_REGTREEOPTIONS 138 #define IDR_EXPLORERBAND 139 +#define IDR_PROGRESSDIALOG 140 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 @@ -100,6 +101,13 @@ #define IDS_BACK 58689 #define IDS_FORWARD 58690 +#define IDS_CANCELLING 16 +#define IDS_REMAINING 17 +#define IDC_ANIMATION 100 +#define IDC_PROGRESS_BAR 102 +#define IDC_TEXT_LINE 103 +#define IDD_PROGRESS_DLG 100 + #define IDR_ACCELERATORS 256 #define IDI_CABINET 103

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs