Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 38641: Fix number of pages.
by dgorbachev＠svn.reactos.org 08 Jan '09

08 Jan '09

Author: dgorbachev Date: Thu Jan 8 05:39:57 2009 New Revision: 38641 URL: http://svn.reactos.org/svn/reactos?rev=38641&view=rev Log: Fix number of pages. Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c 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] Thu Jan 8 05:39:57 2009 @@ -383,7 +383,7 @@ static VOID HardwareWizardInit(HWND hwnd) { - HPROPSHEETPAGE ahpsp[5]; + HPROPSHEETPAGE ahpsp[6]; PROPSHEETPAGE psp = {0}; PROPSHEETHEADER psh; UINT nPages = 0;

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs