Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[dchapyshev] 38640: - Fix bug with incorrect a working directory. Patch by Evgeny Boltik (bstsoft@narod.ru) with my small changes See issue #4006 for more details.
by dchapyshev＠svn.reactos.org 08 Jan '09

08 Jan '09

Author: dchapyshev Date: Thu Jan 8 04:29:19 2009 New Revision: 38640 URL: http://svn.reactos.org/svn/reactos?rev=38640&view=rev Log: - Fix bug with incorrect a working directory. Patch by Evgeny Boltik (bstsoft(a)narod.ru) with my small changes See issue #4006 for more details. Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Thu Jan 8 04:29:19 2009 @@ -1186,6 +1186,8 @@ { WCHAR szPath[MAX_PATH]; WCHAR szTarget[MAX_PATH] = {0}; + WCHAR szDirPath[MAX_PATH]; + LPWSTR pszFile; STRRET strFile; LPWSTR pszExt; HRESULT hr; @@ -1230,7 +1232,11 @@ return E_FAIL; } - if (SUCCEEDED(IShellLinkW_SetPath(nLink, szPath))) + GetFullPathName(szPath, MAX_PATH, szDirPath, &pszFile); + if (pszFile) pszFile[0] = 0; + + if (SUCCEEDED(IShellLinkW_SetPath(nLink, szPath)) && + SUCCEEDED(IShellLinkW_SetWorkingDirectory(nLink, szDirPath))) { if (SUCCEEDED(IShellLinkW_QueryInterface(nLink, &IID_IPersistFile, (LPVOID*)&ipf))) {

1 0

[mjmartin] 38639: - Revert r38638 for now, as there is still changes that need to be done to handle this correctly.
by mjmartin＠svn.reactos.org 08 Jan '09

08 Jan '09

Author: mjmartin Date: Thu Jan 8 01:59:35 2009 New Revision: 38639 URL: http://svn.reactos.org/svn/reactos?rev=38639&view=rev Log: - Revert r38638 for now, as there is still changes that need to be done to handle this correctly. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Thu Jan 8 01:59:35 2009 @@ -167,8 +167,11 @@ if (Flags & FO_SYNCHRONOUS_IO) { - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; + KeWaitForSingleObject(&Ccb->ConnectEvent, + UserRequest, + KernelMode, + FALSE, + NULL); } DPRINT("NpfsConnectPipe() done (Status %lx)\n", Status);

1 0

[mjmartin] 38638: - Don't call KeWaitForSingleObject here, as doing so can lock the thread in a wait if no one ever connects to it. Also the wait is handled in Kernel32.
by mjmartin＠svn.reactos.org 08 Jan '09

08 Jan '09

Author: mjmartin Date: Thu Jan 8 01:45:42 2009 New Revision: 38638 URL: http://svn.reactos.org/svn/reactos?rev=38638&view=rev Log: - Don't call KeWaitForSingleObject here, as doing so can lock the thread in a wait if no one ever connects to it. Also the wait is handled in Kernel32. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Thu Jan 8 01:45:42 2009 @@ -167,11 +167,8 @@ if (Flags & FO_SYNCHRONOUS_IO) { - KeWaitForSingleObject(&Ccb->ConnectEvent, - UserRequest, - KernelMode, - FALSE, - NULL); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; } DPRINT("NpfsConnectPipe() done (Status %lx)\n", Status);

1 0

[fireball] 38637: - Get back ExceptionCode changed in r38624.
by fireball＠svn.reactos.org 08 Jan '09

08 Jan '09

Author: fireball Date: Thu Jan 8 01:28:48 2009 New Revision: 38637 URL: http://svn.reactos.org/svn/reactos?rev=38637&view=rev Log: - Get back ExceptionCode changed in r38624. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Thu Jan 8 01:28:48 2009 @@ -1086,7 +1086,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Save exception code */ - Status = _SEH2_GetExceptionCode(); + Status = ExceptionCode; } _SEH2_END; if (!NT_SUCCESS(Status)) return Status;

1 0

[tkreuzer] 38636: Tests for NtGdiCreateDIBSection and NtGdiExtTextOutW
by tkreuzer＠svn.reactos.org 08 Jan '09

08 Jan '09

Author: tkreuzer Date: Wed Jan 7 18:34:38 2009 New Revision: 38636 URL: http://svn.reactos.org/svn/reactos?rev=38636&view=rev Log: Tests for NtGdiCreateDIBSection and NtGdiExtTextOutW Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiExtTextOutW.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c [iso-8859-1] Wed Jan 7 18:34:38 2009 @@ -1,0 +1,389 @@ + +/* +HBITMAP +APIENTRY +NtGdiCreateDIBSection( + IN HDC hDC, + IN OPTIONAL HANDLE hSection, + IN DWORD dwOffset, + IN LPBITMAPINFO pbmi, + IN DWORD iUsage, + IN UINT cjHeader, + IN FLONG fl, + IN ULONG_PTR dwColorSpace, + OUT PVOID *ppvBits) +*/ + +ULONG +GetBitmapSize(BITMAPINFOHEADER *pbih) +{ + ULONG WidthBits, WidthBytes; + + WidthBits = pbih->biWidth * pbih->biBitCount * pbih->biPlanes; + WidthBytes = ((WidthBits + 31) & ~ 31) >> 3; + + return pbih->biHeight * WidthBytes; +} + + +INT +Test_NtGdiCreateDIBSection(PTESTINFO pti) +{ + HBITMAP hbmp; + HDC hDC; + ULONG cjHeader; + PVOID pvBits = NULL; + ULONG cEntries; + + struct + { + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[100]; + } bmi; + PBITMAPINFO pbmi = (PBITMAPINFO)&bmi; + PBITMAPINFOHEADER pbih = (PBITMAPINFOHEADER)&bmi.bmiHeader; + PBITMAPV4HEADER pbV4h = (PBITMAPV4HEADER)&bmi.bmiHeader; + PBITMAPV5HEADER pbV5h = (PBITMAPV5HEADER)&bmi.bmiHeader; + + hDC = GetDC(0); + pbih->biSize = sizeof(BITMAPINFOHEADER); + pbih->biWidth = 2; + pbih->biHeight = 2; + pbih->biPlanes = 1; + pbih->biBitCount = 1; + pbih->biCompression = BI_RGB; + pbih->biSizeImage = 0; + pbih->biXPelsPerMeter = 100; + pbih->biYPelsPerMeter = 100; + pbih->biClrUsed = 2; + pbih->biClrImportant = 2; + + cEntries = 0; + +/** iUsage = 0 (DIB_RGB_COLORS) ***********************************************/ + + cjHeader = bmi.bmiHeader.biSize + cEntries * 4 + 8; + + /* Test something simple */ + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); +// TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + + /* Test a 0 HDC */ + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(0, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); + TEST(GetLastError() == ERROR_NOT_ENOUGH_MEMORY); + if (hbmp) DeleteObject(hbmp); + + /* Test a wrong HDC */ + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection((HDC)0xdeadbeef, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != 0); + TEST(hbmp != 0); + TEST(GetLastError() == 8); + if (hbmp) DeleteObject(hbmp); + + /* Test pbmi = NULL */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, NULL, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* Test invalid pbmi */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, (PVOID)0x80001234, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + if (hbmp) DeleteObject(hbmp); + + /* Test invalid pbmi */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, (PVOID)1, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + if (hbmp) DeleteObject(hbmp); + + /* Test ppvBits = NULL */ + SetLastError(0); + hbmp = NtGdiCreateDIBSection(0, NULL, 0, pbmi, 0, cjHeader, 0, 0, NULL); + TEST(hbmp == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + if (hbmp) DeleteObject(hbmp); + + /* Test ppvBits = NULL and pbmi == 0*/ + SetLastError(0); + hbmp = NtGdiCreateDIBSection(0, NULL, 0, NULL, 0, cjHeader, 0, 0, NULL); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* Test ppvBits = NULL and wrong cjHeader */ + SetLastError(0); + hbmp = NtGdiCreateDIBSection(0, NULL, 0, pbmi, 0, cjHeader+4, 0, 0, NULL); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* Test ppvBits = NULL and cjHeader = 0 */ + SetLastError(0); + hbmp = NtGdiCreateDIBSection(0, NULL, 0, pbmi, 0, 0, 0, 0, NULL); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* Test wrong cjHeader */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader+4, 0, 0, &pvBits); + pvBits = (PVOID)-1; + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + +/** iUsage = 1 (DIB_PAL_COLORS) ***********************************************/ + + pbmi->bmiHeader.biClrUsed = 2; + pbmi->bmiHeader.biClrImportant = 2; + + cEntries = 2; + cjHeader = bmi.bmiHeader.biSize + cEntries * 4 + 8; + + /* Test iUsage = 1 */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 1, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + + +/** iUsage = 2 (???) **********************************************************/ + + /* Test iUsage = 2 */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 2, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + +/** wrong iUsage **************************************************************/ + + cEntries = 0; + cjHeader = bmi.bmiHeader.biSize + cEntries * 4 + 8; + + /* Test iUsage = 3 */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 3, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + if (hbmp) DeleteObject(hbmp); + + /* Test iUsage = 3 */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 3, cjHeader+4, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* Test wrong iUsage */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, -55, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + if (hbmp) DeleteObject(hbmp); + + /* Test wrong iUsage and wrong cjHeader */ + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, -55, cjHeader+4, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* increased header size */ + pbih->biSize = sizeof(BITMAPINFOHEADER) + 4; + cjHeader = pbih->biSize + cEntries * 4 + 8; + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); + TEST(GetLastError() == 8); + if (hbmp) DeleteObject(hbmp); + + /* increased header size */ + pbih->biSize = sizeof(BITMAPINFOHEADER) + 2; + cjHeader = pbih->biSize + cEntries * 4 + 8; + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + /* decreased header size */ + pbih->biSize = sizeof(BITMAPINFOHEADER) - 4; + cjHeader = pbih->biSize + cEntries * 4 + 8; + SetLastError(0); + pvBits = (PVOID)-1; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits == (PVOID)-1); + TEST(hbmp == 0); + TEST(GetLastError() == 0); + if (hbmp) DeleteObject(hbmp); + + +/** BITMAPV4HEADER ************************************************************/ + + pbV4h->bV4Size = sizeof(BITMAPV4HEADER); + pbV4h->bV4Width = 2; + pbV4h->bV4Height = 3; + pbV4h->bV4Planes = 1; + pbV4h->bV4BitCount = 1; + pbV4h->bV4V4Compression = BI_RGB; + pbV4h->bV4SizeImage = 0; + pbV4h->bV4XPelsPerMeter = 100; + pbV4h->bV4YPelsPerMeter = 100; + pbV4h->bV4ClrUsed = 0; + pbV4h->bV4ClrImportant = 0; + pbV4h->bV4RedMask = 0; + pbV4h->bV4GreenMask = 0; + pbV4h->bV4BlueMask = 0; + pbV4h->bV4AlphaMask = 0; + pbV4h->bV4CSType = 0; + memset(&pbV4h->bV4Endpoints, sizeof(CIEXYZTRIPLE), 0); + pbV4h->bV4GammaRed = 0; + pbV4h->bV4GammaGreen = 0; + pbV4h->bV4GammaBlue = 0; + + cEntries = 0; + cjHeader = bmi.bmiHeader.biSize + cEntries * 4 + 8; + + /* Test something simple */ + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); + TEST(GetLastError() == 8); + if (hbmp) DeleteObject(hbmp); + + +/** BITMAPV5HEADER ************************************************************/ + + pbV5h->bV5Size = sizeof(BITMAPV5HEADER); + pbV5h->bV5Width = 2; + pbV5h->bV5Height = 3; + pbV5h->bV5Planes = 1; + pbV5h->bV5BitCount = 1; + pbV5h->bV5Compression = BI_RGB; + pbV5h->bV5SizeImage = 0; + pbV5h->bV5XPelsPerMeter = 100; + pbV5h->bV5YPelsPerMeter = 100; + pbV5h->bV5ClrUsed = 2; + pbV5h->bV5ClrImportant = 2; + pbV5h->bV5RedMask = 0; + pbV5h->bV5GreenMask = 0; + pbV5h->bV5BlueMask = 0; + pbV5h->bV5AlphaMask = 0; + pbV5h->bV5CSType = 0; + memset(&pbV5h->bV5Endpoints, sizeof(CIEXYZTRIPLE), 0); + pbV5h->bV5GammaRed = 0; + pbV5h->bV5GammaGreen = 0; + pbV5h->bV5GammaBlue = 0; + pbV5h->bV5Intent = 0; + pbV5h->bV5ProfileData = 0; + pbV5h->bV5ProfileSize = 0; + pbV5h->bV5Reserved = 0; + + cEntries = 0; + cjHeader = pbV5h->bV5Size + cEntries * 4 + 8; + + /* Test something simple */ + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); + TEST(GetLastError() == 8); + if (hbmp) DeleteObject(hbmp); + + /* increased header size */ + pbV5h->bV5Size = sizeof(BITMAPV5HEADER) + 64; + cjHeader = pbV5h->bV5Size + cEntries * 4 + 8; + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(hDC, NULL, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); + TEST(GetLastError() == 8); + if (hbmp) DeleteObject(hbmp); + + printf("GetLastError() == %ld\n", GetLastError()); + + /* Test section */ + HANDLE hSection; + NTSTATUS Status; + LARGE_INTEGER MaximumSize; + + MaximumSize.QuadPart = 4096; + Status = ZwCreateSection(&hSection, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + ASSERT(NT_SUCCESS(Status)); + Status = ZwCreateSection(&hSection, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + ASSERT(NT_SUCCESS(Status)); + + SetLastError(0); + pvBits = 0; + hbmp = NtGdiCreateDIBSection(hDC, hSection, 0, pbmi, 0, cjHeader, 0, 0, &pvBits); + TEST(pvBits != NULL); + TEST(hbmp != 0); +// TEST(GetLastError() == 0); + printf("hbmp = %p, pvBits = %p, hSection = %p\n", hbmp, pvBits, hSection); + system("PAUSE"); + if (hbmp) DeleteObject(hbmp); + + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateDIBSection.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiExtTextOutW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiExtTextOutW.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiExtTextOutW.c [iso-8859-1] Wed Jan 7 18:34:38 2009 @@ -1,0 +1,53 @@ + +/* +BOOL +APIENTRY +NtGdiExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL LPRECT UnsafeRect, + IN LPWSTR UnsafeString, + IN INT Count, + IN OPTIONAL LPINT UnsafeDx, + IN DWORD dwCodePage) +*/ + +INT +Test_NtGdiExtTextOutW(PTESTINFO pti) +{ + HWND hWnd; + HDC hDC; + RECT rect; + LPWSTR lpstr; + BOOL ret; + ULONG len; + INT Dx[10] = {10, -5, 10, 5, 10, -10, 10, 5, 10, 5}; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); + hDC = GetDC(hWnd); + + lpstr = L"Hallo"; + len = wcslen(lpstr); + + ret = NtGdiExtTextOutW(hDC, 0, 0, 0, &rect, lpstr, len, Dx, 0); + TEST(ret == 1); + + ret = NtGdiExtTextOutW(hDC, 0, 0, ETO_PDY, &rect, lpstr, len, Dx, 0); + TEST(ret == 1); + + /* Test invalid lpDx */ + ret = NtGdiExtTextOutW(hDC, 0, 0, 0, 0, lpstr, len, (INT*)((ULONG_PTR)-1), 0); + TEST(ret == 0); + + /* Test alignment requirement for lpDx */ + ret = NtGdiExtTextOutW(hDC, 0, 0, 0, 0, lpstr, len, (INT*)((ULONG_PTR)Dx + 1), 0); + TEST(ret == 1); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiExtTextOutW.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Wed Jan 7 18:34:38 2009 @@ -12,11 +12,13 @@ #include "ntgdi/NtGdiCreateBitmap.c" #include "ntgdi/NtGdiCreateCompatibleBitmap.c" #include "ntgdi/NtGdiCreateCompatibleDC.c" +#include "ntgdi/NtGdiCreateDIBSection.c" #include "ntgdi/NtGdiDoPalette.c" #include "ntgdi/NtGdiEngCreatePalette.c" //#include "ntgdi/NtGdiEnumFontChunk.c" #include "ntgdi/NtGdiEnumFontOpen.c" //#include "ntgdi/NtGdiExtCreatePen.c" +#include "ntgdi/NtGdiExtTextOutW.c" #include "ntgdi/NtGdiFlushUserBatch.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetFontResourceInfoInternalW.c" @@ -69,11 +71,13 @@ { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiCreateCompatibleDC", Test_NtGdiCreateCompatibleDC }, + { L"NtGdiCreateDIBSection", Test_NtGdiCreateDIBSection }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, // { L"NtGdiEnumFontChunk", Test_NtGdiEnumFontChunk }, { L"NtGdiEnumFontOpen", Test_NtGdiEnumFontOpen }, // { L"NtGdiExtCreatePen", Test_NtGdiExtCreatePen }, + { L"NtGdiExtTextOutW", Test_NtGdiExtTextOutW }, { L"NtGdiFlushUserBatch", Test_NtGdiFlushUserBatch }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetFontResourceInfoInternalW", Test_NtGdiGetFontResourceInfoInternalW },

1 0

[dchapyshev] 38635: - Partly implement of installed hardware page
by dchapyshev＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: dchapyshev Date: Wed Jan 7 14:28:10 2009 New Revision: 38635 URL: http://svn.reactos.org/svn/reactos?rev=38635&view=rev Log: - Partly implement of installed hardware page Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.h trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/hdwwiz/resource.h Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -24,16 +24,6 @@ * Dmitry Chapyshev (dmitry(a)reactos.org) */ -#include <windows.h> -#include <commctrl.h> -#include <setupapi.h> -#include <cpl.h> -#include <tchar.h> -#include <stdio.h> - -#define NDEBUG -#include <debug.h> - #include "resource.h" #include "hdwwiz.h" @@ -41,6 +31,7 @@ HINSTANCE hApplet = NULL; HFONT hTitleFont; +SP_CLASSIMAGELIST_DATA ImageListData; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -222,11 +213,142 @@ return FALSE; } +static VOID +TrimGuidString(LPWSTR szString, LPWSTR szNewString) +{ + WCHAR szBuffer[39]; + INT Index; + + if (wcslen(szString) == 38) + { + if ((szString[0] == L'{') && (szString[37] == L'}')) + { + for (Index = 0; Index < wcslen(szString); Index++) + szBuffer[Index] = szString[Index + 1]; + + szBuffer[36] = L'\0'; + wcscpy(szNewString, szBuffer); + return; + } + } + wcscpy(szNewString, L"\0"); +} + +static VOID +InitProbeListPage(HWND hwndDlg) +{ + LV_COLUMN Column; + LV_ITEM Item; + WCHAR szBuffer[MAX_STR_SIZE], szGuid[MAX_STR_SIZE], szTrimGuid[MAX_STR_SIZE]; + HWND hList = GetDlgItem(hwndDlg, IDC_PROBELIST); + HDEVINFO hDevInfo; + SP_DEVINFO_DATA DevInfoData; + ULONG ulStatus, ulProblemNumber; + GUID ClassGuid; + RECT Rect; + DWORD Index; + + if (!hList) return; + + ZeroMemory(&Column, sizeof(LV_COLUMN)); + + GetClientRect(hList, &Rect); + + Column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; + Column.fmt = LVCFMT_LEFT; + Column.iSubItem = 0; + Column.pszText = NULL; + Column.cx = Rect.right - GetSystemMetrics(SM_CXVSCROLL); + (VOID) ListView_InsertColumn(hList, 0, &Column); + + ZeroMemory(&Item, sizeof(LV_ITEM)); + + LoadString(hApplet, IDS_ADDNEWDEVICE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + + Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + Item.pszText = (LPTSTR) szBuffer; + Item.iItem = 0; + Item.iImage = -1; + (VOID) ListView_InsertItem(hList, &Item); + + (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); + + hDevInfo = SetupDiGetClassDevsEx(NULL, NULL, NULL, DIGCF_ALLCLASSES | DIGCF_PRESENT, NULL, NULL, 0); + + if (hDevInfo == INVALID_HANDLE_VALUE) return; + + /* get the device image List */ + ImageListData.cbSize = sizeof(ImageListData); + SetupDiGetClassImageList(&ImageListData); + + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + for (Index = 0; TRUE; Index++) + { + if (!SetupDiEnumDeviceInfo(hDevInfo, Index, &DevInfoData)) break; + + if (CM_Get_DevNode_Status_Ex(&ulStatus, &ulProblemNumber, DevInfoData.DevInst, 0, NULL) == CR_SUCCESS) + { + if (ulStatus & DN_NO_SHOW_IN_DM) continue; + } + + /* get the device's friendly name */ + if (!SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_FRIENDLYNAME, + 0, + (BYTE*)szBuffer, + MAX_STR_SIZE, + NULL)) + { + /* if the friendly name fails, try the description instead */ + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_DEVICEDESC, + 0, + (BYTE*)szBuffer, + MAX_STR_SIZE, + NULL); + } + + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DevInfoData, + SPDRP_CLASSGUID, + 0, + (BYTE*)szGuid, + MAX_STR_SIZE, + NULL); + + TrimGuidString(szGuid, szTrimGuid); + UuidFromStringW(szTrimGuid, &ClassGuid); + + SetupDiGetClassImageIndex(&ImageListData, + &ClassGuid, + &Item.iImage); + + /* Set device name */ + Item.pszText = (LPTSTR) szBuffer; + Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; + Item.iItem = (INT) ListView_GetItemCount(hList); + (VOID) ListView_InsertItem(hList, &Item); + + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + } + + (VOID) ListView_SetImageList(hList, ImageListData.ImageList, LVSIL_SMALL); + SetupDiDestroyDeviceInfoList(hDevInfo); +} + static INT_PTR CALLBACK ProbeListPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { + case WM_INITDIALOG: + { + InitProbeListPage(hwndDlg); + } + break; + case WM_COMMAND: { Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.h?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.h [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -1,13 +1,18 @@ #ifndef __CPL_HDWWIZ_H #define __CPL_HDWWIZ_H -typedef struct -{ - int idIcon; - int idName; - int idDescription; - APPLET_PROC AppletProc; -} APPLET, *PAPPLET; +#include <windows.h> +#include <commctrl.h> +#include <setupapi.h> +#include <cfgmgr32.h> +#include <cpl.h> +#include <tchar.h> +#include <stdio.h> + +#define NDEBUG +#include <debug.h> + +#define MAX_STR_SIZE 256 extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -5,7 +5,9 @@ <include base="hdwwiz">.</include> <library>setupapi</library> <library>kernel32</library> + <library>advapi32</library> <library>comctl32</library> + <library>rpcrt4</library> <library>user32</library> <library>gdi32</library> <file>hdwwiz.c</file> Modified: trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -42,7 +42,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -142,4 +142,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -46,7 +46,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -146,4 +146,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "Âûáåðèòå óñòðîéñòâî èç ñïèñêà è íàæìèòå êíîïêó ""Äàëåå"", ÷òîáû ïðîâåðèòü åãî ñâîéñòâà èëè âûïîëíèòü äèàãíîñòèêó íåïîëàäîê.", -1, 21, 8, 275, 22 LTEXT "×òîáû äîáàâèòü íîâîå óñòðîéñòâî, îòñóòñòâóþùåå â ýòîì ñïèñêå, ùåëêíèòå ýëåìåíò ""Äîáàâëåíèå íîâîãî óñòðîéñòâà"".", -1, 21, 32, 275, 24 LTEXT "&Óñòàíîâëåííîå îáîðóäîâàíèå:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "Ýòîò ìàñòåð âûïîëíÿåò ïîèñê îáîðóäîâàíèÿ, êîòîðîå íåäàâíî áûëî ïîäêëþ÷åíî ê êîìïüþòåðó, íî åùå íå áûëî óñòàíîâëåíî." IDS_ISCONNECTED "Ïîäêëþ÷åíî ëè óñòðîéñòâî?" IDS_PROBELISTTITLE "Íà ýòîì êîìïüþòåðå óæå óñòàíîâëåíî ñëåäóþùåå îáîðóäîâàíèå" + IDS_ADDNEWDEVICE "Äîáàâëåíèå íîâîãî óñòðîéñòâà" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -45,7 +45,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -145,4 +145,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -41,7 +41,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -141,4 +141,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -49,7 +49,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -149,4 +149,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -47,7 +47,7 @@ LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 - CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 72, 275, 66 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -147,4 +147,5 @@ IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "Add a new hardware device" END Modified: trunk/reactos/dll/cpl/hdwwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] Wed Jan 7 14:28:10 2009 @@ -16,6 +16,7 @@ #define IDS_PROBELISTTITLE 1005 #define IDS_SEARCHTEXT 1020 #define IDS_SEARCHTITLE 1025 +#define IDS_ADDNEWDEVICE 1081 #define IDS_ISCONNECTED 1113 /* Dialogs */

1 0

[tkreuzer] 38634: remove the test code I accidentally comitted
by tkreuzer＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: tkreuzer Date: Wed Jan 7 14:25:19 2009 New Revision: 38634 URL: http://svn.reactos.org/svn/reactos?rev=38634&view=rev Log: remove the test code I accidentally comitted Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Wed Jan 7 14:25:19 2009 @@ -579,12 +579,7 @@ if (XlateObj->flXlate & XO_TABLE) { if (Color >= XlateObj->cEntries) - { - DPRINT1("+++ Color = 0x%x, XlateObj->flXlate = 0x%x, XlateObj->cEntries = %ld\n", - Color, XlateObj->flXlate, XlateObj->cEntries); - XlateGDI = ObjToGDI(XlateObj, XLATE); - Color %= XlateObj->cEntries; - } + Color %= XlateObj->cEntries; return XlateObj->pulXlate[Color]; }

1 0

[tkreuzer] 38633: - Fix creation of XLATE in IntEngCreateSrcMonoXlate. It was doing it wrong (colors swapped) and it only worked, because the caller of the function also passed the wrong arguments. - Mono DIBs need a special handling when creating the XLATEOBJ. Handle this in IntCreateXlateForBlt. Fixes broken colors on google/Firefox page.
by tkreuzer＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: tkreuzer Date: Wed Jan 7 14:02:28 2009 New Revision: 38633 URL: http://svn.reactos.org/svn/reactos?rev=38633&view=rev Log: - Fix creation of XLATE in IntEngCreateSrcMonoXlate. It was doing it wrong (colors swapped) and it only worked, because the caller of the function also passed the wrong arguments. - Mono DIBs need a special handling when creating the XLATEOBJ. Handle this in IntCreateXlateForBlt. Fixes broken colors on google/Firefox page. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Wed Jan 7 14:02:28 2009 @@ -403,8 +403,9 @@ XlateGDI->GreenShift = CalculateShift(RGB(0x00, 0xFF, 0x00)) - CalculateShift(XlateGDI->GreenMask); XlateGDI->BlueShift = CalculateShift(RGB(0x00, 0x00, 0xFF)) - CalculateShift(XlateGDI->BlueMask); - XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, BackgroundColor); - XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, ForegroundColor); + /* Yes, that's how Windows works, ... */ + XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, BackgroundColor); + XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, ForegroundColor); if (XlateObj->iDstType == PAL_INDEXED) { @@ -484,9 +485,24 @@ { if (pSrcSurf->SurfObj.iBitmapFormat == BMF_1BPP) { - pDc_Attr = pDCDest->pDc_Attr; - if (!pDc_Attr) pDc_Attr = &pDCDest->Dc_Attr; - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, pDc_Attr->crBackgroundClr, pDc_Attr->crForegroundClr); + /* DIB sections need special handling */ + if (pSrcSurf->dib) + { + PPALGDI ppal = PALETTE_LockPalette(pSrcSurf->hDIBPalette); + if (ppal) + { + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, ((ULONG*)ppal->IndexedColors)[0], ((ULONG*)ppal->IndexedColors)[1]); + PALETTE_UnlockPalette(ppal); + } + else + XlateObj = NULL; + } + else + { + pDc_Attr = pDCDest->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDCDest->Dc_Attr; + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, pDc_Attr->crForegroundClr, pDc_Attr->crBackgroundClr); + } } else { @@ -563,7 +579,12 @@ if (XlateObj->flXlate & XO_TABLE) { if (Color >= XlateObj->cEntries) - Color %= XlateObj->cEntries; + { + DPRINT1("+++ Color = 0x%x, XlateObj->flXlate = 0x%x, XlateObj->cEntries = %ld\n", + Color, XlateObj->flXlate, XlateObj->cEntries); + XlateGDI = ObjToGDI(XlateObj, XLATE); + Color %= XlateObj->cEntries; + } return XlateObj->pulXlate[Color]; }

1 0

[gschneider] 38632: Don't remove the mouse cursor when previewing a screensaver.
by gschneider＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: gschneider Date: Wed Jan 7 12:17:02 2009 New Revision: 38632 URL: http://svn.reactos.org/svn/reactos?rev=38632&view=rev Log: Don't remove the mouse cursor when previewing a screensaver. Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Wed Jan 7 12:17:02 2009 @@ -190,7 +190,8 @@ // Display window and start pumping messages ShowWindow(hMainWindow, SW_SHOW); - SetCursor(NULL); + if (!hParent) + SetCursor(NULL); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg);

1 0

[dgoette] 38631: * readd & update diff function * fix css * fix problem, while requesting translations
by dgoette＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: dgoette Date: Wed Jan 7 08:43:03 2009 New Revision: 38631 URL: http://svn.reactos.org/svn/reactos?rev=38631&view=rev Log: * readd & update diff function * fix css * fix problem, while requesting translations Added: branches/danny-web/reactos.org/htdocs/roscms/js/diff.js Modified: branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css [iso-8859-1] Wed Jan 7 08:43:03 2009 @@ -115,3 +115,8 @@ .detailmenu { color: #006090; text-decoration: underline; cursor: pointer; } .frmeditbutton { cursor:pointer; color:#006090; } + +#legend { display: block; width: 500px; border: solid 1px black; } + +#legend .lbox { border: solid 1px black; width: 17px;} + Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Wed Jan 7 08:43:03 2009 @@ -1961,15 +1961,10 @@ break; case 'diff': + case 'diff2': document.getElementById('editzone').innerHTML = '<div id="frmdiff">'+ http_request.responseText + '</div>'; loadEditor('diffentry'); - document.getElementById('frmeditdiff').innerHTML = CDiffString(document.getElementById('frmeditdiff1').innerHTML, document.getElementById('frmeditdiff2').innerHTML); - break; - - // update diff-area with new entries start diff-process; called from within diff-area - case 'diff2': - document.getElementById('frmdiff').innerHTML = http_request.responseText; - document.getElementById('frmeditdiff').innerHTML = CDiffString(document.getElementById('frmeditdiff1').innerHTML, document.getElementById('frmeditdiff2').innerHTML); + document.getElementById('frmeditdiff').innerHTML = WDiffShortenOutput(WDiffString(document.getElementById('frmeditdiff1').innerHTML, document.getElementById('frmeditdiff2').innerHTML)); break; case 'changetags': Added: branches/danny-web/reactos.org/htdocs/roscms/js/diff.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/diff.js (added) +++ branches/danny-web/reactos.org/htdocs/roscms/js/diff.js [iso-8859-1] Wed Jan 7 08:43:03 2009 @@ -1,0 +1,1108 @@ +/* + +Name: diff.js +Version: 0.9.5a (April 6, 2008) +Info: http://en.wikipedia.org/wiki/User:Cacycle/diff +Code: http://en.wikipedia.org/wiki/User:Cacycle/diff.js + +JavaScript diff algorithm by [[en:User:Cacycle]] (http://en.wikipedia.org/wiki/User_talk:Cacycle). +Outputs html/css-formatted new text with highlighted deletions, inserts, and block moves. + +The program uses cross-browser code and should work with all modern browsers. It has been tested with: +* Mozilla Firefox 1.5.0.1 +* Mozilla SeaMonkey 1.0 +* Opera 8.53 +* Internet Explorer 6.0.2900.2180 +* Internet Explorer 7.0.5730.11 +This program is also compatibel with Greasemonkey + +An implementation of the word-based algorithm from: + +Communications of the ACM 21(4):264 (1978) +http://doi.acm.org/10.1145/359460.359467 + +With the following additional feature: + +* Word types have been optimized for MediaWiki source texts +* Additional post-pass 5 code for resolving islands caused by adding + two common words at the end of sequences of common words +* Additional detection of block borders and color coding of moved blocks and their original position +* Optional "intelligent" omission of unchanged parts from the output + +This code is used by the MediaWiki in-browser text editors [[en:User:Cacycle/editor]] and [[en:User:Cacycle/wikEd]] +and the enhanced diff view tool wikEdDiff [[en:User:Cacycle/wikEd]]. + +Usage: var htmlText = WDiffString(oldText, newText); + +This code has been released into the public domain. + +Datastructures: + +text: an object that holds all text related datastructures + .newWords: consecutive words of the new text (N) + .oldWords: consecutive words of the old text (O) + .newToOld: array of corresponding word number in old text (NA) + .oldToNew: array of corresponding word number in new text (OA) + .message: output message for testing purposes + +symbol['word']: symbol table for passes 1 - 3, holds words as a hash + .newCtr: new word occurences counter (NC) + .oldCtr: old word occurences counter (OC) + .toNew: table last old word number + .toOld: last new word number (OLNA) + +block: an object that holds block move information + blocks indexed after new text: + .newStart: new text word number of start of this block + .newLength: element number of this block including non-words + .newWords: true word number of this block + .newNumber: corresponding block index in old text + .newBlock: moved-block-number of a block that has been moved here + .newLeft: moved-block-number of a block that has been moved from this border leftwards + .newRight: moved-block-number of a block that has been moved from this border rightwards + .newLeftIndex: index number of a block that has been moved from this border leftwards + .newRightIndex: index number of a block that has been moved from this border rightwards + blocks indexed after old text: + .oldStart: word number of start of this block + .oldToNew: corresponding new text word number of start + .oldLength: element number of this block including non-words + .oldWords: true word number of this block + +*/ + + +// css for change indicators +if (typeof(wDiffStyleDelete) == 'undefined') { window.wDiffStyleDelete = 'font-weight: normal; text-decoration: none; color: #fff; background-color: #990033;'; } +if (typeof(wDiffStyleInsert) == 'undefined') { window.wDiffStyleInsert = 'font-weight: normal; text-decoration: none; color: #fff; background-color: #009933;'; } +if (typeof(wDiffStyleMoved) == 'undefined') { window.wDiffStyleMoved = 'font-weight: bold; color: #000; vertical-align: text-bottom; font-size: xx-small; padding: 0; border: solid 1px;'; } +if (typeof(wDiffStyleBlock) == 'undefined') { window.wDiffStyleBlock = [ + 'color: #000; background-color: #ffff80;', + 'color: #000; background-color: #c0ffff;', + 'color: #000; background-color: #ffd0f0;', + 'color: #000; background-color: #ffe080;', + 'color: #000; background-color: #aaddff;', + 'color: #000; background-color: #ddaaff;', + 'color: #000; background-color: #ffbbbb;', + 'color: #000; background-color: #d8ffa0;', + 'color: #000; background-color: #d0d0d0;' +]; } + +// html for change indicators, {number} is replaced by the block number +// {block} is replaced by the block style, class and html comments are important for shortening the output +if (typeof(wDiffHtmlMovedRight) == 'undefined') { window.wDiffHtmlMovedRight = '<input class="wDiffHtmlMovedRight" type="button" value=">" style="' + wDiffStyleMoved + ' {block}">'; } +if (typeof(wDiffHtmlMovedLeft) == 'undefined') { window.wDiffHtmlMovedLeft = '<input class="wDiffHtmlMovedLeft" type="button" value="<" style="' + wDiffStyleMoved + ' {block}">'; } + +if (typeof(wDiffHtmlBlockStart) == 'undefined') { window.wDiffHtmlBlockStart = '<span class="wDiffHtmlBlock" style="{block}">'; } +if (typeof(wDiffHtmlBlockEnd) == 'undefined') { window.wDiffHtmlBlockEnd = '</span>'; } + +if (typeof(wDiffHtmlDeleteStart) == 'undefined') { window.wDiffHtmlDeleteStart = '<span class="wDiffHtmlDelete" style="' + wDiffStyleDelete + '">'; } +if (typeof(wDiffHtmlDeleteEnd) == 'undefined') { window.wDiffHtmlDeleteEnd = '</span>'; } + +if (typeof(wDiffHtmlInsertStart) == 'undefined') { window.wDiffHtmlInsertStart = '<span class="wDiffHtmlInsert" style="' + wDiffStyleInsert + '">'; } +if (typeof(wDiffHtmlInsertEnd) == 'undefined') { window.wDiffHtmlInsertEnd = '</span>'; } + +// minimal number of real words for a moved block (0 for always displaying block move indicators) +if (typeof(wDiffBlockMinLength) == 'undefined') { window.wDiffBlockMinLength = 3; } + +// exclude identical sequence starts and endings from change marking +if (typeof(wDiffWordDiff) == 'undefined') { window.wDiffWordDiff = true; } + +// enable recursive diff to resolve problematic sequences +if (typeof(wDiffRecursiveDiff) == 'undefined') { window.wDiffRecursiveDiff = true; } + +// enable block move display +if (typeof(wDiffShowBlockMoves) == 'undefined') { window.wDiffShowBlockMoves = true; } + +// remove unchanged parts from final output + +// characters before diff tag to search for previous heading, paragraph, line break, cut characters +if (typeof(wDiffHeadingBefore) == 'undefined') { window.wDiffHeadingBefore = 1500; } +if (typeof(wDiffParagraphBefore) == 'undefined') { window.wDiffParagraphBefore = 1500; } +if (typeof(wDiffLineBeforeMax) == 'undefined') { window.wDiffLineBeforeMax = 1000; } +if (typeof(wDiffLineBeforeMin) == 'undefined') { window.wDiffLineBeforeMin = 500; } +if (typeof(wDiffBlankBeforeMax) == 'undefined') { window.wDiffBlankBeforeMax = 1000; } +if (typeof(wDiffBlankBeforeMin) == 'undefined') { window.wDiffBlankBeforeMin = 500; } +if (typeof(wDiffCharsBefore) == 'undefined') { window.wDiffCharsBefore = 500; } + +// characters after diff tag to search for next heading, paragraph, line break, or characters +if (typeof(wDiffHeadingAfter) == 'undefined') { window.wDiffHeadingAfter = 1500; } +if (typeof(wDiffParagraphAfter) == 'undefined') { window.wDiffParagraphAfter = 1500; } +if (typeof(wDiffLineAfterMax) == 'undefined') { window.wDiffLineAfterMax = 1000; } +if (typeof(wDiffLineAfterMin) == 'undefined') { window.wDiffLineAfterMin = 500; } +if (typeof(wDiffBlankAfterMax) == 'undefined') { window.wDiffBlankAfterMax = 1000; } +if (typeof(wDiffBlankAfterMin) == 'undefined') { window.wDiffBlankAfterMin = 500; } +if (typeof(wDiffCharsAfter) == 'undefined') { window.wDiffCharsAfter = 500; } + +// maximal fragment distance to join close fragments +if (typeof(wDiffFragmentJoin) == 'undefined') { window.wDiffFragmentJoin = 1000; } +if (typeof(wDiffOmittedChars) == 'undefined') { window.wDiffOmittedChars = ''; } +if (typeof(wDiffOmittedLines) == 'undefined') { window.wDiffOmittedLines = '<hr style="height: 2px; margin: 1em 10%;">'; } +if (typeof(wDiffNoChange) == 'undefined') { window.wDiffNoChange = '<hr style="height: 2px; margin: 1em 20%;">'; } + +// compatibility fix for old name of main function +window.StringDiff = window.WDiffString; + + +// WDiffString: main program +// input: oldText, newText, strings containing the texts +// returns: html diff + +window.WDiffString = function(oldText, newText) { + +// IE / Mac fix + oldText = oldText.replace(/(\r\n)/g, '\n'); + newText = newText.replace(/(\r\n)/g, '\n'); + + var text = {}; + text.newWords = []; + text.oldWords = []; + text.newToOld = []; + text.oldToNew = []; + text.message = ''; + var block = {}; + var outText = ''; + +// trap trivial changes: no change + if (oldText == newText) { + outText = newText; + outText = WDiffEscape(outText); + outText = WDiffHtmlFormat(outText); + return(outText); + } + +// trap trivial changes: old text deleted + if ( (oldText == null) || (oldText.length == 0) ) { + outText = newText; + outText = WDiffEscape(outText); + outText = WDiffHtmlFormat(outText); + outText = wDiffHtmlInsertStart + outText + wDiffHtmlInsertEnd; + return(outText); + } + +// trap trivial changes: new text deleted + if ( (newText == null) || (newText.length == 0) ) { + outText = oldText; + outText = WDiffEscape(outText); + outText = WDiffHtmlFormat(outText); + outText = wDiffHtmlDeleteStart + outText + wDiffHtmlDeleteEnd; + return(outText); + } + +// split new and old text into words + WDiffSplitText(oldText, newText, text); + +// calculate diff information + WDiffText(text); + +//detect block borders and moved blocks + WDiffDetectBlocks(text, block); + +// process diff data into formatted html text + outText = WDiffToHtml(text, block); + +// IE fix + outText = outText.replace(/> ( *)</g, '> $1<'); + + return(outText); +} + + +// WDiffSplitText: split new and old text into words +// input: oldText, newText, strings containing the texts +// changes: text.newWords and text.oldWords, arrays containing the texts in arrays of words + +window.WDiffSplitText = function(oldText, newText, text) { + +// convert strange spaces + oldText = oldText.replace(/[\t\u000b\u00a0\u2028\u2029]+/g, ' '); + newText = newText.replace(/[\t\u000b\u00a0\u2028\u2029]+/g, ' '); + +// split old text into words + +// / | | | | | | | | | | | | | | / + var pattern = /[\w]+|\[\[|\]\]|\{\{|\}\}|\n+| +|&\w+;|'''|''|=+|\{\||\|\}|\|\-|./g; + var result; + do { + result = pattern.exec(oldText); + if (result != null) { + text.oldWords.push(result[0]); + } + } while (result != null); + +// split new text into words + do { + result = pattern.exec(newText); + if (result != null) { + text.newWords.push(result[0]); + } + } while (result != null); + + return; +} + + +// WDiffText: calculate diff information +// input: text.newWords and text.oldWords, arrays containing the texts in arrays of words +// optionally for recursive calls: newStart, newEnd, oldStart, oldEnd, recursionLevel +// changes: text.newToOld and text.oldToNew, containing the line numbers in the other version + +window.WDiffText = function(text, newStart, newEnd, oldStart, oldEnd, recursionLevel) { + + symbol = new Object(); + symbol.newCtr = []; + symbol.oldCtr = []; + symbol.toNew = []; + symbol.toOld = []; + +// set defaults + newStart = newStart || 0; + newEnd = newEnd || text.newWords.length; + oldStart = oldStart || 0; + oldEnd = oldEnd || text.oldWords.length; + recursionLevel = recursionLevel || 0; + +// limit recursion depth + if (recursionLevel > 10) { + return; + } + +// pass 1: parse new text into symbol table s + + var word; + for (var i = newStart; i < newEnd; i ++) { + word = text.newWords[i]; + +// add new entry to symbol table + if ( symbol[word] == null) { + symbol[word] = { newCtr: 0, oldCtr: 0, toNew: null, toOld: null }; + } + +// increment symbol table word counter for new text + symbol[word].newCtr ++; + +// add last word number in new text + symbol[word].toNew = i; + } + +// pass 2: parse old text into symbol table + + for (var j = oldStart; j < oldEnd; j ++) { + word = text.oldWords[j]; + +// add new entry to symbol table + if ( symbol[word] == null) { + symbol[word] = { newCtr: 0, oldCtr: 0, toNew: null, toOld: null }; + } + +// increment symbol table word counter for old text + symbol[word].oldCtr ++; + +// add last word number in old text + symbol[word].toOld = j; + } + +// pass 3: connect unique words + + for (var i in symbol) { + +// find words in the symbol table that occur only once in both versions + if ( (symbol[i].newCtr == 1) && (symbol[i].oldCtr == 1) ) { + var toNew = symbol[i].toNew; + var toOld = symbol[i].toOld; + +// do not use spaces as unique markers + if ( ! /\s/.test( text.newWords[toNew] ) ) { + +// connect from new to old and from old to new + text.newToOld[toNew] = toOld; + text.oldToNew[toOld] = toNew; + } + } + } + +// pass 4: connect adjacent identical words downwards + + for (var i = newStart; i < newEnd - 1; i ++) { + +// find already connected pairs + if (text.newToOld[i] != null) { + j = text.newToOld[i]; + +// check if the following words are not yet connected + if ( (text.newToOld[i + 1] == null) && (text.oldToNew[j + 1] == null) ) { + +// if the following words are the same connect them + if ( text.newWords[i + 1] == text.oldWords[j + 1] ) { + text.newToOld[i + 1] = j + 1; + text.oldToNew[j + 1] = i + 1; + } + } + } + } + +// pass 5: connect adjacent identical words upwards + + for (var i = newEnd - 1; i > newStart; i --) { + +// find already connected pairs + if (text.newToOld[i] != null) { + j = text.newToOld[i]; + +// check if the preceeding words are not yet connected + if ( (text.newToOld[i - 1] == null) && (text.oldToNew[j - 1] == null) ) { + +// if the preceeding words are the same connect them + if ( text.newWords[i - 1] == text.oldWords[j - 1] ) { + text.newToOld[i - 1] = j - 1; + text.oldToNew[j - 1] = i - 1; + } + } + } + } + +// recursively diff still unresolved regions downwards + + if (wDiffRecursiveDiff) { + i = newStart; + j = oldStart; + while (i < newEnd) { + if (text.newToOld[i - 1] != null) { + j = text.newToOld[i - 1] + 1; + } + +// check for the start of an unresolved sequence + if ( (text.newToOld[i] == null) && (text.oldToNew[j] == null) ) { + +// determine the ends of the sequences + var iStart = i; + var iEnd = i; + while ( (text.newToOld[iEnd] == null) && (iEnd < newEnd) ) { + iEnd ++; + } + var iLength = iEnd - iStart; + + var jStart = j; + var jEnd = j; + while ( (text.oldToNew[jEnd] == null) && (jEnd < oldEnd) ) { + jEnd ++; + } + var jLength = jEnd - jStart; + +// recursively diff the unresolved sequence + if ( (iLength > 0) && (jLength > 0) ) { + if ( (iLength > 1) || (jLength > 1) ) { + if ( (iStart != newStart) || (iEnd != newEnd) || (jStart != oldStart) || (jEnd != oldEnd) ) { + WDiffText(text, iStart, iEnd, jStart, jEnd, recursionLevel + 1); + } + } + } + i = iEnd; + } + else { + i ++; + } + } + } + +// recursively diff still unresolved regions upwards + + if (wDiffRecursiveDiff) { + i = newEnd - 1; + j = oldEnd - 1; + while (i >= newStart) { + if (text.newToOld[i + 1] != null) { + j = text.newToOld[i + 1] - 1; + } + +// check for the start of an unresolved sequence + if ( (text.newToOld[i] == null) && (text.oldToNew[j] == null) ) { + +// determine the ends of the sequences + var iStart = i; + var iEnd = i + 1; + while ( (text.newToOld[iStart - 1] == null) && (iStart >= newStart) ) { + iStart --; + } + var iLength = iEnd - iStart; + + var jStart = j; + var jEnd = j + 1; + while ( (text.oldToNew[jStart - 1] == null) && (jStart >= oldStart) ) { + jStart --; + } + var jLength = jEnd - jStart; + +// recursively diff the unresolved sequence + if ( (iLength > 0) && (jLength > 0) ) { + if ( (iLength > 1) || (jLength > 1) ) { + if ( (iStart != newStart) || (iEnd != newEnd) || (jStart != oldStart) || (jEnd != oldEnd) ) { + WDiffText(text, iStart, iEnd, jStart, jEnd, recursionLevel + 1); + } + } + } + i = iStart - 1; + } + else { + i --; + } + } + } + return; +} + + +// WDiffToHtml: process diff data into formatted html text +// input: text.newWords and text.oldWords, arrays containing the texts in arrays of words +// text.newToOld and text.oldToNew, containing the line numbers in the other version +// block data structure +// returns: outText, a html string + +window.WDiffToHtml = function(text, block) { + + var outText = text.message; + + var blockNumber = 0; + var i = 0; + var j = 0; + var movedAsInsertion; + +// cycle through the new text + do { + var movedIndex = []; + var movedBlock = []; + var movedLeft = []; + var blockText = ''; + var identText = ''; + var delText = ''; + var insText = ''; + var identStart = ''; + +// check if a block ends here and finish previous block + if (movedAsInsertion != null) { + if (movedAsInsertion == false) { + identStart += wDiffHtmlBlockEnd; + } + else { + identStart += wDiffHtmlInsertEnd; + } + movedAsInsertion = null; + } + +// detect block boundary + if ( (text.newToOld[i] != j) || (blockNumber == 0 ) ) { + if ( ( (text.newToOld[i] != null) || (i >= text.newWords.length) ) && ( (text.oldToNew[j] != null) || (j >= text.oldWords.length) ) ) { + +// block moved right + var moved = block.newRight[blockNumber]; + if (moved > 0) { + var index = block.newRightIndex[blockNumber]; + movedIndex.push(index); + movedBlock.push(moved); + movedLeft.push(false); + } + +// block moved left + moved = block.newLeft[blockNumber]; + if (moved > 0) { + var index = block.newLeftIndex[blockNumber]; + movedIndex.push(index); + movedBlock.push(moved); + movedLeft.push(true); + } + +// check if a block starts here + moved = block.newBlock[blockNumber]; + if (moved > 0) { + +// mark block as inserted text + if (block.newWords[blockNumber] < wDiffBlockMinLength) { + identStart += wDiffHtmlInsertStart; + movedAsInsertion = true; + } + +// mark block by color + else { + if (moved > wDiffStyleBlock.length) { + moved = wDiffStyleBlock.length; + } + identStart += WDiffHtmlCustomize(wDiffHtmlBlockStart, moved - 1); + movedAsInsertion = false; + } + } + + if (i >= text.newWords.length) { + i ++; + } + else { + j = text.newToOld[i]; + blockNumber ++; + } + } + } + +// get the correct order if moved to the left as well as to the right from here + if (movedIndex.length == 2) { + if (movedIndex[0] > movedIndex[1]) { + movedIndex.reverse(); + movedBlock.reverse(); + movedLeft.reverse(); + } + } + +// handle left and right block moves from this position + for (var m = 0; m < movedIndex.length; m ++) { + +// insert the block as deleted text + if (block.newWords[ movedIndex[m] ] < wDiffBlockMinLength) { + var movedStart = block.newStart[ movedIndex[m] ]; + var movedLength = block.newLength[ movedIndex[m] ]; + var str = ''; + for (var n = movedStart; n < movedStart + movedLength; n ++) { + str += text.newWords[n]; + } + str = WDiffEscape(str); + str = str.replace(/\n/g, '¶<br>'); + blockText += wDiffHtmlDeleteStart + str + wDiffHtmlDeleteEnd; + } + +// add a placeholder / move direction indicator + else { + if (movedBlock[m] > wDiffStyleBlock.length) { + movedBlock[m] = wDiffStyleBlock.length; + } + if (movedLeft[m]) { + blockText += WDiffHtmlCustomize(wDiffHtmlMovedLeft, movedBlock[m] - 1); + } + else { + blockText += WDiffHtmlCustomize(wDiffHtmlMovedRight, movedBlock[m] - 1); + } + } + } + +// collect consecutive identical text + while ( (i < text.newWords.length) && (j < text.oldWords.length) ) { + if ( (text.newToOld[i] == null) || (text.oldToNew[j] == null) ) { + break; + } + if (text.newToOld[i] != j) { + break; + } + identText += text.newWords[i]; + i ++; + j ++; + } + +// collect consecutive deletions + while ( (text.oldToNew[j] == null) && (j < text.oldWords.length) ) { + delText += text.oldWords[j]; + j ++; + } + +// collect consecutive inserts + while ( (text.newToOld[i] == null) && (i < text.newWords.length) ) { + insText += text.newWords[i]; + i ++; + } + +// remove leading and trailing similarities betweein delText and ins from highlighting + var preText = ''; + var postText = ''; + if (wDiffWordDiff) { + if ( (delText != '') && (insText != '') ) { + +// remove leading similarities + while ( delText.charAt(0) == insText.charAt(0) && (delText != '') && (insText != '') ) { + preText = preText + delText.charAt(0); + delText = delText.substr(1); + insText = insText.substr(1); + } + +// remove trailing similarities + while ( delText.charAt(delText.length - 1) == insText.charAt(insText.length - 1) && (delText != '') && (insText != '') ) { + postText = delText.charAt(delText.length - 1) + postText; + delText = delText.substr(0, delText.length - 1); + insText = insText.substr(0, insText.length - 1); + } + } + } + +// output the identical text, deletions and inserts + +// moved from here indicator + if (blockText != '') { + outText += blockText; + } + +// identical text + if (identText != '') { + outText += identStart + WDiffEscape(identText); + } + outText += preText; + +// deleted text + if (delText != '') { + delText = wDiffHtmlDeleteStart + WDiffEscape(delText) + wDiffHtmlDeleteEnd; + delText = delText.replace(/\n/g, '¶<br>'); + outText += delText; + } + +// inserted text + if (insText != '') { + insText = wDiffHtmlInsertStart + WDiffEscape(insText) + wDiffHtmlInsertEnd; + insText = insText.replace(/\n/g, '¶<br>'); + outText += insText; + } + outText += postText; + } while (i <= text.newWords.length); + + outText += '\n'; + outText = WDiffHtmlFormat(outText); + + return(outText); +} + + +// WDiffEscape: replaces html-sensitive characters in output text with character entities + +window.WDiffEscape = function(text) { + + text = text.replace(/&/g, '&'); + text = text.replace(/</g, '<'); + text = text.replace(/>/g, '>'); + text = text.replace(/\"/g, '"'); + + return(text); +} + + +// HtmlCustomize: customize indicator html: replace {number} with the block number, {block} with the block style + +window.WDiffHtmlCustomize = function(text, block) { + + text = text.replace(/\{number\}/, block); + text = text.replace(/\{block\}/, wDiffStyleBlock[block]); + + return(text); +} + + +// HtmlFormat: replaces newlines and multiple spaces in text with html code + +window.WDiffHtmlFormat = function(text) { + + text = text.replace(/ /g, '  '); + text = text.replace(/\n/g, '<br>'); + + return(text); +} + + +// WDiffDetectBlocks: detect block borders and moved blocks +// input: text object, block object + +window.WDiffDetectBlocks = function(text, block) { + + block.oldStart = []; + block.oldToNew = []; + block.oldLength = []; + block.oldWords = []; + block.newStart = []; + block.newLength = []; + block.newWords = []; + block.newNumber = []; + block.newBlock = []; + block.newLeft = []; + block.newRight = []; + block.newLeftIndex = []; + block.newRightIndex = []; + + var blockNumber = 0; + var wordCounter = 0; + var realWordCounter = 0; + +// get old text block order + if (wDiffShowBlockMoves) { + var j = 0; + var i = 0; + do { + +// detect block boundaries on old text + if ( (text.oldToNew[j] != i) || (blockNumber == 0 ) ) { + if ( ( (text.oldToNew[j] != null) || (j >= text.oldWords.length) ) && ( (text.newToOld[i] != null) || (i >= text.newWords.length) ) ) { + if (blockNumber > 0) { + block.oldLength[blockNumber - 1] = wordCounter; + block.oldWords[blockNumber - 1] = realWordCounter; + wordCounter = 0; + realWordCounter = 0; + } + + if (j >= text.oldWords.length) { + j ++; + } + else { + i = text.oldToNew[j]; + block.oldStart[blockNumber] = j; + block.oldToNew[blockNumber] = text.oldToNew[j]; + blockNumber ++; + } + } + } + +// jump over identical pairs + while ( (i < text.newWords.length) && (j < text.oldWords.length) ) { + if ( (text.newToOld[i] == null) || (text.oldToNew[j] == null) ) { + break; + } + if (text.oldToNew[j] != i) { + break; + } + i ++; + j ++; + wordCounter ++; + if ( /\w/.test( text.newWords[i] ) ) { + realWordCounter ++; + } + } + +// jump over consecutive deletions + while ( (text.oldToNew[j] == null) && (j < text.oldWords.length) ) { + j ++; + } + +// jump over consecutive inserts + while ( (text.newToOld[i] == null) && (i < text.newWords.length) ) { + i ++; + } + } while (j <= text.oldWords.length); + +// get the block order in the new text + var lastMin; + var currMinIndex; + lastMin = null; + +// sort the data by increasing start numbers into new text block info + for (var i = 0; i < blockNumber; i ++) { + currMin = null; + for (var j = 0; j < blockNumber; j ++) { + curr = block.oldToNew[j]; + if ( (curr > lastMin) || (lastMin == null) ) { + if ( (curr < currMin) || (currMin == null) ) { + currMin = curr; + currMinIndex = j; + } + } + } + block.newStart[i] = block.oldToNew[currMinIndex]; + block.newLength[i] = block.oldLength[currMinIndex]; + block.newWords[i] = block.oldWords[currMinIndex]; + block.newNumber[i] = currMinIndex; + lastMin = currMin; + } + +// detect not moved blocks + for (var i = 0; i < blockNumber; i ++) { + if (block.newBlock[i] == null) { + if (block.newNumber[i] == i) { + block.newBlock[i] = 0; + } + } + } + +// detect switches of neighbouring blocks + for (var i = 0; i < blockNumber - 1; i ++) { + if ( (block.newBlock[i] == null) && (block.newBlock[i + 1] == null) ) { + if (block.newNumber[i] - block.newNumber[i + 1] == 1) { + if ( (block.newNumber[i + 1] - block.newNumber[i + 2] != 1) || (i + 2 >= blockNumber) ) { + +// the shorter one is declared the moved one + if (block.newLength[i] < block.newLength[i + 1]) { + block.newBlock[i] = 1; + block.newBlock[i + 1] = 0; + } + else { + block.newBlock[i] = 0; + block.newBlock[i + 1] = 1; + } + } + } + } + } + +// mark all others as moved and number the moved blocks + j = 1; + for (var i = 0; i < blockNumber; i ++) { + if ( (block.newBlock[i] == null) || (block.newBlock[i] == 1) ) { + block.newBlock[i] = j++; + } + } + +// check if a block has been moved from this block border + for (var i = 0; i < blockNumber; i ++) { + for (var j = 0; j < blockNumber; j ++) { + + if (block.newNumber[j] == i) { + if (block.newBlock[j] > 0) { + +// block moved right + if (block.newNumber[j] < j) { + block.newRight[i] = block.newBlock[j]; + block.newRightIndex[i] = j; + } + +// block moved left + else { + block.newLeft[i + 1] = block.newBlock[j]; + block.newLeftIndex[i + 1] = j; + } + } + } + } + } + } + return; +} + + +// WDiffShortenOutput: remove unchanged parts from final output +// input: the output of WDiffString +// returns: the text with removed unchanged passages indicated by (...) + +window.WDiffShortenOutput = function(diffText) { + +// html <br/> to newlines + diffText = diffText.replace(/<br[^>]*>/g, '\n'); + +// scan for diff html tags + var regExpDiff = new RegExp('<\\w+ class=\\"(\\w+)\\"[^>]*>(.|\\n)*?', 'g'); + var tagStart = []; + var tagEnd = []; + var i = 0; + var found; + while ( (found = regExpDiff.exec(diffText)) != null ) { + +// combine consecutive diff tags + if ( (i > 0) && (tagEnd[i - 1] == found.index) ) { + tagEnd[i - 1] = found.index + found[0].length; + } + else { + tagStart[i] = found.index; + tagEnd[i] = found.index + found[0].length; + i ++; + } + } + +// no diff tags detected + if (tagStart.length == 0) { + return(wDiffNoChange); + } + +// define regexps + var regExpHeading = new RegExp('\\n=+.+?=+ *\\n|\\n\\{\\||\\n\\|\\}', 'g'); + var regExpParagraph = new RegExp('\\n\\n+', 'g'); + var regExpLine = new RegExp('\\n+', 'g'); + var regExpBlank = new RegExp('(<[^>]+>)*\\s+', 'g'); + +// determine fragment border positions around diff tags + var rangeStart = []; + var rangeEnd = []; + var rangeStartType = []; + var rangeEndType = []; + for (var i = 0; i < tagStart.length; i ++) { + var found; + +// find last heading before diff tag + var lastPos = tagStart[i] - wDiffHeadingBefore; + if (lastPos < 0) { + lastPos = 0; + } + regExpHeading.lastIndex = lastPos; + while ( (found = regExpHeading.exec(diffText)) != null ) { + if (found.index > tagStart[i]) { + break; + } + rangeStart[i] = found.index; + rangeStartType[i] = 'heading'; + } + +// find last paragraph before diff tag + if (rangeStart[i] == null) { + lastPos = tagStart[i] - wDiffParagraphBefore; + if (lastPos < 0) { + lastPos = 0; + } + regExpParagraph.lastIndex = lastPos; + while ( (found = regExpParagraph.exec(diffText)) != null ) { + if (found.index > tagStart[i]) { + break; + } + rangeStart[i] = found.index; + rangeStartType[i] = 'paragraph'; + } + } + +// find line break before diff tag + if (rangeStart[i] == null) { + lastPos = tagStart[i] - wDiffLineBeforeMax; + if (lastPos < 0) { + lastPos = 0; + } + regExpLine.lastIndex = lastPos; + while ( (found = regExpLine.exec(diffText)) != null ) { + if (found.index > tagStart[i] - wDiffLineBeforeMin) { + break; + } + rangeStart[i] = found.index; + rangeStartType[i] = 'line'; + } + } + +// find blank before diff tag + if (rangeStart[i] == null) { + lastPos = tagStart[i] - wDiffBlankBeforeMax; + if (lastPos < 0) { + lastPos = 0; + } + regExpBlank.lastIndex = lastPos; + while ( (found = regExpBlank.exec(diffText)) != null ) { + if (found.index > tagStart[i] - wDiffBlankBeforeMin) { + break; + } + rangeStart[i] = found.index; + rangeStartType[i] = 'blank'; + } + } + +// fixed number of chars before diff tag + if (rangeStart[i] == null) { + rangeStart[i] = tagStart[i] - wDiffCharsBefore; + rangeStartType[i] = 'chars'; + if (rangeStart[i] < 0) { + rangeStart[i] = 0; + } + } + +// find first heading after diff tag + regExpHeading.lastIndex = tagEnd[i]; + if ( (found = regExpHeading.exec(diffText)) != null ) { + if (found.index < tagEnd[i] + wDiffHeadingAfter) { + rangeEnd[i] = found.index + found[0].length; + rangeEndType[i] = 'heading'; + } + } + +// find first paragraph after diff tag + if (rangeEnd[i] == null) { + regExpParagraph.lastIndex = tagEnd[i]; + if ( (found = regExpParagraph.exec(diffText)) != null ) { + if (found.index < tagEnd[i] + wDiffParagraphAfter) { + rangeEnd[i] = found.index; + rangeEndType[i] = 'paragraph'; + } + } + } + +// find first line break after diff tag + if (rangeEnd[i] == null) { + regExpLine.lastIndex = tagEnd[i] + wDiffLineAfterMin; + if ( (found = regExpLine.exec(diffText)) != null ) { + if (found.index < tagEnd[i] + wDiffLineAfterMax) { + rangeEnd[i] = found.index; + rangeEndType[i] = 'break'; + } + } + } + +// find blank after diff tag + if (rangeEnd[i] == null) { + regExpBlank.lastIndex = tagEnd[i] + wDiffBlankAfterMin; + if ( (found = regExpBlank.exec(diffText)) != null ) { + if (found.index < tagEnd[i] + wDiffBlankAfterMax) { + rangeEnd[i] = found.index; + rangeEndType[i] = 'blank'; + } + } + } + +// fixed number of chars after diff tag + if (rangeEnd[i] == null) { + rangeEnd[i] = tagEnd[i] + wDiffCharsAfter; + if (rangeEnd[i] > diffText.length) { + rangeEnd[i] = diffText.length; + rangeEndType[i] = 'chars'; + } + } + } + +// remove overlaps, join close fragments + var fragmentStart = []; + var fragmentEnd = []; + var fragmentStartType = []; + var fragmentEndType = []; + fragmentStart[0] = rangeStart[0]; + fragmentEnd[0] = rangeEnd[0]; + fragmentStartType[0] = rangeStartType[0]; + fragmentEndType[0] = rangeEndType[0]; + var j = 1; + for (var i = 1; i < rangeStart.length; i ++) { + if (rangeStart[i] > fragmentEnd[j - 1] + wDiffFragmentJoin) { + fragmentStart[j] = rangeStart[i]; + fragmentEnd[j] = rangeEnd[i]; + fragmentStartType[j] = rangeStartType[i]; + fragmentEndType[j] = rangeEndType[i]; + j ++; + } + else { + fragmentEnd[j - 1] = rangeEnd[i]; + fragmentEndType[j - 1] = rangeEndType[i]; + } + } + +// assemble the fragments + var outText = ''; + for (var i = 0; i < fragmentStart.length; i ++) { + +// get text fragment + var fragment = diffText.substring(fragmentStart[i], fragmentEnd[i]); + var fragment = fragment.replace(/^\n+|\n+$/g, ''); + +// add inline marks for omitted chars and words + if (fragmentStart[i] > 0) { + if (fragmentStartType[i] == 'chars') { + fragment = wDiffOmittedChars + fragment; + } + else if (fragmentStartType[i] == 'blank') { + fragment = wDiffOmittedChars + ' ' + fragment; + } + } + if (fragmentEnd[i] < diffText.length) { + if (fragmentStartType[i] == 'chars') { + fragment = fragment + wDiffOmittedChars; + } + else if (fragmentStartType[i] == 'blank') { + fragment = fragment + ' ' + wDiffOmittedChars; + } + } + +// add omitted line separator + if (fragmentStart[i] > 0) { + outText += wDiffOmittedLines; + } + +// encapsulate span errors + outText += '<div>' + fragment + '</div>'; + } + +// add trailing omitted line separator + if (fragmentEnd[i - 1] < diffText.length) { + outText = outText + wDiffOmittedLines; + } + +// remove leading and trailing empty lines + outText = outText.replace(/^(<div>)\n+|\n+(<\/div>)$/g, '$1$2'); + +// convert to html linebreaks + outText = outText.replace(/\n/g, '<br />'); + + return(outText); +} + Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php [iso-8859-1] Wed Jan 7 08:43:03 2009 @@ -149,7 +149,7 @@ $tdata .= '<view curpos="'.$page_offset.'" pagelimit="'.$this->page_limit.'" pagemax="'.$ptm_entries.'" tblcols="|'.$this->column_list.'|" />'; // prepare for usage in loop - $stmt_trans=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, r.lang_id, r.datetime, r.user_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.id = :data_id AND r.version > 0 AND r.lang_id = :lang WHERE r.archive = :archive LIMIT 1"); + $stmt_trans=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, r.lang_id, r.datetime, r.user_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.id = :data_id AND r.version > 0 AND r.lang_id = :lang AND r.archive = :archive LIMIT 1"); $stmt_trans->bindParam('archive',$this->archive_mode,PDO::PARAM_BOOL); $stmt_trans->bindParam('lang',$this->translation_lang,PDO::PARAM_INT); $stmt_stext=&DBConnection::getInstance()->prepare("SELECT content FROM ".ROSCMST_STEXT." WHERE rev_id = :rev_id AND name = 'title' LIMIT 1");

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009