Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[mjmartin] 40857: - MmProtectAnonMem: Search all Regions in Memory Area up to Length for MEM_COMMIT prior to altering memory protection. Fixes 6 kernel32_winetest for virtual memory.
by mjmartin＠svn.reactos.org 09 May '09

09 May '09

Author: mjmartin Date: Sat May 9 13:54:50 2009 New Revision: 40857 URL: http://svn.reactos.org/svn/reactos?rev=40857&view=rev Log: - MmProtectAnonMem: Search all Regions in Memory Area up to Length for MEM_COMMIT prior to altering memory protection. Fixes 6 kernel32_winetest for virtual memory. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat May 9 13:54:50 2009 @@ -1034,26 +1034,48 @@ PULONG OldProtect) { PMM_REGION Region; - NTSTATUS Status; - - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, NULL); - if (Region->Type == MEM_COMMIT) - { - /* FIXME: check if the whole range is committed - * before altering the memory */ + NTSTATUS Status = STATUS_SUCCESS; + ULONG LengthCount = 0; + + /* Search all Regions in MemoryArea up to Length */ + /* Every Region up to Length must be committed for success */ + for (;;) + { + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (PVOID)((ULONG_PTR)BaseAddress + (ULONG_PTR)LengthCount), NULL); + + /* If a Region was found and it is committed */ + if ((Region) && (Region->Type == MEM_COMMIT)) + { + LengthCount += Region->Length; + if (Length <= LengthCount) break; + continue; + } + /* If Region was found and it is not commited */ + else if (Region) + { + Status = STATUS_NOT_COMMITTED; + break; + } + /* If no Region was found at all */ + else if (LengthCount == 0) + { + Status = STATUS_INVALID_ADDRESS; + break; + } + } + + if (NT_SUCCESS(Status)) + { *OldProtect = Region->Protect; Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, Length, Region->Type, Protect, MmModifyAttributes); } - else - { - Status = STATUS_NOT_COMMITTED; - } - return(Status); + + return (Status); } NTSTATUS NTAPI

1 0

[dgorbachev] 40856: Fix bug #4483, introduced in r40826 by me.
by dgorbachev＠svn.reactos.org 09 May '09

09 May '09

Author: dgorbachev Date: Sat May 9 13:53:03 2009 New Revision: 40856 URL: http://svn.reactos.org/svn/reactos?rev=40856&view=rev Log: Fix bug #4483, introduced in r40826 by me. Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 9 13:53:03 2009 @@ -483,7 +483,7 @@ } break; case WM_COMMAND: - if (LOWORD(wParam) == 14011) + if (LOWORD(wParam) == 14010) /* Disk Cleanup */ { lpstr = (WCHAR*)GetWindowLongPtr(hwndDlg, DWLP_USER); ZeroMemory( &si, sizeof(si) ); @@ -504,7 +504,7 @@ } case WM_NOTIFY: lppsn = (LPPSHNOTIFY) lParam; - if (LOWORD(wParam) == 14001) + if (LOWORD(wParam) == 14000) { if (HIWORD(wParam) == EN_CHANGE) { @@ -515,7 +515,7 @@ if (lppsn->hdr.code == PSN_APPLY) { lpstr = (LPWSTR)GetWindowLong(hwndDlg, DWLP_USER); - if (lpstr && SendDlgItemMessageW(hwndDlg, 14001, WM_GETTEXT, sizeof(szPath)/sizeof(WCHAR), (LPARAM)szPath)) + if (lpstr && SendDlgItemMessageW(hwndDlg, 14000, WM_GETTEXT, sizeof(szPath)/sizeof(WCHAR), (LPARAM)szPath)) { szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; SetVolumeLabelW(lpstr, szPath); Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "Ôàéëîâà óðåäáà:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Èçïîëçâàíî ìÿñòî:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Ñâîáîäíî ìÿñòî:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Îáåì:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Óñòðîéñòâî %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Ïî÷èñòâàíå íà äèñêà", 14013, 150, 175, 80, 15, WS_TABSTOP - CHECKBOX "Óïëúòíÿâàíå íà óñòðîéñòâîòî çà ñïåñòÿâàíå íà ìÿñòî", 14014, 1, 205, 238, 10, WS_DISABLED - CHECKBOX "Èíäåêñèðàùàòà óñëóãà äà èíäåêñèðà äèñêà çà ïî- áúðçî òúðñåíå", 14015, 1, 220, 238, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Óñòðîéñòâî %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Ïî÷èñòâàíå íà äèñêà", 14010, 150, 175, 80, 15, WS_TABSTOP + CHECKBOX "Óïëúòíÿâàíå íà óñòðîéñòâîòî çà ñïåñòÿâàíå íà ìÿñòî", 14011, 1, 205, 238, 10, WS_DISABLED + CHECKBOX "Èíäåêñèðàùàòà óñëóãà äà èíäåêñèðà äèñêà çà ïî- áúðçî òúðñåíå", 14012, 1, 220, 238, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -279,26 +279,26 @@ LTEXT "Souborový systém:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Vyuité místo:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Volné místo:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Kapacita:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Disk %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Vyèitìní disku", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "etøit místo na disku jeho kompresí", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Povolit indexování disku pro rychlejí vyhledávání", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Disk %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Vyèitìní disku", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "etøit místo na disku jeho kompresí", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Povolit indexování disku pro rychlejí vyhledávání", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -266,26 +266,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -280,26 +280,26 @@ LTEXT "Dateisystem:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Freier Speicher:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Speicherkapazität:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Laufwerk %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Bereinigen", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14015, 15, 220, 165, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Laufwerk %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Bereinigen", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "Óýóôçìá áñ÷åßùí:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "ÄåóìåõìÝíïò ÷þñïò:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Åëåýèåñïò ÷þñïò:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "×ùñçôéêüôçôá:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Äßóêïò %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "ÅêêáèÜñéóç äßóêïõ", 14013, 160, 175, 70, 15, WS_TABSTOP - CHECKBOX "Óõìðßåóç äßóêïõ ãéá åîïéêïíüìçóç ÷þñïõ", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Äçìéïõñãßá åõñåôçñßïõ ãéá ãñçãïñüôåñç áíáæÞôçóç", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Äßóêïò %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "ÅêêáèÜñéóç äßóêïõ", 14010, 160, 175, 70, 15, WS_TABSTOP + CHECKBOX "Óõìðßåóç äßóêïõ ãéá åîïéêïíüìçóç ÷þñïõ", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Äçìéïõñãßá åõñåôçñßïõ ãéá ãñçãïñüôåñç áíáæÞôçóç", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -280,26 +280,26 @@ LTEXT "Sistema de archivos:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Espacio ocupado:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Espacio libre:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacidad:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Unidad %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Liberar espacio en disco", 14013, 160, 175, 80, 15, WS_TABSTOP - CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14014, 5, 205, 180, 10, WS_DISABLED - CHECKBOX "Permitir a Index Server indizar el disco para acelerar la búsqueda", 14015, 5, 220, 220, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Unidad %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Liberar espacio en disco", 14010, 160, 175, 80, 15, WS_TABSTOP + CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 5, 205, 180, 10, WS_DISABLED + CHECKBOX "Permitir a Index Server indizar el disco para acelerar la búsqueda", 14012, 5, 220, 220, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -281,26 +281,26 @@ LTEXT "Système de fichiers :", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Espace utilisé :", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Espace libre :", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacité :", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Lecteur %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Nettoyage de disque", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Autoriser le service d'indexation à indexer ce disque pour une recherche rapide de fichiers", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Lecteur %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Nettoyage de disque", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Autoriser le service d'indexation à indexer ce disque pour une recherche rapide de fichiers", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -280,26 +280,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Spazio usato:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Spazio libero:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacità:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Disco %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Pulitura disco", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Comprimere il disco per recuperare dello spazio", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Permettere di indicizzare questo disco al servizio di indicizzazione per avere ricerche dei file più rapide", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Disco %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Pulitura disco", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Permettere di indicizzare questo disco al servizio di indicizzazione per avere ricerche dei file più rapide", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "t@CVXe:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "gpÌæ:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "ó«Ìæ:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "eÊ:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "hCu %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "fBXNÌN[Abv", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "hCuð³kµÄfBXNÌæðmÛ·é", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "±ÌfBXNÉCfbNXðt¯Ät@Cõð¬·éB", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "hCu %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "fBXNÌN[Abv", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "hCuð³kµÄfBXNÌæðmÛ·é", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "±ÌfBXNÉCfbNXðt¯Ät@Cõð¬·éB", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "Filsystem:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Brukt plass:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Ledig plass:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Kapasitet:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Stasjon %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Diskoppryding", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Indekser denne stasjonen for raskere søking", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Stasjon %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Diskoppryding", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -284,26 +284,26 @@ LTEXT "System plików:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Zajête miejsce:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Wolne miejsce:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Pojemnoæ:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Napêd %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Czyszczenie dysku", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Kompresja danych na dysku", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Zezwól Us³udze Indeksowania na zaindeksowanie tego dysku (szybkie przeszukiwanie plików)", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Napêd %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Czyszczenie dysku", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Kompresja danych na dysku", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Zezwól Us³udze Indeksowania na zaindeksowanie tego dysku (szybkie przeszukiwanie plików)", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -279,26 +279,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -279,26 +279,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "Sistem de fiºiere:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Spaþiu folosit:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Spaþiu liber:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacitate:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Partiþie %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Curãþire disc", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Comprimare pentru a salva spaþiu", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Permitere Serviciu de Indexare pentru cãutare rapidã", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Partiþie %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Curãþire disc", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Comprimare pentru a salva spaþiu", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Permitere Serviciu de Indexare pentru cãutare rapidã", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "Ôàéëîâàÿ ñèñòåìà:", -1, 15, 68, 86, 10 LTEXT "", 14002, 110, 68, 100, 10 - CONTROL "", 14003, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 5, 90, 10, 10 + CONTROL "", 14013, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 5, 90, 10, 10 LTEXT "Çàíÿòî:", -1, 25, 90, 78, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 5, 105, 10, 10 LTEXT "Ñâîáîäíî:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Åìêîñòü:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 20, 140, 200, 20 - - LTEXT "Äèñê %s", 14012, 100, 170, 52, 10 - PUSHBUTTON "Î÷èñòêà äèñêà", 14013, 166, 175, 64, 15, WS_TABSTOP - CHECKBOX "&Ñæèìàòü äëÿ ýêîíîìèè ìåñòà", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Ðàçðåøèòü &èíäåêñèðîâàíèå äèñêà äëÿ áûñòðîãî ïîèñêà", 14015, 15, 220, 216, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 20, 140, 200, 20 + + LTEXT "Äèñê %s", 14009, 100, 170, 52, 10 + PUSHBUTTON "Î÷èñòêà äèñêà", 14010, 166, 175, 64, 15, WS_TABSTOP + CHECKBOX "&Ñæèìàòü äëÿ ýêîíîìèè ìåñòà", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Ðàçðåøèòü &èíäåêñèðîâàíèå äèñêà äëÿ áûñòðîãî ïîèñêà", 14012, 15, 220, 216, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -283,26 +283,26 @@ LTEXT "Systém súborov:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Vyuité miesto:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Vo¾né miesto:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Kapacita:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Jednotka %s", 14012, 100, 170, 45, 10 - PUSHBUTTON "&Èistenie disku", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Uetri miesto na disku &kompresiou jednotky", 14014, 10, 205, 180, 10, WS_DISABLED - CHECKBOX "&Povoli indexovanie pre tento disk, a zrýchli tak h¾adanie súborov", 14015, 10, 220, 225, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Jednotka %s", 14009, 100, 170, 45, 10 + PUSHBUTTON "&Èistenie disku", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Uetri miesto na disku &kompresiou jednotky", 14011, 10, 205, 180, 10, WS_DISABLED + CHECKBOX "&Povoli indexovanie pre tento disk, a zrýchli tak h¾adanie súborov", 14012, 10, 220, 225, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -277,26 +277,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "Ôàéëîâà ñèñòåìà:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Çàéíÿòî:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Äîñòóïíî:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Ì³ñòê³ñòü:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Äèñê %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Î÷èùåííÿ äèñêà", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Ñòèñêàòè äèñê äëÿ çàîùàäæåííÿ ì³ñöÿ", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Äîçâîëèòè ³íäåêñóâàííÿ äèñêó äëÿ ïðèñêîðåííÿ ïîøóêó", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Äèñê %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Î÷èùåííÿ äèñêà", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Ñòèñêàòè äèñê äëÿ çàîùàäæåííÿ ì³ñöÿ", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Äîçâîëèòè ³íäåêñóâàííÿ äèñêó äëÿ ïðèñêîðåííÿ ïîøóêó", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -266,26 +266,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat May 9 13:53:03 2009 @@ -278,26 +278,26 @@ LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14002, 110, 70, 100, 10 - CONTROL "", 14003, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 - LTEXT "", 14004, 110, 90, 120, 10 - LTEXT "", 14005, 200, 90, 40, 10 - - CONTROL "", 14006, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "", 14003, 110, 90, 120, 10 + LTEXT "", 14004, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 - LTEXT "", 14007, 110, 105, 120, 10 - LTEXT "", 14008, 200, 105, 40, 10 + LTEXT "", 14005, 110, 105, 120, 10 + LTEXT "", 14006, 200, 105, 40, 10 LTEXT "Capacity:", -1, 25, 125, 80, 10 - LTEXT "", 14009, 110, 125, 120, 10 - LTEXT "", 14010, 200, 125, 40, 10 - - CONTROL "", 14011, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14012, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14013, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14014, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14015, 15, 220, 200, 10, WS_DISABLED + LTEXT "", 14007, 110, 125, 120, 10 + LTEXT "", 14008, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14009, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230

1 0

[dreimer] 40855: Dont ask me why I added a Error Silently Continue here... If I find it out, I will let you know
by dreimer＠svn.reactos.org 09 May '09

09 May '09

Author: dreimer Date: Sat May 9 13:43:57 2009 New Revision: 40855 URL: http://svn.reactos.org/svn/reactos?rev=40855&view=rev Log: Dont ask me why I added a Error Silently Continue here... If I find it out, I will let you know Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sat May 9 13:43:57 2009 @@ -112,7 +112,6 @@ } function BUILD { - $ErrorActionPreference = "SilentlyContinue" if ($_ROSBE_SHOWTIME -eq 1) { [System.Diagnostics.Stopwatch] $sw; $sw = New-Object System.Diagnostics.StopWatch Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat May 9 13:43:57 2009 @@ -89,7 +89,6 @@ $ENV:ROSBE_HOST_CXXFLAGS = $null $ENV:ROSBE_TARGET_CFLAGS = $null $ENV:ROSBE_TARGET_CXXFLAGS = $null - } else { $ENV:C_INCLUDE_PATH = $null $ENV:CPLUS_INCLUDE_PATH = $null

1 0

[dchapyshev] 40854: - Add some checks of parametres
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:38:16 2009 New Revision: 40854 URL: http://svn.reactos.org/svn/reactos?rev=40854&view=rev Log: - Add some checks of parametres Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat May 9 13:38:16 2009 @@ -305,13 +305,19 @@ BOOL WINAPI EnumEnhMetaFile( - HDC a0, - HENHMETAFILE a1, - ENHMFENUMPROC a2, - LPVOID a3, - CONST RECT *a4 - ) -{ + HDC hdc, + HENHMETAFILE hmf, + ENHMFENUMPROC callback, + LPVOID data, + CONST RECT *lpRect + ) +{ + if(!lpRect && hdc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -620,10 +626,15 @@ int WINAPI SetICMMode( - HDC a0, - int a1 - ) -{ + HDC hdc, + int iEnableICM + ) +{ + /*FIXME: Assume that ICM is always off, and cannot be turned on */ + if (iEnableICM == ICM_OFF) return ICM_OFF; + if (iEnableICM == ICM_ON) return 0; + if (iEnableICM == ICM_QUERY) return ICM_OFF; + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; @@ -715,11 +726,14 @@ BOOL WINAPI wglCopyContext( - HGLRC a0, - HGLRC a1, - UINT a2 - ) -{ + HGLRC hglrcSrc, + HGLRC hglrcDst, + UINT mask + ) +{ + if(!hglrcSrc || !hglrcDst) + return FALSE; + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -763,9 +777,11 @@ BOOL WINAPI wglDeleteContext( - HGLRC a - ) -{ + HGLRC hglrc + ) +{ + if (hglrc == NULL) return FALSE; + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -804,9 +820,11 @@ PROC WINAPI wglGetProcAddress( - LPCSTR a0 - ) -{ + LPCSTR func + ) +{ + if(!func) return NULL; + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; @@ -835,10 +853,11 @@ BOOL WINAPI wglShareLists( - HGLRC a0, - HGLRC a1 - ) -{ + HGLRC hglrc1, + HGLRC hglrc2 + ) +{ + if (hglrc1 == NULL) return FALSE; UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE;

1 0

[dchapyshev] 40853: - Sync riched20 with Wine 1.1.21
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:35:46 2009 New Revision: 40853 URL: http://svn.reactos.org/svn/reactos?rev=40853&view=rev Log: - Sync riched20 with Wine 1.1.21 Modified: trunk/reactos/dll/win32/riched20/writer.c Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Sat May 9 13:35:46 2009 @@ -295,10 +295,10 @@ } if (!ME_StreamOutRTFText(pStream, table[i].szFaceName, -1)) return FALSE; - if (!ME_StreamOutPrint(pStream, ";}\r\n")) + if (!ME_StreamOutPrint(pStream, ";}")) return FALSE; } - if (!ME_StreamOutPrint(pStream, "}")) + if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; /* Output colors table if not empty */ @@ -904,7 +904,7 @@ break; p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); } - if (!ME_StreamOutPrint(pStream, "}")) + if (!ME_StreamOutMove(pStream, "}\0", 2)) return FALSE; return TRUE; }

1 0

[dchapyshev] 40852: - Sync wordpad and winhlp32 with Wine 1.1.21
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:34:44 2009 New Revision: 40852 URL: http://svn.reactos.org/svn/reactos?rev=40852&view=rev Log: - Sync wordpad and winhlp32 with Wine 1.1.21 Modified: trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Sat May 9 13:34:44 2009 @@ -179,7 +179,7 @@ openfilename.nMaxFileTitle = 0; openfilename.lpstrInitialDir = szDir; openfilename.lpstrTitle = 0; - openfilename.Flags = 0; + openfilename.Flags = OFN_ENABLESIZING; openfilename.nFileOffset = 0; openfilename.nFileExtension = 0; openfilename.lpstrDefExt = 0; Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sat May 9 13:34:44 2009 @@ -870,7 +870,7 @@ ZeroMemory(&sfn, sizeof(sfn)); sfn.lStructSize = sizeof(sfn); - sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; + sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING; sfn.hwndOwner = hMainWnd; sfn.lpstrFilter = wszFilter; sfn.lpstrFile = wszFile; @@ -964,7 +964,7 @@ ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); - ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = wszFilter; ofn.lpstrFile = wszFile;

1 0

[dchapyshev] 40851: - Sync gdiplus with Wine 1.1.21
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:26:16 2009 New Revision: 40851 URL: http://svn.reactos.org/svn/reactos?rev=40851&view=rev Log: - Sync gdiplus with Wine 1.1.21 Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Sat May 9 13:26:16 2009 @@ -34,6 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +/* + Unix stuff + Code from http://www.johndcook.com/blog/2009/01/19/stand-alone-error-function-erf/ +*/ +double erf(double x) +{ + const float a1 = 0.254829592; + const float a2 = -0.284496736; + const float a3 = 1.421413741; + const float a4 = -1.453152027; + const float a5 = 1.061405429; + const float p = 0.3275911; + float t, y, sign; + + /* Save the sign of x */ + sign = 1; + if (x < 0) + sign = -1; + x = abs(x); + + /* A & S 7.1.26 */ + t = 1.0/(1.0 + p*x); + y = 1.0 - (((((a5*t + a4)*t) + a3)*t + a2)*t + a1)*t*exp(-x*x); + + return sign*y; +} + /****************************************************************************** * GdipCloneBrush [GDIPLUS.@] */ @@ -108,14 +135,38 @@ break; } - case BrushTypeLinearGradient: - *clone = GdipAlloc(sizeof(GpLineGradient)); - if(!*clone) return OutOfMemory; - - memcpy(*clone, brush, sizeof(GpLineGradient)); - - (*clone)->gdibrush = CreateSolidBrush((*clone)->lb.lbColor); + case BrushTypeLinearGradient:{ + GpLineGradient *dest, *src; + INT count; + + dest = GdipAlloc(sizeof(GpLineGradient)); + if(!dest) return OutOfMemory; + + src = (GpLineGradient*)brush; + + memcpy(dest, src, sizeof(GpLineGradient)); + + dest->brush.gdibrush = CreateSolidBrush(dest->brush.lb.lbColor); + + count = dest->blendcount; + dest->blendfac = GdipAlloc(count * sizeof(REAL)); + dest->blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!dest->blendfac || !dest->blendpos) + { + GdipFree(dest->blendfac); + GdipFree(dest->blendpos); + DeleteObject(dest->brush.gdibrush); + GdipFree(dest); + return OutOfMemory; + } + + memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); + memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); + + *clone = &dest->brush; break; + } case BrushTypeTextureFill: *clone = GdipAlloc(sizeof(GpTexture)); if(!*clone) return OutOfMemory; @@ -226,6 +277,28 @@ (*line)->wrap = wrap; (*line)->gamma = FALSE; + (*line)->rect.X = (startpoint->X < endpoint->X ? startpoint->X: endpoint->X); + (*line)->rect.Y = (startpoint->Y < endpoint->Y ? startpoint->Y: endpoint->Y); + (*line)->rect.Width = fabs(startpoint->X - endpoint->X); + (*line)->rect.Height = fabs(startpoint->Y - endpoint->Y); + + (*line)->blendcount = 1; + (*line)->blendfac = GdipAlloc(sizeof(REAL)); + (*line)->blendpos = GdipAlloc(sizeof(REAL)); + + if (!(*line)->blendfac || !(*line)->blendpos) + { + GdipFree((*line)->blendfac); + GdipFree((*line)->blendpos); + DeleteObject((*line)->brush.gdibrush); + GdipFree(*line); + *line = NULL; + return OutOfMemory; + } + + (*line)->blendfac[0] = 1.0f; + (*line)->blendpos[0] = 1.0f; + return Ok; } @@ -255,6 +328,7 @@ GpLineGradient **line) { GpPointF start, end; + GpStatus stat; TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, wrap, line); @@ -262,12 +336,42 @@ if(!line || !rect) return InvalidParameter; - start.X = rect->X; - start.Y = rect->Y; - end.X = rect->X + rect->Width; - end.Y = rect->Y + rect->Height; - - return GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + switch (mode) + { + case LinearGradientModeHorizontal: + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X + rect->Width; + end.Y = rect->Y; + break; + case LinearGradientModeVertical: + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X; + end.Y = rect->Y + rect->Height; + break; + case LinearGradientModeForwardDiagonal: + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X + rect->Width; + end.Y = rect->Y + rect->Height; + break; + case LinearGradientModeBackwardDiagonal: + start.X = rect->X + rect->Width; + start.Y = rect->Y; + end.X = rect->X; + end.Y = rect->Y + rect->Height; + break; + default: + return InvalidParameter; + } + + stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + + if (stat == Ok) + (*line)->rect = *rect; + + return stat; } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, @@ -765,7 +869,10 @@ GdipFree(((GpPathGradient*) brush)->blendpos); break; case BrushTypeSolidColor: + break; case BrushTypeLinearGradient: + GdipFree(((GpLineGradient*)brush)->blendfac); + GdipFree(((GpLineGradient*)brush)->blendpos); break; case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); @@ -1071,15 +1178,64 @@ } GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, - GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count) -{ - static int calls; - - if(!brush || !blend || !positions || count <= 0) - return InvalidParameter; - - if(!(calls++)) - FIXME("not implemented\n"); + GDIPCONST REAL *factors, GDIPCONST REAL* positions, INT count) +{ + REAL *new_blendfac, *new_blendpos; + + TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); + + if(!brush || !factors || !positions || count <= 0 || + (count >= 2 && (positions[0] != 0.0f || positions[count-1] != 1.0f))) + return InvalidParameter; + + new_blendfac = GdipAlloc(count * sizeof(REAL)); + new_blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!new_blendfac || !new_blendpos) + { + GdipFree(new_blendfac); + GdipFree(new_blendpos); + return OutOfMemory; + } + + memcpy(new_blendfac, factors, count * sizeof(REAL)); + memcpy(new_blendpos, positions, count * sizeof(REAL)); + + GdipFree(brush->blendfac); + GdipFree(brush->blendpos); + + brush->blendcount = count; + brush->blendfac = new_blendfac; + brush->blendpos = new_blendpos; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient *brush, REAL *factors, + REAL *positions, INT count) +{ + TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); + + if (!brush || !factors || !positions || count <= 0) + return InvalidParameter; + + if (count < brush->blendcount) + return InsufficientBuffer; + + memcpy(factors, brush->blendfac, brush->blendcount * sizeof(REAL)); + memcpy(positions, brush->blendpos, brush->blendcount * sizeof(REAL)); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count) +{ + TRACE("(%p, %p)\n", brush, count); + + if (!brush || !count) + return InvalidParameter; + + *count = brush->blendcount; return Ok; } @@ -1100,15 +1256,57 @@ GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient *line, REAL focus, REAL scale) { - static int calls; + REAL factors[33]; + REAL positions[33]; + int num_points = 0; + int i; + const int precision = 16; + REAL erf_range; /* we use values erf(-erf_range) through erf(+erf_range) */ + REAL min_erf; + REAL scale_erf; + + TRACE("(%p, %0.2f, %0.2f)\n", line, focus, scale); if(!line || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + /* we want 2 standard deviations */ + erf_range = 2.0 / sqrt(2); + + /* calculate the constants we need to normalize the error function to be + between 0.0 and scale over the range we need */ + min_erf = erf(-erf_range); + scale_erf = scale / (-2.0 * min_erf); + + if (focus != 0.0) + { + positions[0] = 0.0; + factors[0] = 0.0; + for (i=1; i<precision; i++) + { + positions[i] = focus * i / precision; + factors[i] = scale_erf * (erf(2 * erf_range * i / precision - erf_range) - min_erf); + } + num_points += precision; + } + + positions[num_points] = focus; + factors[num_points] = scale; + num_points += 1; + + if (focus != 1.0) + { + for (i=1; i<precision; i++) + { + positions[i+num_points-1] = (focus + ((1.0-focus) * i / precision)); + factors[i+num_points-1] = scale_erf * (erf(erf_range - 2 * erf_range * i / precision) - min_erf); + } + num_points += precision; + positions[num_points-1] = 1.0; + factors[num_points-1] = 0.0; + } + + return GdipSetLineBlend(line, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line, @@ -1403,11 +1601,7 @@ if(!brush || !rect) return InvalidParameter; - rect->X = (brush->startpoint.X < brush->endpoint.X ? brush->startpoint.X: brush->endpoint.X); - rect->Y = (brush->startpoint.Y < brush->endpoint.Y ? brush->startpoint.Y: brush->endpoint.Y); - - rect->Width = fabs(brush->startpoint.X - brush->endpoint.X); - rect->Height = fabs(brush->startpoint.Y - brush->endpoint.Y); + *rect = brush->rect; return Ok; } Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sat May 9 13:26:16 2009 @@ -35,6 +35,8 @@ static const REAL mm_per_inch = 25.4; static const REAL inch_per_point = 1.0/72.0; + +static GpFontCollection installedFontCollection = {0}; static inline REAL get_dpi (void) { @@ -193,7 +195,7 @@ oldfont = SelectObject(hdc, hfont); GetTextMetricsW(hdc, &textmet); - (*font)->lfw.lfHeight = -textmet.tmHeight; + (*font)->lfw.lfHeight = -(textmet.tmHeight-textmet.tmInternalLeading); (*font)->lfw.lfWeight = textmet.tmWeight; (*font)->lfw.lfCharSet = textmet.tmCharSet; @@ -936,5 +938,7 @@ if (!fontCollection) return InvalidParameter; - return NotImplemented; -} + *fontCollection = &installedFontCollection; + + return Ok; +} Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat May 9 13:26:16 2009 @@ -42,7 +42,7 @@ @ stub GdipBitmapGetHistogramSize @ stdcall GdipBitmapGetPixel(ptr long long ptr) @ stdcall GdipBitmapLockBits(ptr ptr long long ptr) -@ stub GdipBitmapSetPixel +@ stdcall GdipBitmapSetPixel(ptr long long long) @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) @@ -295,13 +295,13 @@ @ stdcall GdipGetImagePaletteSize(ptr ptr) @ stdcall GdipGetImagePixelFormat(ptr ptr) @ stdcall GdipGetImageRawFormat(ptr ptr) -@ stub GdipGetImageThumbnail +@ stdcall GdipGetImageThumbnail(ptr long long ptr ptr ptr) @ stdcall GdipGetImageType(ptr ptr) @ stdcall GdipGetImageVerticalResolution(ptr ptr) @ stdcall GdipGetImageWidth(ptr ptr) @ stdcall GdipGetInterpolationMode(ptr ptr) -@ stub GdipGetLineBlend -@ stub GdipGetLineBlendCount +@ stdcall GdipGetLineBlend(ptr ptr ptr long) +@ stdcall GdipGetLineBlendCount(ptr ptr) @ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @@ -409,7 +409,7 @@ @ stdcall GdipImageGetFrameCount(ptr ptr ptr) @ stdcall GdipImageGetFrameDimensionsCount(ptr ptr) @ stdcall GdipImageGetFrameDimensionsList(ptr ptr long) -@ stub GdipImageRotateFlip +@ stdcall GdipImageRotateFlip(ptr long) @ stdcall GdipImageSelectActiveFrame(ptr ptr long) @ stub GdipImageSetAbort @ stub GdipInitializePalette @@ -582,7 +582,7 @@ @ stdcall GdipSetPenWidth(ptr long) @ stdcall GdipSetPixelOffsetMode(ptr long) @ stdcall GdipSetPropertyItem(ptr ptr) -@ stub GdipSetRenderingOrigin +@ stdcall GdipSetRenderingOrigin(ptr long long) @ stdcall GdipSetSmoothingMode(ptr long) @ stdcall GdipSetSolidFillColor(ptr ptr) @ stdcall GdipSetStringFormatAlign(ptr long) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sat May 9 13:26:16 2009 @@ -91,6 +91,7 @@ struct GpGraphics{ HDC hdc; HWND hwnd; + BOOL owndc; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; @@ -142,8 +143,12 @@ GpPointF endpoint; ARGB startcolor; ARGB endcolor; + RectF rect; GpWrapMode wrap; BOOL gamma; + REAL* blendfac; /* blend factors */ + REAL* blendpos; /* blend positions */ + INT blendcount; }; struct GpTexture{ Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat May 9 13:26:16 2009 @@ -172,13 +172,54 @@ } } -static ARGB blend_colors(ARGB start, ARGB end, int current, int total) +static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; ARGB i; for (i=0xff; i<=0xff0000; i = i << 8) - result |= (((start&i)*(total - current)+(end&i)*(current))/total)&i; + result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; return result; +} + +static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) +{ + REAL blendfac; + + /* clamp to between 0.0 and 1.0, using the wrap mode */ + if (brush->wrap == WrapModeTile) + { + position = fmodf(position, 1.0f); + if (position < 0.0f) position += 1.0f; + } + else /* WrapModeFlip* */ + { + position = fmodf(position, 2.0f); + if (position < 0.0f) position += 2.0f; + if (position > 1.0f) position = 2.0f - position; + } + + if (brush->blendcount == 1) + blendfac = position; + else + { + int i=1; + REAL left_blendpos, left_blendfac, right_blendpos, right_blendfac; + REAL range; + + /* locate the blend positions surrounding this position */ + while (position > brush->blendpos[i]) + i++; + + /* interpolate between the blend positions */ + left_blendpos = brush->blendpos[i-1]; + left_blendfac = brush->blendfac[i-1]; + right_blendpos = brush->blendpos[i]; + right_blendfac = brush->blendfac[i]; + range = right_blendpos - left_blendpos; + blendfac = (left_blendfac * (right_blendpos - position) + + right_blendfac * (position - left_blendpos)) / range; + } + return blend_colors(brush->startcolor, brush->endcolor, blendfac); } static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) @@ -189,7 +230,6 @@ { GpLineGradient *line = (GpLineGradient*)brush; RECT rc; - int num_steps = 255; SelectClipPath(graphics->hdc, RGN_AND); if (GetClipBox(graphics->hdc, &rc) != NULLREGION) @@ -200,9 +240,6 @@ SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); - /* fill with starting color */ - FillRect(graphics->hdc, &rc, brush->gdibrush); - endpointsf[0] = line->startpoint; endpointsf[1] = line->endpoint; transform_and_round_points(graphics, endpointsi, endpointsf, 2); @@ -210,114 +247,100 @@ if (abs(endpointsi[0].x-endpointsi[1].x) > abs(endpointsi[0].y-endpointsi[1].y)) { /* vertical-ish gradient */ - int endborderx; /* vertical rectangle boundary near endpoint */ int startx, endx; /* x co-ordinates of endpoints shifted to intersect the top of the visible rectangle */ - int startbottomx, endbottomx; /* x co-ordinate of endpoints shifted to intersect the bottom of the visible rectangle */ + int startbottomx; /* x co-ordinate of start point shifted to intersect the bottom of the visible rectangle */ int width; COLORREF col; HBRUSH hbrush, hprevbrush; - int i; - - if (endpointsi[1].x > endpointsi[0].x) - endborderx = rc.right; - else - endborderx = rc.left; + int leftx, rightx; /* x co-ordinates where the leftmost and rightmost gradient lines hit the top of the visible rectangle */ + int x; + int tilt; /* horizontal distance covered by a gradient line */ startx = roundr((rc.top - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); endx = roundr((rc.top - endpointsf[1].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[1].X); width = endx - startx; startbottomx = roundr((rc.bottom - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); - endbottomx = startbottomx+width; - - if (num_steps > abs(width)) num_steps = abs(width); - - poly[0].x = endborderx; + tilt = startx - startbottomx; + + if (startx >= startbottomx) + { + leftx = rc.left; + rightx = rc.right + tilt; + } + else + { + leftx = rc.left + tilt; + rightx = rc.right; + } + poly[0].y = rc.bottom; - poly[1].x = endborderx; poly[1].y = rc.top; poly[2].y = rc.top; poly[3].y = rc.bottom; - for (i=1; i<num_steps; i++) + for (x=leftx; x<=rightx; x++) { - ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); - int ofs = width * i / num_steps; + ARGB argb = blend_line_gradient(line, (x-startx)/(REAL)width); col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); hprevbrush = SelectObject(graphics->hdc, hbrush); - poly[2].x = startx + ofs; - poly[3].x = startbottomx + ofs; + poly[0].x = x - tilt - 1; + poly[1].x = x - 1; + poly[2].x = x; + poly[3].x = x - tilt; Polygon(graphics->hdc, poly, 4); SelectObject(graphics->hdc, hprevbrush); DeleteObject(hbrush); } - - poly[2].x = endx; - poly[3].x = endbottomx; - - /* draw the ending color */ - col = ARGB2COLORREF(line->endcolor); - hbrush = CreateSolidBrush(col); - hprevbrush = SelectObject(graphics->hdc, hbrush); - Polygon(graphics->hdc, poly, 4); - SelectObject(graphics->hdc, hprevbrush); - DeleteObject(hbrush); } else if (endpointsi[0].y != endpointsi[1].y) { /* horizontal-ish gradient */ - int endbordery; /* horizontal rectangle boundary near endpoint */ int starty, endy; /* y co-ordinates of endpoints shifted to intersect the left of the visible rectangle */ - int startrighty, endrighty; /* y co-ordinate of endpoints shifted to intersect the right of the visible rectangle */ + int startrighty; /* y co-ordinate of start point shifted to intersect the right of the visible rectangle */ int height; COLORREF col; HBRUSH hbrush, hprevbrush; - int i; - - if (endpointsi[1].y > endpointsi[0].y) - endbordery = rc.bottom; - else - endbordery = rc.top; + int topy, bottomy; /* y co-ordinates where the topmost and bottommost gradient lines hit the left of the visible rectangle */ + int y; + int tilt; /* vertical distance covered by a gradient line */ starty = roundr((rc.left - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); endy = roundr((rc.left - endpointsf[1].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[1].Y); height = endy - starty; startrighty = roundr((rc.right - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); - endrighty = startrighty+height; - - if (num_steps > abs(height)) num_steps = abs(height); + tilt = starty - startrighty; + + if (starty >= startrighty) + { + topy = rc.top; + bottomy = rc.bottom + tilt; + } + else + { + topy = rc.top + tilt; + bottomy = rc.bottom; + } poly[0].x = rc.right; - poly[0].y = endbordery; poly[1].x = rc.left; - poly[1].y = endbordery; poly[2].x = rc.left; poly[3].x = rc.right; - for (i=1; i<num_steps; i++) + for (y=topy; y<=bottomy; y++) { - ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); - int ofs = height * i / num_steps; + ARGB argb = blend_line_gradient(line, (y-starty)/(REAL)height); col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); hprevbrush = SelectObject(graphics->hdc, hbrush); - poly[2].y = starty + ofs; - poly[3].y = startrighty + ofs; + poly[0].y = y - tilt - 1; + poly[1].y = y - 1; + poly[2].y = y; + poly[3].y = y - tilt; Polygon(graphics->hdc, poly, 4); SelectObject(graphics->hdc, hprevbrush); DeleteObject(hbrush); } - - poly[2].y = endy; - poly[3].y = endrighty; - - /* draw the ending color */ - col = ARGB2COLORREF(line->endcolor); - hbrush = CreateSolidBrush(col); - hprevbrush = SelectObject(graphics->hdc, hbrush); - Polygon(graphics->hdc, poly, 4); - SelectObject(graphics->hdc, hprevbrush); - DeleteObject(hbrush); } /* else startpoint == endpoint */ } @@ -924,6 +947,7 @@ (*graphics)->hdc = hdc; (*graphics)->hwnd = WindowFromDC(hdc); + (*graphics)->owndc = FALSE; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeDefault; @@ -940,13 +964,20 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) { GpStatus ret; + HDC hdc; TRACE("(%p, %p)\n", hwnd, graphics); - if((ret = GdipCreateFromHDC(GetDC(hwnd), graphics)) != Ok) + hdc = GetDC(hwnd); + + if((ret = GdipCreateFromHDC(hdc, graphics)) != Ok) + { + ReleaseDC(hwnd, hdc); return ret; + } (*graphics)->hwnd = hwnd; + (*graphics)->owndc = TRUE; return Ok; } @@ -1081,7 +1112,7 @@ if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if(graphics->hwnd) + if(graphics->owndc) ReleaseDC(graphics->hwnd, graphics->hdc); GdipDeleteRegion(graphics->clip); @@ -2448,12 +2479,14 @@ save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); transform_and_round_points(graphics, pti, ptf, 4); + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, 4); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state); @@ -3210,6 +3243,18 @@ return Ok; } +GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics *graphics, INT x, INT y) +{ + static int calls; + + TRACE("(%p,%i,%i)\n", graphics, x, y); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode) { TRACE("(%p, %d)\n", graphics, mode); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat May 9 13:26:16 2009 @@ -83,6 +83,21 @@ FIXME("not implemented\n"); *color = 0xdeadbeef; + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, + ARGB color) +{ + static int calls; + TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); + + if(!bitmap) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); return NotImplemented; } @@ -1648,3 +1663,24 @@ return Ok; } + +/***************************************************************************** + * GdipGetImageThumbnail [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT height, + GpImage **ret_image, GetThumbnailImageAbort cb, + VOID * cb_data) +{ + FIXME("(%p %u %u %p %p %p) stub\n", + image, width, height, ret_image, cb, cb_data); + return NotImplemented; +} + +/***************************************************************************** + * GdipImageRotateFlip [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) +{ + FIXME("(%p %u) stub\n", image, type); + return NotImplemented; +}

1 0

[dchapyshev] 40850: - Sync msctf, mscoree, mciqtz32, localspl, inetmib1 with Wine 1.1.21
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:24:59 2009 New Revision: 40850 URL: http://svn.reactos.org/svn/reactos?rev=40850&view=rev Log: - Sync msctf, mscoree, mciqtz32, localspl, inetmib1 with Wine 1.1.21 Modified: trunk/reactos/dll/win32/inetmib1/main.c trunk/reactos/dll/win32/localspl/localspl_private.h trunk/reactos/dll/win32/localspl/provider.c trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h trunk/reactos/dll/win32/mscoree/mscoree.spec trunk/reactos/dll/win32/mscoree/mscoree_main.c trunk/reactos/dll/win32/msctf/categorymgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/threadmgr.c Modified: trunk/reactos/dll/win32/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/main.c?… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -125,6 +125,7 @@ AsnInteger32 *pErrorStatus) { AsnObjectIdentifier numberOid = DEFINE_OID(mib2IfNumber); + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -155,12 +156,13 @@ break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static void copyOperStatus(AsnAny *value, void *src) @@ -431,45 +433,61 @@ return ret; } -static void setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, +static INT setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, UINT item) { UINT id; AsnObjectIdentifier oid; - - SnmpUtilOidCpy(dst, base); - oid.idLength = 1; - oid.ids = &id; - id = item; - SnmpUtilOidAppend(dst, &oid); -} - -static void setOidWithItemAndIpAddr(AsnObjectIdentifier *dst, + INT ret; + + ret = SnmpUtilOidCpy(dst, base); + if (ret) + { + oid.idLength = 1; + oid.ids = &id; + id = item; + ret = SnmpUtilOidAppend(dst, &oid); + } + return ret; +} + +static INT setOidWithItemAndIpAddr(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, UINT item, DWORD addr) { UINT id; BYTE *ptr; AsnObjectIdentifier oid; - - setOidWithItem(dst, base, item); - oid.idLength = 1; - oid.ids = &id; - for (ptr = (BYTE *)&addr; ptr < (BYTE *)&addr + sizeof(DWORD); ptr++) - { - id = *ptr; - SnmpUtilOidAppend(dst, &oid); - } -} - -static void setOidWithItemAndInteger(AsnObjectIdentifier *dst, + INT ret; + + ret = setOidWithItem(dst, base, item); + if (ret) + { + oid.idLength = 1; + oid.ids = &id; + for (ptr = (BYTE *)&addr; ret && ptr < (BYTE *)&addr + sizeof(DWORD); + ptr++) + { + id = *ptr; + ret = SnmpUtilOidAppend(dst, &oid); + } + } + return ret; +} + +static INT setOidWithItemAndInteger(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, UINT item, UINT instance) { AsnObjectIdentifier oid; - - setOidWithItem(dst, base, item); - oid.idLength = 1; - oid.ids = &instance; - SnmpUtilOidAppend(dst, &oid); + INT ret; + + ret = setOidWithItem(dst, base, item); + if (ret) + { + oid.idLength = 1; + oid.ids = &instance; + ret = SnmpUtilOidAppend(dst, &oid); + } + return ret; } static struct structToAsnValue mib2IfEntryMap[] = { @@ -502,6 +520,7 @@ AsnInteger32 *pErrorStatus) { AsnObjectIdentifier entryOid = DEFINE_OID(mib2IfEntry); + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -536,20 +555,21 @@ &ifTable->table[tableIndex - 1], item, bPduType, pVarBind); if (bPduType == SNMP_PDU_GETNEXT) - setOidWithItemAndInteger(&pVarBind->name, &entryOid, - item, tableIndex); + ret = setOidWithItemAndInteger(&pVarBind->name, + &entryOid, item, tableIndex); } } } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2Ip[] = { 1,3,6,1,2,1,4 }; @@ -591,6 +611,7 @@ { AsnObjectIdentifier myOid = DEFINE_OID(mib2Ip); UINT item = 0; + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -606,17 +627,18 @@ *pErrorStatus = mapStructEntryToValue(mib2IpMap, DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItem(&pVarBind->name, &myOid, item); + ret = setOidWithItem(&pVarBind->name, &myOid, item); } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2IpAddr[] = { 1,3,6,1,2,1,4,20,1 }; @@ -669,6 +691,7 @@ { AsnObjectIdentifier myOid = DEFINE_OID(mib2IpAddr); UINT tableIndex = 0, item = 0; + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -689,18 +712,19 @@ DEFINE_SIZEOF(mib2IpAddrMap), &ipAddrTable->table[tableIndex - 1], item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, + ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipAddrTable->table[tableIndex - 1].dwAddr); } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2IpRoute[] = { 1,3,6,1,2,1,4,21,1 }; @@ -760,6 +784,7 @@ { AsnObjectIdentifier myOid = DEFINE_OID(mib2IpRoute); UINT tableIndex = 0, item = 0; + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -780,18 +805,19 @@ DEFINE_SIZEOF(mib2IpRouteMap), &ipRouteTable->table[tableIndex - 1], item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, + ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipRouteTable->table[tableIndex - 1].dwForwardDest); } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2IpNet[] = { 1,3,6,1,2,1,4,22,1 }; @@ -828,6 +854,7 @@ AsnInteger32 *pErrorStatus) { AsnObjectIdentifier myOid = DEFINE_OID(mib2IpNet); + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -856,20 +883,21 @@ DEFINE_SIZEOF(mib2IpNetMap), &ipNetTable[tableIndex - 1], item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItemAndInteger(&pVarBind->name, &myOid, item, - tableIndex); + ret = setOidWithItemAndInteger(&pVarBind->name, &myOid, + item, tableIndex); } } } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2Icmp[] = { 1,3,6,1,2,1,5 }; @@ -914,6 +942,7 @@ { AsnObjectIdentifier myOid = DEFINE_OID(mib2Icmp); UINT item = 0; + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -930,17 +959,18 @@ DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItem(&pVarBind->name, &myOid, item); + ret = setOidWithItem(&pVarBind->name, &myOid, item); } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2Tcp[] = { 1,3,6,1,2,1,6 }; @@ -974,6 +1004,7 @@ { AsnObjectIdentifier myOid = DEFINE_OID(mib2Tcp); UINT item = 0; + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -989,17 +1020,18 @@ *pErrorStatus = mapStructEntryToValue(mib2TcpMap, DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItem(&pVarBind->name, &myOid, item); + ret = setOidWithItem(&pVarBind->name, &myOid, item); } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2Udp[] = { 1,3,6,1,2,1,7 }; @@ -1022,6 +1054,7 @@ { AsnObjectIdentifier myOid = DEFINE_OID(mib2Udp); UINT item; + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -1037,17 +1070,18 @@ *pErrorStatus = mapStructEntryToValue(mib2UdpMap, DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, bPduType, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) - setOidWithItem(&pVarBind->name, &myOid, item); + ret = setOidWithItem(&pVarBind->name, &myOid, item); } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } static UINT mib2UdpEntry[] = { 1,3,6,1,2,1,7,5,1 }; @@ -1102,6 +1136,7 @@ AsnInteger32 *pErrorStatus) { AsnObjectIdentifier myOid = DEFINE_OID(mib2UdpEntry); + BOOL ret = TRUE; TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), pErrorStatus); @@ -1131,23 +1166,27 @@ { AsnObjectIdentifier oid; - setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, + ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, udpTable->table[tableIndex - 1].dwLocalAddr); - oid.idLength = 1; - oid.ids = &udpTable->table[tableIndex - 1].dwLocalPort; - SnmpUtilOidAppend(&pVarBind->name, &oid); + if (ret) + { + oid.idLength = 1; + oid.ids = &udpTable->table[tableIndex - 1].dwLocalPort; + ret = SnmpUtilOidAppend(&pVarBind->name, &oid); + } } } } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + ret = FALSE; break; default: FIXME("0x%02x: unsupported PDU type\n", bPduType); *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - return TRUE; + return ret; } /* This list MUST BE lexicographically sorted */ @@ -1240,6 +1279,7 @@ AsnObjectIdentifier mib2oid = DEFINE_OID(mib2); AsnInteger32 error = SNMP_ERRORSTATUS_NOERROR, errorIndex = 0; UINT i; + BOOL ret = TRUE; TRACE("(0x%02x, %p, %p, %p)\n", bPduType, pVarBindList, pErrorStatus, pErrorIndex); @@ -1261,7 +1301,7 @@ impl = findSupportedQuery(pVarBindList->list[i].name.ids, len, &matchingIndex); if (impl && impl->query) - impl->query(bPduType, &pVarBindList->list[i], &error); + ret = impl->query(bPduType, &pVarBindList->list[i], &error); else error = SNMP_ERRORSTATUS_NOSUCHNAME; if (error == SNMP_ERRORSTATUS_NOSUCHNAME && @@ -1278,7 +1318,8 @@ error = SNMP_ERRORSTATUS_NOERROR; impl = &supportedIDs[matchingIndex]; if (impl->query) - impl->query(bPduType, &pVarBindList->list[i], &error); + ret = impl->query(bPduType, &pVarBindList->list[i], + &error); else error = SNMP_ERRORSTATUS_NOSUCHNAME; } @@ -1288,7 +1329,7 @@ if (error == SNMP_ERRORSTATUS_NOSUCHNAME) { SnmpUtilOidFree(&pVarBindList->list[i].name); - SnmpUtilOidCpy(&pVarBindList->list[i].name, + ret = SnmpUtilOidCpy(&pVarBindList->list[i].name, &supportedIDs[matchingIndex - 1].name); pVarBindList->list[i].name.ids[ pVarBindList->list[i].name.idLength - 1] += 1; @@ -1300,7 +1341,7 @@ } *pErrorStatus = error; *pErrorIndex = errorIndex; - return TRUE; + return ret; } /***************************************************************************** Modified: trunk/reactos/dll/win32/localspl/localspl_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] Sat May 9 13:24:59 2009 @@ -62,6 +62,11 @@ return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) +{ + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -80,6 +80,13 @@ LPCWSTR versionsubdir; } printenv_t; +typedef struct { + LPWSTR name; + LPWSTR printername; + monitor_t * pm; + HANDLE hXcv; +} printer_t; + /* ############################### */ static struct list monitor_handles = LIST_INIT( monitor_handles ); @@ -88,6 +95,7 @@ static const PRINTPROVIDOR * pprovider = NULL; static const WCHAR backslashW[] = {'\\',0}; +static const WCHAR bs_ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR configuration_fileW[] = {'C','o','n','f','i','g','u','r','a','t','i','o','n',' ','F','i','l','e',0}; static const WCHAR datatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR data_fileW[] = {'D','a','t','a',' ','F','i','l','e',0}; @@ -118,20 +126,30 @@ static const WCHAR parametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR portW[] = {'P','o','r','t',0}; static const WCHAR previous_namesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; +static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', + 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'P','r','i','n','t','\\', + 'P','r','i','n','t','e','r','s',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; +static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; +static const WCHAR version0_subdirW[] = {'\\','0',0}; +static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; +static const WCHAR version3_subdirW[] = {'\\','3',0}; static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR win40_envnameW[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR win40_subdirW[] = {'w','i','n','4','0',0}; -static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; -static const WCHAR version0_subdirW[] = {'\\','0',0}; - +static const WCHAR winnt_cv_portsW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','o','r','t','s',0}; static const WCHAR x64_envnameW[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static const WCHAR x64_subdirW[] = {'x','6','4',0}; static const WCHAR x86_envnameW[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR x86_subdirW[] = {'w','3','2','x','8','6',0}; -static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; -static const WCHAR version3_subdirW[] = {'\\','3',0}; +static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; +static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; static const printenv_t env_x86 = {x86_envnameW, x86_subdirW, 3, @@ -271,6 +289,32 @@ } } return serverlen; +} + +/****************************************************************** + * get_basename_from_name (internal) + * + * skip over the serverpart from the full name + * + */ +static LPCWSTR get_basename_from_name(LPCWSTR name) +{ + if (name == NULL) return NULL; + if ((name[0] == '\\') && (name[1] == '\\')) { + /* skip over the servername and search for the following '\' */ + name = strchrW(&name[2], '\\'); + if ((name) && (name[1])) { + /* found a separator ('\') followed by a name: + skip over the separator and return the rest */ + name++; + } + else + { + /* no basename present (we found only a servername) */ + return NULL; + } + } + return name; } /****************************************************************** @@ -513,6 +557,65 @@ } /****************************************************************** + * monitor_load_by_port [internal] + * + * load a printmonitor for a given port + * + * On failure, NULL is returned + */ + +static monitor_t * monitor_load_by_port(LPCWSTR portname) +{ + HKEY hroot; + HKEY hport; + LPWSTR buffer; + monitor_t * pm = NULL; + DWORD registered = 0; + DWORD id = 0; + DWORD len; + + TRACE("(%s)\n", debugstr_w(portname)); + + /* Try the Local Monitor first */ + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, winnt_cv_portsW, &hroot) == ERROR_SUCCESS) { + if (RegQueryValueExW(hroot, portname, NULL, NULL, NULL, &len) == ERROR_SUCCESS) { + /* found the portname */ + RegCloseKey(hroot); + return monitor_load(localportW, NULL); + } + RegCloseKey(hroot); + } + + len = MAX_PATH + lstrlenW(bs_ports_bsW) + lstrlenW(portname) + 1; + buffer = heap_alloc(len * sizeof(WCHAR)); + if (buffer == NULL) return NULL; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) == ERROR_SUCCESS) { + EnterCriticalSection(&monitor_handles_cs); + RegQueryInfoKeyW(hroot, NULL, NULL, NULL, &registered, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + while ((pm == NULL) && (id < registered)) { + buffer[0] = '\0'; + RegEnumKeyW(hroot, id, buffer, MAX_PATH); + TRACE("testing %s\n", debugstr_w(buffer)); + len = lstrlenW(buffer); + lstrcatW(buffer, bs_ports_bsW); + lstrcatW(buffer, portname); + if (RegOpenKeyW(hroot, buffer, &hport) == ERROR_SUCCESS) { + RegCloseKey(hport); + buffer[len] = '\0'; /* use only the Monitor-Name */ + pm = monitor_load(buffer, NULL); + } + id++; + } + LeaveCriticalSection(&monitor_handles_cs); + RegCloseKey(hroot); + } + heap_free(buffer); + return pm; +} + +/****************************************************************** * Return the number of bytes for an multi_sz string. * The result includes all \0s * (specifically the extra \0, that is needed as multi_sz terminator). @@ -907,6 +1010,139 @@ return hui; } +/****************************************************************** + * printer_free + * free the data pointer of an opened printer + */ +static VOID printer_free(printer_t * printer) +{ + if (printer->hXcv) + printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + + monitor_unload(printer->pm); + + heap_free(printer->printername); + heap_free(printer->name); + heap_free(printer); +} + +/****************************************************************** + * printer_alloc_handle + * alloc a printer handle and remember the data pointer in the printer handle table + * + */ +static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) +{ + WCHAR servername[MAX_COMPUTERNAME_LENGTH + 1]; + printer_t *printer = NULL; + LPCWSTR printername; + HKEY hkeyPrinters; + HKEY hkeyPrinter; + DWORD len; + + if (copy_servername_from_name(name, servername)) { + FIXME("server %s not supported\n", debugstr_w(servername)); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + printername = get_basename_from_name(name); + if (name != printername) TRACE("converted %s to %s\n", debugstr_w(name), debugstr_w(printername)); + + /* an empty printername is invalid */ + if (printername && (!printername[0])) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + printer = heap_alloc_zero(sizeof(printer_t)); + if (!printer) goto end; + + /* clone the base name. This is NULL for the printserver */ + printer->printername = strdupW(printername); + + /* clone the full name */ + printer->name = strdupW(name); + if (name && (!printer->name)) { + printer_free(printer); + printer = NULL; + } + if (printername) { + len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; + if (strncmpW(printername, XcvMonitorW, len) == 0) { + /* OpenPrinter(",XcvMonitor ", ...) detected */ + TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load(&printername[len], NULL); + if (printer->pm == NULL) { + printer_free(printer); + SetLastError(ERROR_UNKNOWN_PORT); + printer = NULL; + goto end; + } + } + else + { + len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; + if (strncmpW( printername, XcvPortW, len) == 0) { + /* OpenPrinter(",XcvPort ", ...) detected */ + TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load_by_port(&printername[len]); + if (printer->pm == NULL) { + printer_free(printer); + SetLastError(ERROR_UNKNOWN_PORT); + printer = NULL; + goto end; + } + } + } + + if (printer->pm) { + if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { + printer->pm->monitor->pfnXcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + } + if (printer->hXcv == NULL) { + printer_free(printer); + SetLastError(ERROR_INVALID_PARAMETER); + printer = NULL; + goto end; + } + } + else + { + /* Does the Printer exist? */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, printersW, &hkeyPrinters) != ERROR_SUCCESS) { + ERR("Can't create Printers key\n"); + printer_free(printer); + SetLastError(ERROR_INVALID_PRINTER_NAME); + printer = NULL; + goto end; + } + if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { + WARN("Printer not found in Registry: %s\n", debugstr_w(printername)); + RegCloseKey(hkeyPrinters); + printer_free(printer); + SetLastError(ERROR_INVALID_PRINTER_NAME); + printer = NULL; + goto end; + } + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + } + } + else + { + TRACE("using the local printserver\n"); + } + +end: + + TRACE("==> %p\n", printer); + return (HANDLE)printer; +} + + /****************************************************************************** * myAddPrinterDriverEx [internal] * @@ -1213,6 +1449,34 @@ return myAddPrinterDriverEx(level, pDriverInfo, dwFileCopyFlags, TRUE); } + +/****************************************************************************** + * fpClosePrinter [exported through PRINTPROVIDOR] + * + * Close a printer handle and free associated resources + * + * PARAMS + * hPrinter [I] Printerhandle to close + * + * RESULTS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpClosePrinter(HANDLE hPrinter) +{ + printer_t *printer = (printer_t *) hPrinter; + + TRACE("(%p)\n", hPrinter); + + if (printer) { + printer_free(printer); + return TRUE; + } + return FALSE; +} + + /****************************************************************** * fpDeleteMonitor [exported through PRINTPROVIDOR] * @@ -1425,13 +1689,115 @@ return (res); } +/****************************************************************************** + * fpOpenPrinter [exported through PRINTPROVIDOR] + * + * Open a Printer / Printserver or a Printer-Object + * + * PARAMS + * lpPrinterName [I] Name of Printserver, Printer, or Printer-Object + * pPrinter [O] The resulting Handle is stored here + * pDefaults [I] PTR to Default Printer Settings or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * lpPrinterName is one of: + *| Printserver (NT only): "Servername" or NULL for the local Printserver + *| Printer: "PrinterName" + *| Printer-Object: "PrinterName,Job xxx" + *| XcvMonitor: "Servername,XcvMonitor MonitorName" + *| XcvPort: "Servername,XcvPort PortName" + * + * + */ +static BOOL WINAPI fpOpenPrinter(LPWSTR lpPrinterName, HANDLE *pPrinter, + LPPRINTER_DEFAULTSW pDefaults) +{ + + TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), pPrinter, pDefaults); + + *pPrinter = printer_alloc_handle(lpPrinterName, pDefaults); + + return (*pPrinter != 0); +} + +/****************************************************************************** + * fpXcvData [exported through PRINTPROVIDOR] + * + * Execute commands in the Printmonitor DLL + * + * PARAMS + * hXcv [i] Handle from fpOpenPrinter (with XcvMonitor or XcvPort) + * pszDataName [i] Name of the command to execute + * pInputData [i] Buffer for extra Input Data (needed only for some commands) + * cbInputData [i] Size in Bytes of Buffer at pInputData + * pOutputData [o] Buffer to receive additional Data (needed only for some commands) + * cbOutputData [i] Size in Bytes of Buffer at pOutputData + * pcbOutputNeeded [o] PTR to receive the minimal Size in Bytes of the Buffer at pOutputData + * pdwStatus [o] PTR to receive the win32 error code from the Printmonitor DLL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Returning "TRUE" does mean, that the Printmonitor DLL was called successful. + * The execution of the command can still fail (check pdwStatus for ERROR_SUCCESS). + * + * Minimal List of commands, that a Printmonitor DLL should support: + * + *| "MonitorUI" : Return the Name of the Userinterface-DLL as WSTR in pOutputData + *| "AddPort" : Add a Port + *| "DeletePort": Delete a Port + * + * Many Printmonitors support additional commands. Examples for localspl.dll: + * "GetDefaultCommConfig", "SetDefaultCommConfig", + * "GetTransmissionRetryTimeout", "ConfigureLPTPortCommandOK" + * + */ +static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, + DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, + PDWORD pcbOutputNeeded, PDWORD pdwStatus) +{ + printer_t *printer = (printer_t * ) hXcv; + + TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName), + pInputData, cbInputData, pOutputData, + cbOutputData, pcbOutputNeeded, pdwStatus); + + if (!printer || (!printer->hXcv)) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!pcbOutputNeeded) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pszDataName || !pdwStatus || (!pOutputData && (cbOutputData > 0))) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + *pcbOutputNeeded = 0; + + *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + return TRUE; +} + /***************************************************** * setup_provider [internal] */ void setup_provider(void) { static const PRINTPROVIDOR backend = { - NULL, /* fpOpenPrinter */ + fpOpenPrinter, NULL, /* fpSetJob */ NULL, /* fpGetJob */ NULL, /* fpEnumJobs */ @@ -1462,7 +1828,7 @@ NULL, /* fpGetPrinterData */ NULL, /* fpSetPrinterData */ NULL, /* fpWaitForPrinterChange */ - NULL, /* fpClosePrinter */ + fpClosePrinter, NULL, /* fpAddForm */ NULL, /* fpDeleteForm */ NULL, /* fpGetForm */ @@ -1507,7 +1873,7 @@ NULL, /* fpAddPerMachineConnection */ NULL, /* fpDeletePerMachineConnection */ NULL, /* fpEnumPerMachineConnections */ - NULL, /* fpXcvData */ + fpXcvData, fpAddPrinterDriverEx, NULL, /* fpSplReadPrinter */ NULL, /* fpDriverUnloadComplete */ Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -338,6 +338,110 @@ } /*************************************************************************** + * MCIQTZ_mciGetDevCaps [internal] + */ +static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_STATUS_ITEM)) { + WARN("No capability item specified\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + switch (lpParms->dwItem) { + case MCI_GETDEVCAPS_CAN_RECORD: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + TRACE("MCI_GETDEVCAPS_CAN_RECORD = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_HAS_AUDIO: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_HAS_AUDIO = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_HAS_VIDEO: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_HAS_VIDEO = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_DEVICE_TYPE: + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_DIGITAL_VIDEO, MCI_DEVTYPE_DIGITAL_VIDEO); + TRACE("MCI_GETDEVCAPS_DEVICE_TYPE = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_USES_FILES: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_USES_FILES = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_COMPOUND_DEVICE: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_COMPOUND_DEVICE = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_CAN_EJECT: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + TRACE("MCI_GETDEVCAPS_EJECT = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_CAN_PLAY: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_CAN_PLAY = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_CAN_SAVE: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + TRACE("MCI_GETDEVCAPS_CAN_SAVE = %08x\n", lpParms->dwReturn); + break; + default: + ERR("Unknown capability %08x\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + return MCI_RESOURCE_RETURNED; +} + +/*************************************************************************** + * MCIQTZ_mciSet [internal] + */ +static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_SET_TIME_FORMAT) { + switch (lpParms->dwTimeFormat) { + case MCI_FORMAT_MILLISECONDS: + TRACE("MCI_SET_TIME_FORMAT = MCI_FORMAT_MILLISECONDS\n"); + wma->time_format = MCI_FORMAT_MILLISECONDS; + break; + case MCI_FORMAT_FRAMES: + TRACE("MCI_SET_TIME_FORMAT = MCI_FORMAT_FRAMES\n"); + wma->time_format = MCI_FORMAT_FRAMES; + break; + default: + WARN("Bad time format %u\n", lpParms->dwTimeFormat); + return MCIERR_BAD_TIME_FORMAT; + } + } + + if (dwFlags & ~MCI_SET_TIME_FORMAT) + FIXME("Flags not supported yet %08lX\n", dwFlags & ~MCI_SET_TIME_FORMAT); + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciStatus [internal] */ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) @@ -411,6 +515,90 @@ if (dwFlags & MCI_NOTIFY) mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + + return 0; +} + +/*************************************************************************** + * MCIQTZ_mciWhere [internal] + */ +static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + IVideoWindow* pVideoWindow; + HRESULT hr; + HWND hWnd; + RECT rc; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + /* Find if there is a video stream and get the display window */ + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); + if (FAILED(hr)) { + ERR("Cannot get IVideoWindow interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IVideoWindow_get_Owner(pVideoWindow, (OAHWND*)&hWnd); + IVideoWindow_Release(pVideoWindow); + if (FAILED(hr)) { + TRACE("No video stream, returning no window error\n"); + return MCIERR_NO_WINDOW; + } + + if (dwFlags & MCI_DGV_WHERE_SOURCE) { + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_SOURCE_MAX not supported yet\n"); + else + FIXME("MCI_DGV_WHERE_SOURCE not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + if (dwFlags & MCI_DGV_WHERE_DESTINATION) { + if (dwFlags & MCI_DGV_WHERE_MAX) { + GetClientRect(hWnd, &rc); + TRACE("MCI_DGV_WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); + } else { + FIXME("MCI_DGV_WHERE_DESTINATION not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + } + if (dwFlags & MCI_DGV_WHERE_FRAME) { + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_FRAME_MAX not supported yet\n"); + else + FIXME("MCI_DGV_WHERE_FRAME not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + if (dwFlags & MCI_DGV_WHERE_VIDEO) { + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_VIDEO_MAX not supported yet\n"); + else + FIXME("MCI_DGV_WHERE_VIDEO not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + if (dwFlags & MCI_DGV_WHERE_WINDOW) { + if (dwFlags & MCI_DGV_WHERE_MAX) { + GetWindowRect(GetDesktopWindow(), &rc); + TRACE("MCI_DGV_WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&rc)); + } else { + GetWindowRect(hWnd, &rc); + TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); + } + } + + /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height + * So convert the normal RECT into a MCI RECT before returning */ + lpParms->rc.left = rc.left; + lpParms->rc.top = rc.right; + lpParms->rc.right = rc.right - rc.left; + lpParms->rc.bottom = rc.bottom - rc.top; return 0; } @@ -451,12 +639,13 @@ case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); + case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); + case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); case MCI_RECORD: - case MCI_SET: case MCI_PAUSE: case MCI_RESUME: - case MCI_GETDEVCAPS: case MCI_INFO: case MCI_PUT: case MCI_WINDOW: @@ -466,7 +655,6 @@ case MCI_REALIZE: case MCI_UNFREEZE: case MCI_UPDATE: - case MCI_WHERE: case MCI_STEP: case MCI_COPY: case MCI_CUT: Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz_… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] Sat May 9 13:24:59 2009 @@ -31,6 +31,7 @@ IGraphBuilder* pgraph; IMediaControl* pmctrl; BOOL started; + DWORD time_format; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */ Modified: trunk/reactos/dll/win32/mscoree/mscoree.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree.… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] Sat May 9 13:24:59 2009 @@ -103,8 +103,8 @@ @ stub StrongNameSignatureGeneration @ stub StrongNameSignatureGenerationEx @ stub StrongNameSignatureSize -@ stub StrongNameSignatureVerification -@ stub StrongNameSignatureVerificationEx +@ stdcall StrongNameSignatureVerification(wstr long ptr) +@ stdcall StrongNameSignatureVerificationEx(wstr long ptr) @ stub StrongNameSignatureVerificationFromImage @ stub StrongNameTokenFromAssembly @ stub StrongNameTokenFromAssemblyEx Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -324,6 +324,18 @@ return E_NOTIMPL; } +BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) +{ + FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags); + return FALSE; +} + +BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerification, BOOL* pVerified) +{ + FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); + return FALSE; +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { FIXME("(%p, %p, %p): stub\n", rclsid, riid, ppv); Modified: trunk/reactos/dll/win32/msctf/categorymgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg… ============================================================================== --- trunk/reactos/dll/win32/msctf/categorymgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/categorymgr.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -144,9 +144,37 @@ static HRESULT WINAPI CategoryMgr_UnregisterCategory ( ITfCategoryMgr *iface, REFCLSID rclsid, REFGUID rcatid, REFGUID rguid) { - CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + WCHAR fullkey[110]; + WCHAR buf[39]; + WCHAR buf2[39]; + HKEY tipkey; + CategoryMgr *This = (CategoryMgr*)iface; + + static const WCHAR ctg[] = {'C','a','t','e','g','o','r','y',0}; + static const WCHAR itm[] = {'I','t','e','m',0}; + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR fmt2[] = {'%','s','\\','%','s','\\','%','s','\\','%','s',0}; + + TRACE("(%p) %s %s %s\n",This,debugstr_guid(rclsid), debugstr_guid(rcatid), debugstr_guid(rguid)); + + StringFromGUID2(rclsid, buf, 39); + sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, KEY_READ | KEY_WRITE, + &tipkey ) != ERROR_SUCCESS) + return E_FAIL; + + StringFromGUID2(rcatid, buf, 39); + StringFromGUID2(rguid, buf2, 39); + sprintfW(fullkey,fmt2,ctg,ctg,buf,buf2); + + sprintfW(fullkey,fmt2,ctg,itm,buf2,buf); + RegDeleteTreeW(tipkey, fullkey); + sprintfW(fullkey,fmt2,ctg,itm,buf2,buf); + RegDeleteTreeW(tipkey, fullkey); + + RegCloseKey(tipkey); + return S_OK; } static HRESULT WINAPI CategoryMgr_EnumCategoriesInItem ( ITfCategoryMgr *iface, @@ -284,25 +312,77 @@ REFGUID rguid, TfGuidAtom *pguidatom ) { - CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + DWORD index; + GUID *checkguid; + DWORD id; + CategoryMgr *This = (CategoryMgr*)iface; + + TRACE("(%p) %s %p\n",This,debugstr_guid(rguid),pguidatom); + + if (!pguidatom) + return E_INVALIDARG; + + index = 0; + do { + id = enumerate_Cookie(COOKIE_MAGIC_GUIDATOM,&index); + if (id && IsEqualGUID(rguid,get_Cookie_data(id))) + { + *pguidatom = id; + return S_OK; + } + } while(id); + + checkguid = HeapAlloc(GetProcessHeap(),0,sizeof(GUID)); + *checkguid = *rguid; + id = generate_Cookie(COOKIE_MAGIC_GUIDATOM,checkguid); + + if (!id) + { + HeapFree(GetProcessHeap(),0,checkguid); + return E_FAIL; + } + + *pguidatom = id; + + return S_OK; } static HRESULT WINAPI CategoryMgr_GetGUID ( ITfCategoryMgr *iface, TfGuidAtom guidatom, GUID *pguid) { CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %i\n",This,guidatom); + + if (!pguid) + return E_INVALIDARG; + + *pguid = GUID_NULL; + + if (get_Cookie_magic(guidatom) == COOKIE_MAGIC_GUIDATOM) + *pguid = *((REFGUID)get_Cookie_data(guidatom)); + + return S_OK; } static HRESULT WINAPI CategoryMgr_IsEqualTfGuidAtom ( ITfCategoryMgr *iface, TfGuidAtom guidatom, REFGUID rguid, BOOL *pfEqual) { CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %i %s %p\n",This,guidatom,debugstr_guid(rguid),pfEqual); + + if (!pfEqual) + return E_INVALIDARG; + + *pfEqual = FALSE; + if (get_Cookie_magic(guidatom) == COOKIE_MAGIC_GUIDATOM) + { + if (IsEqualGUID(rguid,get_Cookie_data(guidatom))) + *pfEqual = TRUE; + } + + return S_OK; } Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… ============================================================================== --- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -288,18 +288,61 @@ ITfInputProcessorProfiles *iface, REFCLSID rclsid, LANGID langid, REFGUID guidProfiles) { - InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + HRESULT hr; + BOOL enabled; + TF_LANGUAGEPROFILE LanguageProfile; + InputProcessorProfiles *This = (InputProcessorProfiles*)iface; + + TRACE("(%p) %s %x %s\n",This,debugstr_guid(rclsid),langid,debugstr_guid(guidProfiles)); + + if (langid != This->currentLanguage) return E_INVALIDARG; + + if (get_active_textservice(rclsid,NULL)) + { + TRACE("Already Active\n"); + return E_FAIL; + } + + hr = ITfInputProcessorProfiles_IsEnabledLanguageProfile(iface, rclsid, + langid, guidProfiles, &enabled); + if (FAILED(hr) || !enabled) + { + TRACE("Not Enabled\n"); + return E_FAIL; + } + + LanguageProfile.clsid = *rclsid; + LanguageProfile.langid = langid; + LanguageProfile.guidProfile = *guidProfiles; + + hr = add_active_textservice(&LanguageProfile); + + return hr; } static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile( ITfInputProcessorProfiles *iface, REFCLSID rclsid, LANGID *plangid, GUID *pguidProfile) { - InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TF_LANGUAGEPROFILE profile; + InputProcessorProfiles *This = (InputProcessorProfiles*)iface; + + TRACE("(%p) %s %p %p\n",This,debugstr_guid(rclsid),plangid,pguidProfile); + + if (!rclsid || !plangid || !pguidProfile) + return E_INVALIDARG; + + if (get_active_textservice(rclsid, &profile)) + { + *plangid = profile.langid; + *pguidProfile = profile.guidProfile; + return S_OK; + } + else + { + *pguidProfile = GUID_NULL; + return S_FALSE; + } } static HRESULT WINAPI InputProcessorProfiles_GetLanguageProfileDescription( @@ -756,8 +799,7 @@ tflp->clsid = clsid; tflp->langid = This->langid; - /* FIXME */ - tflp->fActive = FALSE; + tflp->fActive = get_active_textservice(&clsid, NULL); tflp->guidProfile = profile; if (ITfCategoryMgr_FindClosestCategory(This->catmgr, &clsid, &tflp->catid, tipcats, 3) != S_OK) Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -26,6 +26,7 @@ #define COBJMACROS #include "wine/debug.h" +#include "wine/list.h" #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -50,11 +51,28 @@ LPVOID data; } CookieInternal; +typedef struct { + TF_LANGUAGEPROFILE LanguageProfile; + ITfTextInputProcessor *pITfTextInputProcessor; + ITfThreadMgr *pITfThreadMgr; + TfClientId tid; +} ActivatedTextService; + +typedef struct +{ + struct list entry; + ActivatedTextService *ats; +} AtsEntry; + static CookieInternal *cookies; static UINT id_last; static UINT array_size; +static struct list AtsList = LIST_INIT(AtsList); +static UINT activated = 0; + DWORD tlsIndex = 0; +TfClientId processId = 0; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; @@ -252,6 +270,192 @@ return cookies[index].data; } +DWORD enumerate_Cookie(DWORD magic, DWORD *index) +{ + int i; + for (i = *index; i < id_last; i++) + if (cookies[i].id != 0 && cookies[i].magic == magic) + { + *index = (i+1); + return cookies[i].id; + } + return 0x0; +} + +/***************************************************************************** + * Active Text Service Management + *****************************************************************************/ +static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) +{ + HRESULT hr; + + /* Already Active? */ + if (actsvr->pITfTextInputProcessor) + return S_OK; + + hr = CoCreateInstance (&actsvr->LanguageProfile.clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_ITfTextInputProcessor, (void**)&actsvr->pITfTextInputProcessor); + if (FAILED(hr)) return hr; + + hr = ITfTextInputProcessor_Activate(actsvr->pITfTextInputProcessor, tm, actsvr->tid); + if (FAILED(hr)) + { + ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); + actsvr->pITfTextInputProcessor = NULL; + return hr; + } + + actsvr->pITfThreadMgr = tm; + ITfThreadMgr_AddRef(tm); + return hr; +} + +static HRESULT deactivate_given_ts(ActivatedTextService *actsvr) +{ + HRESULT hr = S_OK; + + if (actsvr->pITfTextInputProcessor) + { + hr = ITfTextInputProcessor_Deactivate(actsvr->pITfTextInputProcessor); + ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); + ITfThreadMgr_Release(actsvr->pITfThreadMgr); + actsvr->pITfTextInputProcessor = NULL; + actsvr->pITfThreadMgr = NULL; + } + + return hr; +} + +static void deactivate_remove_conflicting_ts(REFCLSID catid) +{ + AtsEntry *ats, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(ats, cursor2, &AtsList, AtsEntry, entry) + { + if (IsEqualCLSID(catid,&ats->ats->LanguageProfile.catid)) + { + deactivate_given_ts(ats->ats); + list_remove(&ats->entry); + HeapFree(GetProcessHeap(),0,ats->ats); + HeapFree(GetProcessHeap(),0,ats); + /* we are guarenteeing there is only 1 */ + break; + } + } +} + +HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) +{ + ActivatedTextService *actsvr; + ITfCategoryMgr *catmgr; + AtsEntry *entry; + ITfThreadMgr *tm = (ITfThreadMgr*)TlsGetValue(tlsIndex); + ITfClientId *clientid; + + if (!tm) return E_UNEXPECTED; + + actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); + if (!actsvr) return E_OUTOFMEMORY; + + entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry)); + + if (!entry) + { + HeapFree(GetProcessHeap(),0,actsvr); + return E_OUTOFMEMORY; + } + + ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid); + ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid); + ITfClientId_Release(clientid); + + if (!actsvr->tid) + { + HeapFree(GetProcessHeap(),0,actsvr); + return E_OUTOFMEMORY; + } + + actsvr->pITfTextInputProcessor = NULL; + actsvr->LanguageProfile = *lp; + actsvr->LanguageProfile.fActive = TRUE; + + /* get TIP category */ + if (SUCCEEDED(CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr))) + { + static const GUID *list[3] = {&GUID_TFCAT_TIP_SPEECH, &GUID_TFCAT_TIP_KEYBOARD, &GUID_TFCAT_TIP_HANDWRITING}; + + ITfCategoryMgr_FindClosestCategory(catmgr, + &actsvr->LanguageProfile.clsid, &actsvr->LanguageProfile.catid, + list, 3); + + ITfCategoryMgr_Release(catmgr); + } + else + { + ERR("CategoryMgr construction failed\n"); + actsvr->LanguageProfile.catid = GUID_NULL; + } + + if (!IsEqualGUID(&actsvr->LanguageProfile.catid,&GUID_NULL)) + deactivate_remove_conflicting_ts(&actsvr->LanguageProfile.catid); + + if (activated > 0) + activate_given_ts(actsvr, tm); + + entry->ats = actsvr; + list_add_head(&AtsList, &entry->entry); + + return S_OK; +} + +BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *profile) +{ + AtsEntry *ats; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + { + if (IsEqualCLSID(rclsid,&ats->ats->LanguageProfile.clsid)) + { + if (profile) + *profile = ats->ats->LanguageProfile; + return TRUE; + } + } + return FALSE; +} + +HRESULT activate_textservices(ITfThreadMgr *tm) +{ + HRESULT hr = S_OK; + AtsEntry *ats; + + activated ++; + if (activated > 1) + return S_OK; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + { + hr = activate_given_ts(ats->ats, tm); + if (FAILED(hr)) + FIXME("Failed to activate text service\n"); + } + return hr; +} + +HRESULT deactivate_textservices(void) +{ + AtsEntry *ats; + + if (activated > 0) + activated --; + + if (activated == 0) + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + deactivate_given_ts(ats->ats); + + return S_OK; +} + /************************************************************************* * MSCTF DllMain */ Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Sat May 9 13:24:59 2009 @@ -23,8 +23,10 @@ #define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 +#define COOKIE_MAGIC_GUIDATOM 0x0030 extern DWORD tlsIndex; +extern TfClientId processId; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); @@ -37,6 +39,13 @@ extern DWORD get_Cookie_magic(DWORD id); extern LPVOID get_Cookie_data(DWORD id); extern LPVOID remove_Cookie(DWORD id); +extern DWORD enumerate_Cookie(DWORD magic, DWORD *index); + +/* activated text services functions */ +extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp); +extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp); +extern HRESULT activate_textservices(ITfThreadMgr *tm); +extern HRESULT deactivate_textservices(void); extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */ Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Sat May 9 13:24:59 2009 @@ -56,15 +56,29 @@ } interfaces; } ThreadMgrSink; +typedef struct tagPreservedKey +{ + struct list entry; + GUID guid; + TF_PRESERVEDKEY prekey; + LPWSTR description; + TfClientId tid; +} PreservedKey; + typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; + const ITfMessagePumpVtbl *MessagePumpVtbl; + const ITfClientIdVtbl *ClientIdVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ ITfDocumentMgr *focus; + LONG activationCount; + + struct list CurrentPreservedKeys; /* kept as separate lists to reduce unnecessary iterations */ struct list ActiveLanguageProfileNotifySink; @@ -85,6 +99,16 @@ return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,KeystrokeMgrVtbl)); } +static inline ThreadMgr *impl_from_ITfMessagePumpVtbl(ITfMessagePump *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,MessagePumpVtbl)); +} + +static inline ThreadMgr *impl_from_ITfClientIdVtbl(ITfClientId *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ClientIdVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -143,6 +167,14 @@ free_sink(sink); } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + } + HeapFree(GetProcessHeap(),0,This); } @@ -162,6 +194,14 @@ else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr)) { *ppvOut = &This->KeystrokeMgrVtbl; + } + else if (IsEqualIID(iid, &IID_ITfMessagePump)) + { + *ppvOut = &This->MessagePumpVtbl; + } + else if (IsEqualIID(iid, &IID_ITfClientId)) + { + *ppvOut = &This->ClientIdVtbl; } if (*ppvOut) @@ -198,23 +238,48 @@ static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid) { ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %p\n",This, ptid); + + if (!ptid) + return E_INVALIDARG; + + if (!processId) + { + GUID guid; + CoCreateGuid(&guid); + ITfClientId_GetClientId((ITfClientId*)&This->ClientIdVtbl,&guid,&processId); + } + + activate_textservices(iface); + This->activationCount++; + *ptid = processId; + return S_OK; } static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) { ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - - if (This->focus) - { - ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); - ITfDocumentMgr_Release(This->focus); - This->focus = 0; - } - - return E_NOTIMPL; + TRACE("(%p)\n",This); + + if (This->activationCount == 0) + return E_UNEXPECTED; + + This->activationCount --; + + if (This->activationCount == 0) + { + if (This->focus) + { + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); + ITfDocumentMgr_Release(This->focus); + This->focus = 0; + } + } + + deactivate_textservices(); + + return S_OK; } static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr @@ -508,8 +573,25 @@ REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + struct list *cursor; + + TRACE("(%p) %s (%x %x) %p\n",This,debugstr_guid(rguid), (pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0, pfRegistered); + + if (!rguid || !pprekey || !pfRegistered) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && pprekey->uVKey == key->prekey.uVKey && pprekey->uModifiers == key->prekey.uModifiers) + { + *pfRegistered = TRUE; + return S_OK; + } + } + + *pfRegistered = FALSE; + return S_FALSE; } static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, @@ -517,16 +599,71 @@ const WCHAR *pchDesc, ULONG cchDesc) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + struct list *cursor; + PreservedKey *newkey; + + TRACE("(%p) %x %s (%x,%x) %s\n",This,tid, debugstr_guid(rguid),(prekey)?prekey->uVKey:0,(prekey)?prekey->uModifiers:0,debugstr_wn(pchDesc,cchDesc)); + + if (!tid || ! rguid || !prekey || (cchDesc && !pchDesc)) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + PreservedKey* key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && prekey->uVKey == key->prekey.uVKey && prekey->uModifiers == key->prekey.uModifiers) + return TF_E_ALREADY_EXISTS; + } + + newkey = HeapAlloc(GetProcessHeap(),0,sizeof(PreservedKey)); + if (!newkey) + return E_OUTOFMEMORY; + + newkey->guid = *rguid; + newkey->prekey = *prekey; + newkey->tid = tid; + if (cchDesc) + { + newkey->description = HeapAlloc(GetProcessHeap(),0,cchDesc * sizeof(WCHAR)); + if (!newkey->description) + { + HeapFree(GetProcessHeap(),0,newkey); + return E_OUTOFMEMORY; + } + memcpy(newkey->description, pchDesc, cchDesc*sizeof(WCHAR)); + } + + list_add_head(&This->CurrentPreservedKeys,&newkey->entry); + + return S_OK; } static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, REFGUID rguid, const TF_PRESERVEDKEY *pprekey) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + PreservedKey* key = NULL; + struct list *cursor; + TRACE("(%p) %s (%x %x)\n",This,debugstr_guid(rguid),(pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0); + + if (!pprekey || !rguid) + return E_INVALIDARG; + + LIST_FOR_EACH(cursor, &This->CurrentPreservedKeys) + { + key = LIST_ENTRY(cursor,PreservedKey,entry); + if (IsEqualGUID(rguid,&key->guid) && pprekey->uVKey == key->prekey.uVKey && pprekey->uModifiers == key->prekey.uModifiers) + break; + key = NULL; + } + + if (!key) + return CONNECT_E_NOCONNECTION; + + list_remove(&key->entry); + HeapFree(GetProcessHeap(),0,key->description); + HeapFree(GetProcessHeap(),0,key); + + return S_OK; } static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface, @@ -576,6 +713,128 @@ }; /***************************************************** + * ITfMessagePump functions + *****************************************************/ + +static HRESULT WINAPI MessagePump_QueryInterface(ITfMessagePump *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI MessagePump_AddRef(ITfMessagePump *iface) +{ + ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI MessagePump_Release(ITfMessagePump *iface) +{ + ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI MessagePump_PeekMessageA(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + UINT wRemoveMsg, BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = PeekMessageA(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); + return S_OK; +} + +static HRESULT WINAPI MessagePump_GetMessageA(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = GetMessageA(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax); + return S_OK; +} + +static HRESULT WINAPI MessagePump_PeekMessageW(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + UINT wRemoveMsg, BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = PeekMessageW(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); + return S_OK; +} + +static HRESULT WINAPI MessagePump_GetMessageW(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = GetMessageW(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax); + return S_OK; +} + +static const ITfMessagePumpVtbl ThreadMgr_MessagePumpVtbl = +{ + MessagePump_QueryInterface, + MessagePump_AddRef, + MessagePump_Release, + + MessagePump_PeekMessageA, + MessagePump_GetMessageA, + MessagePump_PeekMessageW, + MessagePump_GetMessageW +}; + +/***************************************************** + * ITfClientId functions + *****************************************************/ + +static HRESULT WINAPI ClientId_QueryInterface(ITfClientId *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ClientId_AddRef(ITfClientId *iface) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI ClientId_Release(ITfClientId *iface) +{ + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI ClientId_GetClientId(ITfClientId *iface, + REFCLSID rclsid, TfClientId *ptid) + +{ + HRESULT hr; + ITfCategoryMgr *catmgr; + ThreadMgr *This = impl_from_ITfClientIdVtbl(iface); + + TRACE("(%p) %s\n",This,debugstr_guid(rclsid)); + + CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr); + hr = ITfCategoryMgr_RegisterGUID(catmgr,rclsid,ptid); + ITfCategoryMgr_Release(catmgr); + + return hr; +} + +static const ITfClientIdVtbl ThreadMgr_ClientIdVtbl = +{ + ClientId_QueryInterface, + ClientId_AddRef, + ClientId_Release, + + ClientId_GetClientId +}; + +/***************************************************** * ITfThreadMgrEventSink functions (internal) *****************************************************/ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) @@ -718,9 +977,13 @@ This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; + This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl; + This->ClientIdVtbl = &ThreadMgr_ClientIdVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); + + list_init(&This->CurrentPreservedKeys); list_init(&This->ActiveLanguageProfileNotifySink); list_init(&This->DisplayAttributeNotifySink);

1 0

[dchapyshev] 40849: - Sync ole32, oleacc, oleaut32 with Wine 1.1.21
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:23:08 2009 New Revision: 40849 URL: http://svn.reactos.org/svn/reactos?rev=40849&view=rev Log: - Sync ole32, oleacc, oleaut32 with Wine 1.1.21 Added: trunk/reactos/dll/win32/oleacc/oleacc_Pl.rc (with props) Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/memlockbytes.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/oleacc/oleacc.rc trunk/reactos/dll/win32/oleaut32/tmarshal.c Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Sat May 9 13:23:08 2009 @@ -1197,7 +1197,7 @@ hr = get_stgmed_for_stream(h, med); else { - FIXME("Unhandled tymed - emum tymed %x req tymed %x\n", entry->fmtetc.tymed, fmt->tymed); + FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed); hr = E_FAIL; goto end; } @@ -1214,8 +1214,108 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *med) { - FIXME("(%p, %p {%s}, %p): stub\n", iface, fmt, dump_fmtetc(fmt), med); - return E_NOTIMPL; + snapshot *This = impl_from_IDataObject(iface); + HANDLE h; + HRESULT hr; + ole_priv_data *enum_data = NULL; + ole_priv_data_entry *entry; + TYMED supported; + + TRACE("(%p, %p {%s}, %p (tymed %x)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed); + + if ( !fmt || !med ) return E_INVALIDARG; + + if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; + + if(!This->data) + hr = get_current_dataobject(&This->data); + + if(This->data) + { + hr = IDataObject_GetDataHere(This->data, fmt, med); + if(SUCCEEDED(hr)) + { + CloseClipboard(); + return hr; + } + } + + h = GetClipboardData(fmt->cfFormat); + if(!h) + { + hr = DV_E_FORMATETC; + goto end; + } + + hr = get_priv_data(&enum_data); + if(FAILED(hr)) goto end; + + entry = find_format_in_list(enum_data->entries, enum_data->count, fmt->cfFormat); + if(entry) + { + if(!td_equal(fmt->ptd, entry->fmtetc.ptd)) + { + hr = DV_E_FORMATETC; + goto end; + } + supported = entry->fmtetc.tymed; + } + else /* non-Ole format */ + supported = TYMED_HGLOBAL; + + switch(med->tymed) + { + case TYMED_HGLOBAL: + { + DWORD src_size = GlobalSize(h); + DWORD dst_size = GlobalSize(med->u.hGlobal); + hr = E_FAIL; + if(dst_size >= src_size) + { + void *src = GlobalLock(h); + void *dst = GlobalLock(med->u.hGlobal); + + memcpy(dst, src, src_size); + GlobalUnlock(med->u.hGlobal); + GlobalUnlock(h); + hr = S_OK; + } + break; + } + case TYMED_ISTREAM: + { + DWORD src_size = GlobalSize(h); + void *src = GlobalLock(h); + hr = IStream_Write(med->u.pstm, src, src_size, NULL); + GlobalUnlock(h); + break; + } + case TYMED_ISTORAGE: + { + STGMEDIUM copy; + if(!(supported & TYMED_ISTORAGE)) + { + hr = E_FAIL; + goto end; + } + hr = get_stgmed_for_storage(h, &copy); + if(SUCCEEDED(hr)) + { + hr = IStorage_CopyTo(copy.u.pstg, 0, NULL, NULL, med->u.pstg); + ReleaseStgMedium(&copy); + } + break; + } + default: + FIXME("Unhandled tymed - supported %x req tymed %x\n", supported, med->tymed); + hr = E_FAIL; + goto end; + } + +end: + HeapFree(GetProcessHeap(), 0, enum_data); + if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; + return hr; } /************************************************************************ Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Sat May 9 13:23:08 2009 @@ -490,6 +490,31 @@ LeaveCriticalSection(&csApartment); + return result; +} + +/* gets the multi-threaded apartment if it exists. The caller must + * release the reference from the apartment as soon as the apartment pointer + * is no longer required. */ +static APARTMENT *apartment_find_multi_threaded(void) +{ + APARTMENT *result = NULL; + struct list *cursor; + + EnterCriticalSection(&csApartment); + + LIST_FOR_EACH( cursor, &apts ) + { + struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); + if (apt->multi_threaded) + { + result = apt; + apartment_addref(result); + break; + } + } + + LeaveCriticalSection(&csApartment); return result; } @@ -2237,6 +2262,7 @@ LPUNKNOWN regClassObject; HRESULT hres = E_UNEXPECTED; APARTMENT *apt; + BOOL release_apt = FALSE; TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); @@ -2245,11 +2271,14 @@ *ppv = NULL; - apt = COM_CurrentApt(); - if (!apt) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; + if (!(apt = COM_CurrentApt())) + { + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + release_apt = TRUE; } if (pServerInfo) { @@ -2273,7 +2302,7 @@ * is good since we are not returning it in the "out" parameter. */ IUnknown_Release(regClassObject); - + if (release_apt) apartment_release(apt); return hres; } @@ -2284,7 +2313,10 @@ HKEY hkey; if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + { + if (release_apt) apartment_release(apt); return FTMarshalCF_Create(iid, ppv); + } hres = COM_OpenKeyForCLSID(rclsid, wszInprocServer32, KEY_READ, &hkey); if (FAILED(hres)) @@ -2308,7 +2340,10 @@ /* return if we got a class, otherwise fall through to one of the * other types */ if (SUCCEEDED(hres)) + { + if (release_apt) apartment_release(apt); return hres; + } } /* Next try in-process handler */ @@ -2339,8 +2374,12 @@ /* return if we got a class, otherwise fall through to one of the * other types */ if (SUCCEEDED(hres)) + { + if (release_apt) apartment_release(apt); return hres; - } + } + } + if (release_apt) apartment_release(apt); /* Next try out of process */ if (CLSCTX_LOCAL_SERVER & dwClsContext) @@ -2418,6 +2457,7 @@ { HRESULT hres; LPCLASSFACTORY lpclf = 0; + APARTMENT *apt; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -2433,10 +2473,14 @@ */ *ppv = 0; - if (!COM_CurrentApt()) + if (!(apt = COM_CurrentApt())) { + if (!(apt = apartment_find_multi_threaded())) + { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; + } + apartment_release(apt); } /* Modified: trunk/reactos/dll/win32/ole32/memlockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… ============================================================================== --- trunk/reactos/dll/win32/ole32/memlockbytes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/memlockbytes.c [iso-8859-1] Sat May 9 13:23:08 2009 @@ -160,7 +160,7 @@ return S_OK; } /* It is not our lockbytes implementation, so use a more generic way */ - hres = ILockBytes_Stat(plkbyt,&stbuf,0); + hres = ILockBytes_Stat(plkbyt,&stbuf,STATFLAG_NONAME); if (hres != S_OK) { ERR("Cannot ILockBytes_Stat, %x\n",hres); return hres; Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/rpc.c [iso-8859-1] Sat May 9 13:23:08 2009 @@ -1904,7 +1904,7 @@ TRACE("marshalling IClassFactory to client\n"); - hres = IStream_Stat(pStm,&ststg,0); + hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) return hres; seekto.u.LowPart = 0; Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] Sat May 9 13:23:08 2009 @@ -6310,7 +6310,7 @@ /* * read a STATSTG structure (contains the clsid) from the storage */ - hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_DEFAULT); + hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_NONAME); if(SUCCEEDED(hRes)) *pclsid=pstatstg.clsid; Modified: trunk/reactos/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rc… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] Sat May 9 13:23:08 2009 @@ -25,3 +25,4 @@ #include "oleacc_Fr.rc" #include "oleacc_Ko.rc" #include "oleacc_Nl.rc" +#include "oleacc_Pl.rc" Added: trunk/reactos/dll/win32/oleacc/oleacc_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_Pl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_Pl.rc (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_Pl.rc [iso-8859-1] Sat May 9 13:23:08 2009 @@ -1,0 +1,90 @@ +/* + * Polish resources for oleacc + * + * Copyright 2009 £ukasz Wojni³owicz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "pasek tytu³u" + ROLE_SYSTEM_MENUBAR "pasek menu" + ROLE_SYSTEM_SCROLLBAR "pasek przewijania" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "dwiêk" + ROLE_SYSTEM_CURSOR "kursor" + ROLE_SYSTEM_CARET "daszek" + ROLE_SYSTEM_ALERT "ostrze¿enie" + ROLE_SYSTEM_WINDOW "okno" + ROLE_SYSTEM_CLIENT "klient" + ROLE_SYSTEM_MENUPOPUP "menu rozwijane" + ROLE_SYSTEM_MENUITEM "element menu" + ROLE_SYSTEM_TOOLTIP "podpowied" + ROLE_SYSTEM_APPLICATION "aplikacja" + ROLE_SYSTEM_DOCUMENT "dokument" + ROLE_SYSTEM_PANE "pane" + ROLE_SYSTEM_CHART "wykres" + ROLE_SYSTEM_DIALOG "dialog" + ROLE_SYSTEM_BORDER "obramowanie" + ROLE_SYSTEM_GROUPING "grupowanie" + ROLE_SYSTEM_SEPARATOR "separator" + ROLE_SYSTEM_TOOLBAR "pasek narzêdzi" + ROLE_SYSTEM_STATUSBAR "pasek stanu" + ROLE_SYSTEM_TABLE "tabela" + ROLE_SYSTEM_COLUMNHEADER "nag³ówek kolumny" + ROLE_SYSTEM_ROWHEADER "nag³ówek wiersza" + ROLE_SYSTEM_COLUMN "kolumna" + ROLE_SYSTEM_ROW "wiersz" + ROLE_SYSTEM_CELL "komórka" + ROLE_SYSTEM_LINK "link" + ROLE_SYSTEM_HELPBALLOON "dymek pomocy" + ROLE_SYSTEM_CHARACTER "znak" + ROLE_SYSTEM_LIST "lista" + ROLE_SYSTEM_LISTITEM "element listy" + ROLE_SYSTEM_OUTLINE "zarys" + ROLE_SYSTEM_OUTLINEITEM "element zarysu" + ROLE_SYSTEM_PAGETAB "page tab" + ROLE_SYSTEM_PROPERTYPAGE "strona w³aciwoci" + ROLE_SYSTEM_INDICATOR "wskanik" + ROLE_SYSTEM_GRAPHIC "grafika" + ROLE_SYSTEM_STATICTEXT "tekst statyczny" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "przycisk" + ROLE_SYSTEM_CHECKBUTTON "przycisk zaznaczany" + ROLE_SYSTEM_RADIOBUTTON "przycisk opcji" + ROLE_SYSTEM_COMBOBOX "pole kombi" + ROLE_SYSTEM_DROPLIST "lista rozwijana" + ROLE_SYSTEM_PROGRESSBAR "pasek postêpu" + ROLE_SYSTEM_DIAL "dial" + ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_SLIDER "suwak" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animacja" + ROLE_SYSTEM_EQUATION "równanie" + ROLE_SYSTEM_BUTTONDROPDOWN "przycisk rozwijany" + ROLE_SYSTEM_BUTTONMENU "przycisk menu" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "siatka przycisków rozwijanych" + ROLE_SYSTEM_WHITESPACE "bia³a spacja" + ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_CLOCK "zegar" + ROLE_SYSTEM_SPLITBUTTON "przycisk rozdzielania" + ROLE_SYSTEM_IPADDRESS "adres IP" + ROLE_SYSTEM_OUTLINEBUTTON "przycisk zarysu" +} Propchange: trunk/reactos/dll/win32/oleacc/oleacc_Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Sat May 9 13:23:08 2009 @@ -213,7 +213,7 @@ goto fail; } - hres = IStream_Stat(pStm,&ststg,0); + hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) { ERR("Stream stat failed\n"); goto fail;

1 0

[dchapyshev] 40848: - Sync xinput1_3, pdh with Wine 1.1.21
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 13:22:03 2009 New Revision: 40848 URL: http://svn.reactos.org/svn/reactos?rev=40848&view=rev Log: - Sync xinput1_3, pdh with Wine 1.1.21 Modified: trunk/reactos/dll/win32/pdh/pdh.spec trunk/reactos/dll/win32/pdh/pdh_main.c trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec Modified: trunk/reactos/dll/win32/pdh/pdh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Sat May 9 13:22:03 2009 @@ -79,8 +79,8 @@ @ stdcall PdhLookupPerfIndexByNameW(wstr wstr ptr) @ stdcall PdhLookupPerfNameByIndexA(str long ptr ptr) @ stdcall PdhLookupPerfNameByIndexW(wstr long ptr ptr) -@ stub PdhMakeCounterPathA -@ stub PdhMakeCounterPathW +@ stdcall PdhMakeCounterPathA(ptr ptr ptr long) +@ stdcall PdhMakeCounterPathW(ptr ptr ptr long) @ stub PdhOpenLogA @ stub PdhOpenLogW @ stdcall PdhOpenQuery(wstr long ptr) PdhOpenQueryW Modified: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Sat May 9 13:22:03 2009 @@ -1061,6 +1061,110 @@ } /*********************************************************************** + * PdhMakeCounterPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buffer, + LPDWORD buflen, DWORD flags ) +{ + PDH_STATUS ret = PDH_MEMORY_ALLOCATION_FAILURE; + PDH_COUNTER_PATH_ELEMENTS_W eW; + WCHAR *bufferW; + DWORD buflenW; + + TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + + if (!e || !buflen) return PDH_INVALID_ARGUMENT; + + memset( &eW, 0, sizeof(eW) ); + if (e->szMachineName && !(eW.szMachineName = pdh_strdup_aw( e->szMachineName ))) goto done; + if (e->szObjectName && !(eW.szObjectName = pdh_strdup_aw( e->szObjectName ))) goto done; + if (e->szInstanceName && !(eW.szInstanceName = pdh_strdup_aw( e->szInstanceName ))) goto done; + if (e->szParentInstance && !(eW.szParentInstance = pdh_strdup_aw( e->szParentInstance ))) goto done; + if (e->szCounterName && !(eW.szCounterName = pdh_strdup_aw( e->szCounterName ))) goto done; + eW.dwInstanceIndex = e->dwInstanceIndex; + + buflenW = 0; + ret = PdhMakeCounterPathW( &eW, NULL, &buflenW, flags ); + if (ret == PDH_MORE_DATA) + { + if ((bufferW = heap_alloc( buflenW * sizeof(WCHAR) ))) + { + if (!(ret = PdhMakeCounterPathW( &eW, bufferW, &buflenW, flags ))) + { + int len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (*buflen >= len) WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, *buflen, NULL, NULL); + else ret = PDH_MORE_DATA; + *buflen = len; + } + heap_free( bufferW ); + } + } + +done: + heap_free( eW.szMachineName ); + heap_free( eW.szObjectName ); + heap_free( eW.szInstanceName ); + heap_free( eW.szParentInstance ); + heap_free( eW.szCounterName ); + return ret; +} + +/*********************************************************************** + * PdhMakeCounterPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR buffer, + LPDWORD buflen, DWORD flags ) +{ + static const WCHAR bslash[] = {'\\',0}; + static const WCHAR fslash[] = {'/',0}; + static const WCHAR lparen[] = {'(',0}; + static const WCHAR rparen[] = {')',0}; + static const WCHAR fmt[] = {'#','%','u',0}; + + WCHAR path[PDH_MAX_COUNTER_NAME], instance[12]; + PDH_STATUS ret = ERROR_SUCCESS; + DWORD len; + + TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + + if (flags) FIXME("unimplemented flags 0x%08x\n", flags); + + if (!e || !e->szCounterName || !e->szObjectName || !buflen) + return PDH_INVALID_ARGUMENT; + + path[0] = 0; + if (e->szMachineName) + { + strcatW(path, bslash); + strcatW(path, bslash); + strcatW(path, e->szMachineName); + } + strcatW(path, bslash); + strcatW(path, e->szObjectName); + if (e->szInstanceName) + { + strcatW(path, lparen); + if (e->szParentInstance) + { + strcatW(path, e->szParentInstance); + strcatW(path, fslash); + } + strcatW(path, e->szInstanceName); + sprintfW(instance, fmt, e->dwInstanceIndex); + strcatW(path, instance); + strcatW(path, rparen); + } + strcatW(path, bslash); + strcatW(path, e->szCounterName); + + len = strlenW(path) + 1; + if (*buflen >= len) strcpyW(buffer, path); + else ret = PDH_MORE_DATA; + *buflen = len; + return ret; +} + +/*********************************************************************** * PdhEnumObjectItemsA (PDH.@) */ PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPCSTR szObjectName, Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec [iso-8859-1] Sat May 9 13:22:03 2009 @@ -1,7 +1,8 @@ -@ stdcall XInputEnable(long) -@ stdcall XInputSetState(long ptr) -@ stdcall XInputGetState(long ptr) -@ stdcall XInputGetKeystroke(long long ptr) -@ stdcall XInputGetCapabilities(long long ptr) -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) -@ stdcall XInputGetBatteryInformation(long ptr ptr) +1 stdcall DllMain(long long ptr) +2 stdcall XInputGetState(long ptr) +3 stdcall XInputSetState(long ptr) +4 stdcall XInputGetCapabilities(long long ptr) +5 stdcall XInputEnable(long) +6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +7 stdcall XInputGetBatteryInformation(long ptr ptr) +8 stdcall XInputGetKeystroke(long long ptr)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
51
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 May 2009