From f4ec38eedf40f54e0fb13af2bb495687634287e4 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Fri, 27 Jun 2014 18:08:00 +0000 Subject: [PATCH 01/75] [shlwapi] fix buffer overflow svn path=/trunk/; revision=63649 --- reactos/dll/win32/shlwapi/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c index c0589ac9780..40a2a853d95 100644 --- a/reactos/dll/win32/shlwapi/path.c +++ b/reactos/dll/win32/shlwapi/path.c @@ -137,20 +137,21 @@ LPSTR WINAPI PathCombineA(LPSTR lpszDest, LPCSTR lpszDir, LPCSTR lpszFile) if (!lpszDest) return NULL; if (!lpszDir && !lpszFile) - { - lpszDest[0] = 0; - return NULL; - } + goto fail; if (lpszDir) - MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH); + if (!MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH)) + goto fail; + if (lpszFile) - MultiByteToWideChar(CP_ACP,0,lpszFile,-1,szFile,MAX_PATH); + if (!MultiByteToWideChar(CP_ACP,0,lpszFile,-1,szFile,MAX_PATH)) + goto fail; if (PathCombineW(szDest, lpszDir ? szDir : NULL, lpszFile ? szFile : NULL)) if (WideCharToMultiByte(CP_ACP,0,szDest,-1,lpszDest,MAX_PATH,0,0)) return lpszDest; +fail: lpszDest[0] = 0; return NULL; } From b4ccb189680fa75e13446b6e47cf0b251c65f121 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 09:52:56 +0000 Subject: [PATCH 02/75] [DEVMGR] * Plug a leak. CID 1206903. CORE-7975 svn path=/trunk/; revision=63651 --- reactos/dll/win32/devmgr/advprop.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reactos/dll/win32/devmgr/advprop.c b/reactos/dll/win32/devmgr/advprop.c index 821cbb9542a..38a5fc4d832 100644 --- a/reactos/dll/win32/devmgr/advprop.c +++ b/reactos/dll/win32/devmgr/advprop.c @@ -448,6 +448,7 @@ UpdateDriver( if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) { DPRINT("LookupPrivilegeValue failed\n"); + CloseHandle(hToken); return; } @@ -458,6 +459,7 @@ UpdateDriver( if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) { DPRINT("AdjustTokenPrivileges failed\n"); + CloseHandle(hToken); return; } @@ -465,6 +467,7 @@ UpdateDriver( if (!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { DPRINT("ExitWindowsEx failed\n"); + CloseHandle(hToken); } } From efbd5b7a32979e15a250512d061c1b25da04190d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 09:57:09 +0000 Subject: [PATCH 03/75] [SHELL32] * Plug a leak. CID 1206904. CORE-7975 svn path=/trunk/; revision=63652 --- reactos/dll/win32/shell32/folders/fonts.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reactos/dll/win32/shell32/folders/fonts.cpp b/reactos/dll/win32/shell32/folders/fonts.cpp index c8ea36816cd..43e5f2d70da 100644 --- a/reactos/dll/win32/shell32/folders/fonts.cpp +++ b/reactos/dll/win32/shell32/folders/fonts.cpp @@ -609,7 +609,10 @@ HRESULT WINAPI CFontsFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHEL { psd->str.pOleStr = (LPWSTR)CoTaskMemAlloc(wcslen(buffer) + 1); if (!psd->str.pOleStr) + { + CloseHandle(hFile); return E_OUTOFMEMORY; + } wcscpy(psd->str.pOleStr, buffer); psd->str.uType = STRRET_WSTR; CloseHandle(hFile); From 7b04835c8be4509c1a3aea835d20fa73b95cd56c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 09:59:58 +0000 Subject: [PATCH 04/75] [CMD] * Plug a leak. CID 1102398. CORE-7975 svn path=/trunk/; revision=63653 --- reactos/base/shell/cmd/cmd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index 40cddc364a9..7e5b784665f 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -1838,6 +1838,7 @@ int _tmain(int argc, const TCHAR *argv[]) if (!GetConsoleScreenBufferInfo(hConsole, &Info)) { ConErrFormatMessage(GetLastError()); + CloseHandle(hConsole); return(1); } wDefColor = Info.wAttributes; From 8a6f50e4962ca08128944cb902da8785a8196621 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 13:15:05 +0000 Subject: [PATCH 05/75] [NTOS:CM] * Fix uninitialized pointer read. CID 1223184. CORE-7975 svn path=/trunk/; revision=63654 --- reactos/ntoskrnl/config/cmapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reactos/ntoskrnl/config/cmapi.c b/reactos/ntoskrnl/config/cmapi.c index a75f0286e18..467afd5466f 100644 --- a/reactos/ntoskrnl/config/cmapi.c +++ b/reactos/ntoskrnl/config/cmapi.c @@ -2173,7 +2173,8 @@ CmpDeepCopyKeyInternal(IN PHHIVE SourceHive, OUT PHCELL_INDEX DestKeyCell OPTIONAL) { NTSTATUS Status; - PCM_KEY_NODE SrcNode, DestNode; + PCM_KEY_NODE SrcNode; + PCM_KEY_NODE DestNode = NULL; HCELL_INDEX NewKeyCell, SubKey, NewSubKey; ULONG Index, SubKeyCount; PAGED_CODE(); From 06c5c37b0acf1e4c0e8a8c9fff6b7517bc0722b6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 13:19:39 +0000 Subject: [PATCH 06/75] [NTVDM] * Fix uninitialized scalar variable. CID 1223183. CORE-7975 svn path=/trunk/; revision=63655 --- reactos/subsystems/ntvdm/dos/dem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/subsystems/ntvdm/dos/dem.c b/reactos/subsystems/ntvdm/dos/dem.c index a0b1a5baac6..6f060c46412 100644 --- a/reactos/subsystems/ntvdm/dos/dem.c +++ b/reactos/subsystems/ntvdm/dos/dem.c @@ -47,7 +47,7 @@ static VOID WINAPI DosSystemBop(LPWORD Stack) { case 0x11: // Load the DOS kernel { - BOOLEAN Success; + BOOLEAN Success = FALSE; HANDLE hDosKernel; ULONG ulDosKernelSize = 0; From 62e20c711489e33c56c2d7469e65137c04c2a76e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 13:40:52 +0000 Subject: [PATCH 07/75] [USER32] * Fix uninitialized cases. CID 1223182. Jim please review. CORE-7975 svn path=/trunk/; revision=63656 --- reactos/win32ss/user/user32/windows/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c index 37f241c59ef..6ec7c85bd82 100644 --- a/reactos/win32ss/user/user32/windows/menu.c +++ b/reactos/win32ss/user/user32/windows/menu.c @@ -4046,7 +4046,7 @@ static INT FASTCALL MenuTrackMenu(HMENU hmenu, UINT wFlags, INT x, INT y, */ static BOOL FASTCALL MenuInitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) { - ROSMENUINFO MenuInfo; + ROSMENUINFO MenuInfo = {0}; TRACE("hwnd=%p hmenu=%p\n", hWnd, hMenu); From 35e137f5c91c27b2f0ce254dce16d112ea1d8741 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 14:03:22 +0000 Subject: [PATCH 08/75] [SHLWAPI] * Export some APIs by ordinals without names. CORE-8174 CORE-8264 svn path=/trunk/; revision=63657 --- reactos/dll/win32/shlwapi/shlwapi.spec | 80 +++++++++++++------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/reactos/dll/win32/shlwapi/shlwapi.spec b/reactos/dll/win32/shlwapi/shlwapi.spec index 8d1ea6ddb74..7eca6ec1a16 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.spec +++ b/reactos/dll/win32/shlwapi/shlwapi.spec @@ -1,5 +1,5 @@ -1 stdcall -ordinal ParseURLA(str ptr) -2 stdcall -ordinal ParseURLW(wstr ptr) +1 stdcall -noname ParseURLA(str ptr) +2 stdcall -noname ParseURLW(wstr ptr) 3 stdcall -noname PathFileExistsDefExtA(str long) 4 stdcall -noname PathFileExistsDefExtW(wstr long) 5 stdcall -noname PathFindOnPathExA(str ptr long) @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -noname SHCreateMemStream(ptr long) 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr) @@ -148,10 +148,10 @@ 148 stdcall -noname VkKeyScanWrapW(long) user32.VkKeyScanW 149 stdcall -noname WinHelpWrapW(long wstr long long) user32.WinHelpW 150 stdcall -noname wvsprintfWrapW(ptr wstr ptr) user32.wvsprintfW -151 stdcall -ordinal StrCmpNCA(str ptr long) -152 stdcall -ordinal StrCmpNCW(wstr wstr long) -153 stdcall -ordinal StrCmpNICA(long long long) -154 stdcall -ordinal StrCmpNICW(wstr wstr long) +151 stdcall -noname StrCmpNCA(str ptr long) +152 stdcall -noname StrCmpNCW(wstr wstr long) +153 stdcall -noname StrCmpNICA(long long long) +154 stdcall -noname StrCmpNICW(wstr wstr long) 155 stdcall -ordinal StrCmpCA(str str) 156 stdcall -ordinal StrCmpCW(wstr wstr) 157 stdcall -ordinal StrCmpICA(str str) @@ -165,15 +165,15 @@ 165 stdcall -noname SHSetWindowBits(long long long long) 166 stdcall -noname SHIsEmptyStream(ptr) 167 stdcall -noname SHSetParentHwnd(long ptr) -168 stdcall -ordinal ConnectToConnectionPoint(ptr ptr long ptr ptr ptr) -169 stdcall -ordinal IUnknown_AtomicRelease(long) +168 stdcall -noname ConnectToConnectionPoint(ptr ptr long ptr ptr ptr) +169 stdcall -noname IUnknown_AtomicRelease(long) 170 stdcall -noname PathSkipLeadingSlashesA(str) 171 stdcall -noname SHIsSameObject(ptr ptr) -172 stdcall -ordinal IUnknown_GetWindow(ptr ptr) +172 stdcall -noname IUnknown_GetWindow(ptr ptr) 173 stdcall -noname IUnknown_SetOwner(ptr ptr) -174 stdcall -ordinal IUnknown_SetSite(ptr ptr) +174 stdcall -noname IUnknown_SetSite(ptr ptr) 175 stdcall -noname IUnknown_GetClassID(ptr ptr) -176 stdcall -ordinal IUnknown_QueryService(ptr ptr ptr ptr) +176 stdcall -noname IUnknown_QueryService(ptr ptr ptr ptr) 177 stdcall -noname SHLoadMenuPopup(ptr wstr) 178 stdcall -noname SHPropagateMessage(ptr long long long long) 179 stdcall -noname SHMenuIndexFromID(long long) @@ -181,14 +181,14 @@ 181 stdcall -noname SHEnableMenuItem(long long long) 182 stdcall -noname SHCheckMenuItem(long long long) 183 stdcall -noname SHRegisterClassA(ptr) -184 stdcall -ordinal IStream_Read(ptr ptr long) SHIStream_Read -185 stdcall -ordinal SHMessageBoxCheckA(ptr str str long long str) +184 stdcall -noname IStream_Read(ptr ptr long) SHIStream_Read +185 stdcall -noname SHMessageBoxCheckA(ptr str str long long str) 186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) 188 stdcall -noname IUnknown_TranslateAcceleratorOCS(ptr ptr long) 189 stdcall -noname IUnknown_OnFocusOCS(ptr ptr) 190 stdcall -noname IUnknown_HandleIRestrict(ptr ptr ptr ptr ptr) -191 stdcall -ordinal SHMessageBoxCheckW(ptr wstr wstr long long wstr) +191 stdcall -noname SHMessageBoxCheckW(ptr wstr wstr long long wstr) 192 stdcall -noname SHGetMenuFromID(ptr long) 193 stdcall -noname SHGetCurColorRes() 194 stdcall -noname SHWaitForSendMessageThread(ptr long) @@ -196,12 +196,12 @@ 196 stdcall -noname SHVerbExistsNA(str ptr ptr long) 197 stdcall -noname SHFillRectClr(long ptr long) 198 stdcall -noname SHSearchMapInt(ptr ptr long long) -199 stdcall -ordinal IUnknown_Set(ptr ptr) +199 stdcall -noname IUnknown_Set(ptr ptr) 200 stdcall -noname MayQSForward(ptr ptr ptr long ptr ptr) 201 stdcall -noname MayExecForward(ptr long ptr long long ptr ptr) 202 stdcall -noname IsQSForward(ptr long ptr) -203 stdcall -ordinal SHStripMneumonicA(str) -204 stdcall -ordinal SHIsChildOrSelf(long long) +203 stdcall -noname SHStripMneumonicA(str) +204 stdcall -noname SHIsChildOrSelf(long long) 205 stdcall -noname SHGetValueGoodBootA(long str str ptr ptr ptr) 206 stdcall -noname SHGetValueGoodBootW(long wstr wstr ptr ptr ptr) 207 stub -noname IContextMenu_Invoke @@ -209,20 +209,20 @@ 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) 211 stdcall -noname FDSA_DeleteItem(ptr long) -212 stdcall -ordinal IStream_Write(ptr ptr long) SHIStream_Write -213 stdcall -ordinal IStream_Reset(ptr) -214 stdcall -ordinal IStream_Size(ptr ptr) -215 stdcall -ordinal SHAnsiToUnicode(str ptr long) +212 stdcall -noname IStream_Write(ptr ptr long) SHIStream_Write +213 stdcall -noname IStream_Reset(ptr) +214 stdcall -noname IStream_Size(ptr ptr) +215 stdcall -noname SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) -217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr) +217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) -219 stdcall QISearch(long long long long) +219 stdcall -noname QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long) 223 stdcall -noname SHGlobalCounterGetValue(long) 224 stdcall -noname SHGlobalCounterIncrement(long) -225 stdcall -ordinal SHStripMneumonicW(wstr) +225 stdcall -noname SHStripMneumonicW(wstr) 226 stub -noname ZoneCheckPathA 227 stub -noname ZoneCheckPathW 228 stub -noname ZoneCheckUrlA @@ -253,7 +253,7 @@ 253 stub -noname StopWatchExA 254 stub -noname StopWatchExW 255 stub -noname EventTraceHandler -256 stdcall -ordinal IUnknown_GetSite(ptr ptr ptr) +256 stdcall -noname IUnknown_GetSite(ptr ptr ptr) 257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait @@ -273,11 +273,11 @@ 273 stub -noname SHTerminateThreadPool 274 stub -noname RegisterGlobalHotkeyW 275 stub -noname RegisterGlobalHotkeyA -276 stdcall -ordinal WhichPlatform() +276 stdcall -noname WhichPlatform() 277 stub -noname SHDialogBox 278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) -280 stdcall -ordinal SHRegGetIntW(ptr wstr long) +280 stdcall -noname SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) 283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long) @@ -342,16 +342,16 @@ 342 stdcall -noname SHInterlockedCompareExchange(ptr ptr ptr) 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) -345 stdcall -ordinal SHAnsiToAnsi(str ptr long) -346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) +345 stdcall -noname SHAnsiToAnsi(str ptr long) +346 stdcall -noname SHUnicodeToUnicode(wstr ptr long) 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW 348 stub -noname SHGetFileDescriptionW 349 stub -noname SHGetFileDescriptionA 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) -353 stdcall -ordinal SHFormatDateTimeA(ptr ptr str long) -354 stdcall -ordinal SHFormatDateTimeW(ptr ptr wstr long) +353 stdcall -noname SHFormatDateTimeA(ptr ptr str long) +354 stdcall -noname SHFormatDateTimeW(ptr ptr wstr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) 357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) @@ -374,8 +374,8 @@ 374 stub -noname SHCheckDiskForMediaA 375 stub -noname SHCheckDiskForMediaW 376 stdcall -noname MLGetUILanguage() kernel32.GetUserDefaultUILanguage -377 stdcall -ordinal MLLoadLibraryA(str long long) -378 stdcall -ordinal MLLoadLibraryW(wstr long long) +377 stdcall -noname MLLoadLibraryA(str long long) +378 stdcall -noname MLLoadLibraryW(wstr long long) 379 stub -noname Shell_GetCachedImageIndexWrapW 380 stub -noname Shell_GetCachedImageIndexWrapA 381 stub -noname AssocCopyVerbs @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 varargs -ordinal ShellMessageBoxWrapW(long long wstr wstr long) +388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) @@ -415,7 +415,7 @@ 415 stub -noname SHHtmlHelpOnDemandA 416 stdcall -noname SHWinHelpOnDemandW(long wstr long ptr long) 417 stdcall -noname SHWinHelpOnDemandA(long str long ptr long) -418 stdcall -ordinal MLFreeLibrary(long) +418 stdcall -noname MLFreeLibrary(long) 419 stdcall -noname SHFlushSFCacheWrap() 420 stub SHLWAPI_420 # CMemStream::Commit 421 stub -noname SHLoadPersistedDataObject @@ -429,12 +429,12 @@ 429 stdcall -noname MLIsMLHInstance(long) 430 stdcall -noname MLSetMLHInstance(long long) 431 stdcall -noname MLClearMLHInstance(long) -432 stdcall -ordinal SHSendMessageBroadcastA(long long long) -433 stdcall -ordinal SHSendMessageBroadcastW(long long long) +432 stdcall -noname SHSendMessageBroadcastA(long long long) +433 stdcall -noname SHSendMessageBroadcastW(long long long) 434 stdcall -noname SendMessageTimeoutWrapW(long long long long long long ptr) user32.SendMessageTimeoutW 435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) -437 stdcall -ordinal IsOS(long) +437 stdcall -noname IsOS(long) 438 stub -noname SHLoadRegUIStringA 439 stdcall -noname SHLoadRegUIStringW(ptr wstr ptr long) 440 stdcall -noname SHGetWebFolderFilePathA(str ptr long) @@ -459,7 +459,7 @@ 459 stdcall -noname SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA 460 stdcall -noname SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW 461 stdcall -noname SHGetAppCompatFlags(long) -462 stdcall -ordinal UrlFixupW(wstr wstr long) +462 stdcall -noname UrlFixupW(wstr wstr long) 463 stdcall -noname SHExpandEnvironmentStringsForUserA(ptr str ptr long) userenv.ExpandEnvironmentStringsForUserA 464 stdcall -noname SHExpandEnvironmentStringsForUserW(ptr wstr ptr long) userenv.ExpandEnvironmentStringsForUserW 465 stub -noname PathUnExpandEnvStringsForUserA From b45ed87bd315d2bb58f8a4c5b3fd702a8d93a18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 28 Jun 2014 21:40:34 +0000 Subject: [PATCH 09/75] [SMSS][CSRSRV]: Typo fix. [CSRSRV]: Fix an assertion. svn path=/trunk/; revision=63660 --- reactos/base/system/smss/smutil.c | 2 +- reactos/subsystems/win32/csrsrv/procsup.c | 2 +- reactos/subsystems/win32/csrsrv/thredsup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/base/system/smss/smutil.c b/reactos/base/system/smss/smutil.c index cb950e65935..fde2ba725f0 100644 --- a/reactos/base/system/smss/smutil.c +++ b/reactos/base/system/smss/smutil.c @@ -536,7 +536,7 @@ SmpRestoreBootStatusData(IN BOOLEAN BootOkay, Status = RtlLockBootStatusData(&BootState); if (NT_SUCCESS(Status)) { - /* Write the bootokay and bootshudown values */ + /* Write the bootokay and bootshutdown values */ RtlGetSetBootStatusData(BootState, FALSE, RtlBsdItemBootGood, diff --git a/reactos/subsystems/win32/csrsrv/procsup.c b/reactos/subsystems/win32/csrsrv/procsup.c index af89f6e97d9..e2ae6ce0a47 100644 --- a/reactos/subsystems/win32/csrsrv/procsup.c +++ b/reactos/subsystems/win32/csrsrv/procsup.c @@ -1297,7 +1297,7 @@ CsrShutdownProcesses(IN PLUID CallerLuid, CsrProcess->ShutdownFlags = 0; } - /* Set shudown Priority */ + /* Set shutdown Priority */ CsrSetToShutdownPriority(); /* Start looping */ diff --git a/reactos/subsystems/win32/csrsrv/thredsup.c b/reactos/subsystems/win32/csrsrv/thredsup.c index b4063c6b7aa..87b471b8a17 100644 --- a/reactos/subsystems/win32/csrsrv/thredsup.c +++ b/reactos/subsystems/win32/csrsrv/thredsup.c @@ -1045,7 +1045,7 @@ CsrReferenceThread(IN PCSR_THREAD CsrThread) CsrAcquireProcessLock(); /* Sanity checks */ - ASSERT(CsrThread->Flags & CsrThreadTerminated); // CSR_THREAD_DESTROYED in ASSERT + ASSERT((CsrThread->Flags & CsrThreadTerminated) == 0); ASSERT(CsrThread->ReferenceCount != 0); /* Increment reference count */ From 71b3927caa4a403570254f535984bb662c64496e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 22:42:19 +0000 Subject: [PATCH 10/75] [SHLWAPI] * Remove some exports that do not exist in native. * Reorder some exports. * Comment out some stubs. * Add some missing exports. CORE-8174 CORE-8264 svn path=/trunk/; revision=63661 --- reactos/dll/win32/shlwapi/shlwapi.spec | 865 +++++++++++++------------ 1 file changed, 437 insertions(+), 428 deletions(-) diff --git a/reactos/dll/win32/shlwapi/shlwapi.spec b/reactos/dll/win32/shlwapi/shlwapi.spec index 7eca6ec1a16..1a9e205e033 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.spec +++ b/reactos/dll/win32/shlwapi/shlwapi.spec @@ -204,7 +204,7 @@ 204 stdcall -noname SHIsChildOrSelf(long long) 205 stdcall -noname SHGetValueGoodBootA(long str str ptr ptr ptr) 206 stdcall -noname SHGetValueGoodBootW(long wstr wstr ptr ptr ptr) -207 stub -noname IContextMenu_Invoke +#207 stub -noname IContextMenu_Invoke 208 stdcall -noname FDSA_Initialize(long long ptr ptr long) 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) @@ -223,16 +223,16 @@ 223 stdcall -noname SHGlobalCounterGetValue(long) 224 stdcall -noname SHGlobalCounterIncrement(long) 225 stdcall -noname SHStripMneumonicW(wstr) -226 stub -noname ZoneCheckPathA -227 stub -noname ZoneCheckPathW -228 stub -noname ZoneCheckUrlA -229 stub -noname ZoneCheckUrlW -230 stub -noname ZoneCheckUrlExA +#226 stub -noname ZoneCheckPathA +#227 stub -noname ZoneCheckPathW +#228 stub -noname ZoneCheckUrlA +#229 stub -noname ZoneCheckUrlW +#230 stub -noname ZoneCheckUrlExA 231 stdcall -noname ZoneCheckUrlExW(wstr ptr long long long long long long) -232 stub -noname ZoneCheckUrlExCacheA -233 stub -noname ZoneCheckUrlExCacheW -234 stub -noname ZoneCheckHost -235 stub -noname ZoneCheckHostEx +#232 stub -noname ZoneCheckUrlExCacheA +#233 stub -noname ZoneCheckUrlExCacheW +#234 stub -noname ZoneCheckHost +#235 stub -noname ZoneCheckHostEx 236 stdcall -noname SHPinDllOfCLSID(ptr) 237 stdcall -noname SHRegisterClassW(ptr) 238 stdcall -noname SHUnregisterClassesA(ptr ptr long) @@ -243,38 +243,38 @@ 243 stdcall -noname StopWatchA(long str long long long) 244 stdcall -noname StopWatchW(long wstr long long long) 245 stdcall -noname StopWatch_TimerHandler(ptr ptr long ptr) -246 stub -noname StopWatch_CheckMsg +#246 stub -noname StopWatch_CheckMsg 247 stdcall -noname StopWatch_MarkFrameStart(str) -248 stub -noname StopWatch_MarkSameFrameStart +#248 stub -noname StopWatch_MarkSameFrameStart 249 stdcall -noname StopWatch_MarkJavaStop(wstr ptr long) 250 stdcall -noname GetPerfTime() -251 stub -noname StopWatch_DispatchTime +#251 stub -noname StopWatch_DispatchTime 252 stdcall -noname StopWatch_SetMsgLastLocation(long) -253 stub -noname StopWatchExA -254 stub -noname StopWatchExW -255 stub -noname EventTraceHandler +#253 stub -noname StopWatchExA +#254 stub -noname StopWatchExW +#255 stub -noname EventTraceHandler 256 stdcall -noname IUnknown_GetSite(ptr ptr ptr) 257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) -258 stub -noname SHRegisterWaitForSingleObject -259 stub -noname SHUnregisterWait +#258 stub -noname SHRegisterWaitForSingleObject +#259 stub -noname SHUnregisterWait 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) -261 stub -noname SHCreateTimerQueue -262 stub -noname SHDeleteTimerQueue +#261 stub -noname SHCreateTimerQueue +#262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) -264 stub -noname SHChangeTimerQueueTimer -265 stub -noname SHCancelTimerQueueTimer +#264 stub -noname SHChangeTimerQueueTimer +#265 stub -noname SHCancelTimerQueueTimer 266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) 267 stdcall -noname SHWeakQueryInterface(long long long long) 268 stdcall -noname SHWeakReleaseInterface(long long) 269 stdcall -noname GUIDFromStringA(str ptr) 270 stdcall -noname GUIDFromStringW(wstr ptr) 271 stdcall -noname SHGetRestriction(wstr wstr wstr) -272 stub -noname SHSetThreadPoolLimits -273 stub -noname SHTerminateThreadPool -274 stub -noname RegisterGlobalHotkeyW -275 stub -noname RegisterGlobalHotkeyA +#272 stub -noname SHSetThreadPoolLimits +#273 stub -noname SHTerminateThreadPool +#274 stub -noname RegisterGlobalHotkeyW +#275 stub -noname RegisterGlobalHotkeyA 276 stdcall -noname WhichPlatform() -277 stub -noname SHDialogBox +#277 stub -noname SHDialogBox 278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -noname SHRegGetIntW(ptr wstr long) @@ -285,16 +285,16 @@ 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 varargs -noname IUnknown_CPContainerInvokeParam(ptr ptr long ptr long) 287 stdcall -noname IUnknown_CPContainerOnChanged(ptr long) -288 stub -noname IUnknown_CPContainerInvokeIndirect +#288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) -290 stub -noname SHMirrorIcon +#290 stub -noname SHMirrorIcon 291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) 292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) -293 stub -noname SHCancelUserWorkItems +#293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr ptr wstr wstr) -296 stub -noname CreateURLFileContentsW -297 stub -noname CreateURLFileContentsA +#296 stub -noname CreateURLFileContentsW +#297 stub -noname CreateURLFileContentsA 298 stdcall -noname WritePrivateProfileStringWrapW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW 299 stdcall -noname ExtTextOutWrapW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW 300 stdcall -noname CreateFontWrapW(long long long long long long long long long long long long long wstr) gdi32.CreateFontW @@ -313,8 +313,8 @@ 313 stdcall -noname SHGetFileInfoWrapW(ptr long ptr long long) 314 stdcall -noname RegisterClassExWrapW(ptr) user32.RegisterClassExW 315 stdcall -noname GetClassInfoExWrapW(long wstr ptr) user32.GetClassInfoExW -316 stub -noname IShellFolder_GetDisplayNameOf -317 stub -noname IShellFolder_ParseDisplayName +#316 stub -noname IShellFolder_GetDisplayNameOf +#317 stub -noname IShellFolder_ParseDisplayName 318 stdcall -noname DragQueryFileWrapW(long long wstr long) 319 stdcall -noname FindWindowExWrapW(long long wstr wstr) user32.FindWindowExW 320 stdcall -noname RegisterMIMETypeForExtensionA(str str) @@ -345,15 +345,15 @@ 345 stdcall -noname SHAnsiToAnsi(str ptr long) 346 stdcall -noname SHUnicodeToUnicode(wstr ptr long) 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW -348 stub -noname SHGetFileDescriptionW -349 stub -noname SHGetFileDescriptionA +#348 stub -noname SHGetFileDescriptionW +#349 stub -noname SHGetFileDescriptionA 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) 353 stdcall -noname SHFormatDateTimeA(ptr ptr str long) 354 stdcall -noname SHFormatDateTimeW(ptr ptr wstr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) -356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) +356 stdcall AssocCreate(int128 ptr ptr) 357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) 358 stdcall -noname SHDefExtractIconWrapW(wstr long long ptr ptr long) 359 stdcall -noname OpenEventWrapW(long long wstr) kernel32.OpenEventW @@ -371,20 +371,20 @@ 371 stdcall -noname DdeInitializeWrapW(ptr ptr long long) user32.DdeInitializeW 372 stdcall -noname DdeCreateStringHandleWrapW(long ptr long) user32.DdeCreateStringHandleW 373 stdcall -noname DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW -374 stub -noname SHCheckDiskForMediaA -375 stub -noname SHCheckDiskForMediaW +#374 stub -noname SHCheckDiskForMediaA +#375 stub -noname SHCheckDiskForMediaW 376 stdcall -noname MLGetUILanguage() kernel32.GetUserDefaultUILanguage 377 stdcall -noname MLLoadLibraryA(str long long) 378 stdcall -noname MLLoadLibraryW(wstr long long) -379 stub -noname Shell_GetCachedImageIndexWrapW -380 stub -noname Shell_GetCachedImageIndexWrapA -381 stub -noname AssocCopyVerbs +#379 stub -noname Shell_GetCachedImageIndexWrapW +#380 stub -noname Shell_GetCachedImageIndexWrapA +#381 stub -noname AssocCopyVerbs 382 stdcall -noname ZoneComputePaneSize(ptr) -383 stub -noname ZoneConfigureW -384 stub -noname SHRestrictedMessageBox -385 stub -noname SHLoadRawAccelerators -386 stub -noname SHQueryRawAccelerator -387 stub -noname SHQueryRawAcceleratorMsg +#383 stub -noname ZoneConfigureW +#384 stub -noname SHRestrictedMessageBox +#385 stub -noname SHLoadRawAccelerators +#386 stub -noname SHQueryRawAccelerator +#387 stub -noname SHQueryRawAcceleratorMsg 388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) @@ -392,10 +392,10 @@ 392 stdcall -noname EndDialogWrap(ptr ptr) user32.EndDialog 393 stdcall -noname CreateDialogIndirectParamWrapW(long ptr long ptr long) user32.CreateDialogIndirectParamW 394 stdcall -noname SHChangeNotifyWrap(long long ptr ptr) -395 stub -noname MLWinHelpA -396 stub -noname MLHtmlHelpA -397 stub -noname MLWinHelpW -398 stub -noname MLHtmlHelpW +#395 stub -noname MLWinHelpA +#396 stub -noname MLHtmlHelpA +#397 stub -noname MLWinHelpW +#398 stub -noname MLHtmlHelpW 399 stdcall -noname StrCpyNXA(ptr str long) 400 stdcall -noname StrCpyNXW(ptr wstr long) 401 stdcall -noname PageSetupDlgWrapW(ptr) @@ -404,21 +404,21 @@ 404 stdcall -noname IShellFolder_EnumObjects(ptr ptr long ptr) SHIShellFolder_EnumObjects 405 stdcall -noname MLBuildResURLA(str ptr long str ptr long) 406 stdcall -noname MLBuildResURLW(wstr ptr long wstr ptr long) -407 stub -noname AssocMakeProgid -408 stub -noname AssocMakeShell -409 stub -noname AssocMakeApplicationByKeyW -410 stub -noname AssocMakeApplicationByKeyA -411 stub -noname AssocMakeFileExtsToApplicationW -412 stub -noname AssocMakeFileExtsToApplicationA +#407 stub -noname AssocMakeProgid +#408 stub -noname AssocMakeShell +#409 stub -noname AssocMakeApplicationByKeyW +#410 stub -noname AssocMakeApplicationByKeyA +#411 stub -noname AssocMakeFileExtsToApplicationW +#412 stub -noname AssocMakeFileExtsToApplicationA 413 stdcall -noname SHGetMachineInfo(long) -414 stub -noname SHHtmlHelpOnDemandW -415 stub -noname SHHtmlHelpOnDemandA +#414 stub -noname SHHtmlHelpOnDemandW +#415 stub -noname SHHtmlHelpOnDemandA 416 stdcall -noname SHWinHelpOnDemandW(long wstr long ptr long) 417 stdcall -noname SHWinHelpOnDemandA(long str long ptr long) 418 stdcall -noname MLFreeLibrary(long) 419 stdcall -noname SHFlushSFCacheWrap() -420 stub SHLWAPI_420 # CMemStream::Commit -421 stub -noname SHLoadPersistedDataObject +#420 stub SHLWAPI_420 # CMemStream::Commit ?? +#421 stub -noname SHLoadPersistedDataObject 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long) 424 stdcall -noname SHGlobalCounterDecrement(long) @@ -435,7 +435,7 @@ 435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) 437 stdcall -noname IsOS(long) -438 stub -noname SHLoadRegUIStringA +#438 stub -noname SHLoadRegUIStringA 439 stdcall -noname SHLoadRegUIStringW(ptr wstr ptr long) 440 stdcall -noname SHGetWebFolderFilePathA(str ptr long) 441 stdcall -noname SHGetWebFolderFilePathW(wstr ptr long) @@ -444,14 +444,14 @@ 444 stdcall -noname SHGetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW 445 stdcall -noname PathFileExistsAndAttributesA(str ptr) 446 stdcall -noname PathFileExistsAndAttributesW(wstr ptr) -447 stub -noname FixSlashesAndColonA +#447 stub -noname FixSlashesAndColonA 448 stdcall -noname FixSlashesAndColonW(wstr) -449 stub -noname NextPathA -450 stub -noname NextPathW -451 stub -noname CharUpperNoDBCSA -452 stub -noname CharUpperNoDBCSW -453 stub -noname CharLowerNoDBCSA -454 stub -noname CharLowerNoDBCSW +#449 stub -noname NextPathA +#450 stub -noname NextPathW +#451 stub -noname CharUpperNoDBCSA +#452 stub -noname CharUpperNoDBCSW +#453 stub -noname CharLowerNoDBCSA +#454 stub -noname CharLowerNoDBCSW 455 stdcall -noname PathIsValidCharA(long long) 456 stdcall -noname PathIsValidCharW(long long) 457 stdcall -noname GetLongPathNameWrapW(wstr ptr long) kernel32.GetLongPathNameW @@ -462,388 +462,397 @@ 462 stdcall -noname UrlFixupW(wstr wstr long) 463 stdcall -noname SHExpandEnvironmentStringsForUserA(ptr str ptr long) userenv.ExpandEnvironmentStringsForUserA 464 stdcall -noname SHExpandEnvironmentStringsForUserW(ptr wstr ptr long) userenv.ExpandEnvironmentStringsForUserW -465 stub -noname PathUnExpandEnvStringsForUserA -466 stub -noname PathUnExpandEnvStringsForUserW +#465 stub -noname PathUnExpandEnvStringsForUserA +#466 stub -noname PathUnExpandEnvStringsForUserW 467 stub -ordinal SHRunIndirectRegClientCommand -468 stub -noname RunIndirectRegCommand -469 stub -noname RunRegCommand -470 stub -noname IUnknown_ProfferServiceOld +#468 stub -noname RunIndirectRegCommand +#469 stub -noname RunRegCommand +#470 stub -noname IUnknown_ProfferServiceOld 471 stdcall -noname SHCreatePropertyBagOnRegKey(long wstr long ptr ptr) -472 stub -noname SHCreatePropertyBagOnProfileSelection -473 stub -noname SHGetIniStringUTF7W -474 stub -noname SHSetIniStringUTF7W +#472 stub -noname SHCreatePropertyBagOnProfileSelection +#473 stub -noname SHGetIniStringUTF7W +#474 stub -noname SHSetIniStringUTF7W 475 stdcall -noname GetShellSecurityDescriptor(ptr long) 476 stdcall -noname SHGetObjectCompatFlags(ptr ptr) -477 stub -noname SHCreatePropertyBagOnMemory +#477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stdcall -noname IUnknown_UIActivateIO(ptr long ptr) 480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW 481 stdcall -noname IUnknown_HasFocusIO(ptr) -482 stub -noname SHMessageBoxHelpA -483 stub -noname SHMessageBoxHelpW +#482 stub -noname SHMessageBoxHelpA +#483 stub -noname SHMessageBoxHelpW 484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long long ptr) -485 stub -noname MapWin32ErrorToSTG -486 stub -noname ModeToCreateFileFlags +#485 stub -noname MapWin32ErrorToSTG +#486 stub -noname ModeToCreateFileFlags 487 stdcall -ordinal SHLoadIndirectString(wstr ptr long ptr) -488 stub -noname SHConvertGraphicsFile +#488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW 491 stdcall -noname SHGetShellKey(long long long) -492 stub -noname PrettifyFileDescriptionW -493 stub -noname SHPropertyBag_ReadType -494 stub -noname SHPropertyBag_ReadStr -495 stub -noname SHPropertyBag_WriteStr +#492 stub -noname PrettifyFileDescriptionW +#493 stub -noname SHPropertyBag_ReadType +#494 stub -noname SHPropertyBag_ReadStr +#495 stub -noname SHPropertyBag_WriteStr 496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) -497 stub -noname SHPropertyBag_WriteLONG -498 stub -noname SHPropertyBag_ReadBOOLOld -499 stub -noname SHPropertyBag_WriteBOOL - -505 stub -noname SHPropertyBag_ReadGUID -506 stub -noname SHPropertyBag_WriteGUID -507 stub -noname SHPropertyBag_ReadDWORD -508 stub -noname SHPropertyBag_WriteDWORD +#497 stub -noname SHPropertyBag_WriteLONG +#498 stub -noname SHPropertyBag_ReadBOOLOld +#499 stub -noname SHPropertyBag_WriteBOOL +500 stdcall AssocGetPerceivedType(wstr ptr ptr ptr) +501 stdcall AssocIsDangerous(wstr) +502 stdcall AssocQueryKeyA(long long str str ptr) +503 stdcall AssocQueryKeyW(long long wstr wstr ptr) +504 stdcall AssocQueryStringA(long long str str ptr ptr) +#505 stub -noname SHPropertyBag_ReadGUID +#506 stub -noname SHPropertyBag_WriteGUID +#507 stub -noname SHPropertyBag_ReadDWORD +#508 stub -noname SHPropertyBag_WriteDWORD 509 stdcall -noname IUnknown_OnFocusChangeIS(ptr ptr long) -510 stub -noname SHLockSharedEx -511 stub -noname PathFileExistsDefExtAndAttributesW -512 stub -ordinal IStream_ReadPidl -513 stub -ordinal IStream_WritePidl +#510 stub -noname SHLockSharedEx +#511 stub -noname PathFileExistsDefExtAndAttributesW +#512 stub -ordinal IStream_ReadPidl +#513 stub -ordinal IStream_WritePidl 514 stdcall -noname IUnknown_ProfferService(ptr ptr ptr ptr) 515 stdcall -ordinal SHGetViewStatePropertyBag(ptr wstr long ptr ptr) 516 stdcall -noname SKGetValueW(long wstr wstr ptr ptr ptr) 517 stdcall -noname SKSetValueW(long wstr wstr long ptr long) 518 stdcall -noname SKDeleteValueW(long wstr wstr) 519 stdcall -noname SKAllocValueW(long wstr wstr ptr ptr ptr) -520 stub -noname SHPropertyBag_ReadBSTR -521 stub -noname SHPropertyBag_ReadPOINTL -522 stub -noname SHPropertyBag_WritePOINTL -523 stub -noname SHPropertyBag_ReadRECTL -524 stub -noname SHPropertyBag_WriteRECTL -525 stub -noname SHPropertyBag_ReadPOINTS -526 stub -noname SHPropertyBag_WritePOINTS -527 stub -noname SHPropertyBag_ReadSHORT -528 stub -noname SHPropertyBag_WriteSHORT -529 stub -noname SHPropertyBag_ReadInt -530 stub -noname SHPropertyBag_WriteInt -531 stub -noname SHPropertyBag_ReadStream -532 stub -noname SHPropertyBag_WriteStream -533 stub -noname SHGetPerScreenResName -534 stub -noname SHPropertyBag_ReadBOOL -535 stub -noname SHPropertyBag_Delete -536 stub -noname IUnknown_QueryServicePropertyBag -537 stub -noname SHBoolSystemParametersInfo +#520 stub -noname SHPropertyBag_ReadBSTR +#521 stub -noname SHPropertyBag_ReadPOINTL +#522 stub -noname SHPropertyBag_WritePOINTL +#523 stub -noname SHPropertyBag_ReadRECTL +#524 stub -noname SHPropertyBag_WriteRECTL +#525 stub -noname SHPropertyBag_ReadPOINTS +#526 stub -noname SHPropertyBag_WritePOINTS +#527 stub -noname SHPropertyBag_ReadSHORT +#528 stub -noname SHPropertyBag_WriteSHORT +#529 stub -noname SHPropertyBag_ReadInt +#530 stub -noname SHPropertyBag_WriteInt +#531 stub -noname SHPropertyBag_ReadStream +#532 stub -noname SHPropertyBag_WriteStream +#533 stub -noname SHGetPerScreenResName +#534 stub -noname SHPropertyBag_ReadBOOL +#535 stub -noname SHPropertyBag_Delete +#536 stub -noname IUnknown_QueryServicePropertyBag +#537 stub -noname SHBoolSystemParametersInfo 538 stdcall -noname IUnknown_QueryServiceForWebBrowserApp(ptr ptr ptr) -539 stub -noname IUnknown_ShowBrowserBar -540 stub -noname SHInvokeCommandOnContextMenu -541 stub -noname SHInvokeCommandsOnContextMen +#539 stub -noname IUnknown_ShowBrowserBar +#540 stub -noname SHInvokeCommandOnContextMenu +#541 stub -noname SHInvokeCommandsOnContextMen 542 stdcall -noname GetUIVersion() 543 stdcall -noname CreateColorSpaceWrapW(ptr) gdi32.CreateColorSpaceW -544 stub -noname QuerySourceCreateFromKey -545 stub -noname SHForwardContextMenuMsg -546 stub -noname IUnknown_DoContextMenuPopup - -548 stub -noname SHAreIconsEqual +#544 stub -noname QuerySourceCreateFromKey +#545 stub -noname SHForwardContextMenuMsg +#546 stub -noname IUnknown_DoContextMenuPopup +547 stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook +#548 stub -noname SHAreIconsEqual 549 stdcall -noname SHCoCreateInstanceAC(ptr ptr long ptr ptr) -550 stub -noname GetTemplateInfoFromHandle -551 stub -noname IShellFolder_CompareIDs - -@ stdcall AssocCreate(int128 ptr ptr) -@ stdcall AssocGetPerceivedType(wstr ptr ptr ptr) -@ stdcall AssocIsDangerous(wstr) -@ stdcall AssocQueryKeyA(long long str str ptr) -@ stdcall AssocQueryKeyW(long long wstr wstr ptr) -@ stdcall AssocQueryStringA(long long str str ptr ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) -@ stdcall AssocQueryStringW(long long wstr wstr ptr ptr) -@ stdcall ChrCmpIA(long long) -@ stdcall ChrCmpIW(long long) -@ stdcall ColorAdjustLuma(long long long) -@ stdcall ColorHLSToRGB(long long long) -@ stdcall ColorRGBToHLS(long ptr ptr ptr) -@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook +#550 stub -noname GetTemplateInfoFromHandle +#551 stub -noname IShellFolder_CompareIDs +#552 SHEvaluateSystemCommandTemplate +553 stdcall IsInternetESCEnabled() +#554 SHGetAllAccessSA +555 stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) +#556 SHCoExtensionAllowed +#557 SHCoCreateExtension +#558 SHCoExtensionCollectStats +#559 SHGetSignatureInfo +#560 SHWindowsPolicyGetValue +#561 AssocGetUrlAction +#562 SHGetPrivateProfileInt +#563 SHGetPrivateProfileSection +#564 SHGetPrivateProfileSectionNames +#565 SHGetPrivateProfileString +#566 SHGetPrivateProfileStruct +567 stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) +568 stdcall AssocQueryStringW(long long wstr wstr ptr ptr) +569 stdcall ChrCmpIA(long long) +570 stdcall ChrCmpIW(long long) +571 stdcall ColorAdjustLuma(long long long) +572 stdcall ColorHLSToRGB(long long long) +573 stdcall ColorRGBToHLS(long ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) -@ stdcall GetMenuPosFromID(ptr long) -@ stdcall HashData (ptr long ptr long) -@ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA -@ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW -@ stdcall IsCharSpaceA(long) -@ stdcall IsInternetESCEnabled() -@ stdcall PathAddBackslashA (str) -@ stdcall PathAddBackslashW (wstr) -@ stdcall PathAddExtensionA (str str) -@ stdcall PathAddExtensionW (wstr wstr) -@ stdcall PathAppendA (str str) -@ stdcall PathAppendW (wstr wstr) -@ stdcall PathBuildRootA (ptr long) -@ stdcall PathBuildRootW (ptr long) -@ stdcall PathCanonicalizeA (ptr str) -@ stdcall PathCanonicalizeW (ptr wstr) -@ stdcall PathCombineA (ptr str str) -@ stdcall PathCombineW (ptr wstr wstr) -@ stdcall PathCommonPrefixA(str str ptr) -@ stdcall PathCommonPrefixW(wstr wstr ptr) -@ stdcall PathCompactPathA(long str long) -@ stdcall PathCompactPathExA(ptr str long long) -@ stdcall PathCompactPathExW(ptr wstr long long) -@ stdcall PathCompactPathW(long wstr long) -@ stdcall PathCreateFromUrlA(str ptr ptr long) -@ stdcall PathCreateFromUrlW(wstr ptr ptr long) -@ stdcall PathCreateFromUrlAlloc(wstr ptr long) -@ stdcall PathFileExistsA (str) -@ stdcall PathFileExistsW (wstr) -@ stdcall PathFindExtensionA (str) -@ stdcall PathFindExtensionW (wstr) -@ stdcall PathFindFileNameA (str) -@ stdcall PathFindFileNameW (wstr) -@ stdcall PathFindNextComponentA (str) -@ stdcall PathFindNextComponentW (wstr) -@ stdcall PathFindOnPathA (str ptr) -@ stdcall PathFindOnPathW (wstr ptr) -@ stdcall PathFindSuffixArrayA(str ptr long) -@ stdcall PathFindSuffixArrayW(wstr ptr long) -@ stdcall PathGetArgsA (str) -@ stdcall PathGetArgsW (wstr) -@ stdcall PathGetCharTypeA(long) -@ stdcall PathGetCharTypeW(long) -@ stdcall PathGetDriveNumberA (str) -@ stdcall PathGetDriveNumberW (wstr) -@ stdcall PathIsContentTypeA(str str) -@ stdcall PathIsContentTypeW(wstr wstr) -@ stdcall PathIsDirectoryA(str) -@ stdcall PathIsDirectoryEmptyA(str) -@ stdcall PathIsDirectoryEmptyW(wstr) -@ stdcall PathIsDirectoryW(wstr) -@ stdcall PathIsFileSpecA(str) -@ stdcall PathIsFileSpecW(wstr) -@ stdcall PathIsLFNFileSpecA(str) -@ stdcall PathIsLFNFileSpecW(wstr) -@ stdcall PathIsNetworkPathA(str) -@ stdcall PathIsNetworkPathW(wstr) -@ stdcall PathIsPrefixA(str str) -@ stdcall PathIsPrefixW(wstr wstr) -@ stdcall PathIsRelativeA (str) -@ stdcall PathIsRelativeW (wstr) -@ stdcall PathIsRootA(str) -@ stdcall PathIsRootW(wstr) -@ stdcall PathIsSameRootA(str str) -@ stdcall PathIsSameRootW(wstr wstr) -@ stdcall PathIsSystemFolderA(str long) -@ stdcall PathIsSystemFolderW(wstr long) -@ stdcall PathIsUNCA (str) -@ stdcall PathIsUNCServerA(str) -@ stdcall PathIsUNCServerShareA(str) -@ stdcall PathIsUNCServerShareW(wstr) -@ stdcall PathIsUNCServerW(wstr) -@ stdcall PathIsUNCW(wstr) -@ stdcall PathIsURLA(str) -@ stdcall PathIsURLW(wstr) -@ stdcall PathMakePrettyA(str) -@ stdcall PathMakePrettyW(wstr) -@ stdcall PathMakeSystemFolderA(str) -@ stdcall PathMakeSystemFolderW(wstr) -@ stdcall PathMatchSpecA (str str) -@ stdcall PathMatchSpecW (wstr wstr) -@ stdcall PathParseIconLocationA (str) -@ stdcall PathParseIconLocationW (wstr) -@ stdcall PathQuoteSpacesA (str) -@ stdcall PathQuoteSpacesW (wstr) -@ stdcall PathRelativePathToA(ptr str long str long) -@ stdcall PathRelativePathToW(ptr wstr long wstr long) -@ stdcall PathRemoveArgsA(str) -@ stdcall PathRemoveArgsW(wstr) -@ stdcall PathRemoveBackslashA (str) -@ stdcall PathRemoveBackslashW (wstr) -@ stdcall PathRemoveBlanksA(str) -@ stdcall PathRemoveBlanksW(wstr) -@ stdcall PathRemoveExtensionA(str) -@ stdcall PathRemoveExtensionW(wstr) -@ stdcall PathRemoveFileSpecA (str) -@ stdcall PathRemoveFileSpecW (wstr) -@ stdcall PathRenameExtensionA(str str) -@ stdcall PathRenameExtensionW(wstr wstr) -@ stdcall PathSearchAndQualifyA(str ptr long) -@ stdcall PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) -@ stdcall PathSkipRootA(str) -@ stdcall PathSkipRootW(wstr) -@ stdcall PathStripPathA(str) -@ stdcall PathStripPathW(wstr) -@ stdcall PathStripToRootA(str) -@ stdcall PathStripToRootW(wstr) -@ stdcall PathUnExpandEnvStringsA(str ptr long) -@ stdcall PathUnExpandEnvStringsW(wstr ptr long) -@ stdcall PathUndecorateA(str) -@ stdcall PathUndecorateW(wstr) -@ stdcall PathUnmakeSystemFolderA(str) -@ stdcall PathUnmakeSystemFolderW(wstr) -@ stdcall PathUnquoteSpacesA (str) -@ stdcall PathUnquoteSpacesW (wstr) -@ stdcall SHAutoComplete(ptr long) -@ stdcall SHCopyKeyA(long str long long) -@ stdcall SHCopyKeyW(long wstr long long) -@ stdcall SHCreateShellPalette(long) -@ stdcall SHCreateStreamOnFileA(str long ptr) -@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) -@ stdcall SHCreateStreamOnFileW(wstr long ptr) -@ stdcall SHCreateStreamWrapper(ptr ptr long ptr) -@ stdcall SHCreateThreadRef(ptr ptr) -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) -@ stdcall SHDeleteKeyA(long str) -@ stdcall SHDeleteKeyW(long wstr) -@ stdcall SHDeleteOrphanKeyA(long str) -@ stdcall SHDeleteOrphanKeyW(long wstr) -@ stdcall SHDeleteValueA(long str str) -@ stdcall SHDeleteValueW(long wstr wstr) -@ stdcall SHEnumKeyExA(long long str ptr) -@ stdcall SHEnumKeyExW(long long wstr ptr) -@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) -@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) -@ stdcall SHGetInverseCMAP ( ptr long ) -@ stdcall SHGetThreadRef (ptr) -@ stdcall SHGetValueA ( long str str ptr ptr ptr ) -@ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) -@ stdcall SHIsLowMemoryMachine(long) -@ stdcall SHOpenRegStream2A(long str str long) -@ stdcall SHOpenRegStream2W(long wstr wstr long) -@ stdcall SHOpenRegStreamA(long str str long) -@ stdcall SHOpenRegStreamW(long wstr wstr long) -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) -@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) -@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) -@ stdcall SHRegCloseUSKey(ptr) -@ stdcall SHRegCreateUSKeyA(str long long ptr long) -@ stdcall SHRegCreateUSKeyW(wstr long long ptr long) -@ stdcall SHRegDeleteEmptyUSKeyA(long str long) -@ stdcall SHRegDeleteEmptyUSKeyW(long wstr long) -@ stdcall SHRegDeleteUSValueA(long str long) -@ stdcall SHRegDeleteUSValueW(long wstr long) -@ stdcall SHRegDuplicateHKey (long) -@ stdcall SHRegEnumUSKeyA(long long str ptr long) -@ stdcall SHRegEnumUSKeyW(long long wstr ptr long) -@ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long) -@ stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long) -@ stdcall SHRegGetBoolUSValueA(str str long long) -@ stdcall SHRegGetBoolUSValueW(wstr wstr long long) -@ stdcall SHRegGetPathA(long str str ptr long) -@ stdcall SHRegGetPathW(long wstr wstr ptr long) -@ stdcall SHRegGetUSValueA ( str str ptr ptr ptr long ptr long ) -@ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long ) -@ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) advapi32.RegGetValueA -@ stdcall SHRegGetValueW ( long wstr wstr long ptr ptr ptr ) advapi32.RegGetValueW -@ stdcall SHRegOpenUSKeyA ( str long long long long ) -@ stdcall SHRegOpenUSKeyW ( wstr long long long long ) -@ stdcall SHRegQueryInfoUSKeyA ( long ptr ptr ptr ptr long ) -@ stdcall SHRegQueryInfoUSKeyW ( long ptr ptr ptr ptr long ) -@ stdcall SHRegQueryUSValueA ( long str ptr ptr ptr long ptr long ) -@ stdcall SHRegQueryUSValueW ( long wstr ptr ptr ptr long ptr long ) -@ stdcall SHRegSetPathA(long str str str long) -@ stdcall SHRegSetPathW(long wstr wstr wstr long) -@ stdcall SHRegSetUSValueA ( str str long ptr long long) -@ stdcall SHRegSetUSValueW ( wstr wstr long ptr long long) -@ stdcall SHRegWriteUSValueA (long str long ptr long long) -@ stdcall SHRegWriteUSValueW (long wstr long ptr long long) -@ stdcall SHRegisterValidateTemplate(wstr long) -@ stdcall SHReleaseThreadRef() -@ stdcall SHSetThreadRef (ptr) -@ stdcall SHSetValueA (long str str long ptr long) -@ stdcall SHSetValueW (long wstr wstr long ptr long) -@ stdcall SHSkipJunction(ptr ptr) -@ stdcall SHStrDupA (str ptr) -@ stdcall SHStrDupW (wstr ptr) -@ stdcall StrCSpnA (str str) -@ stdcall StrCSpnIA (str str) -@ stdcall StrCSpnIW (wstr wstr) -@ stdcall StrCSpnW (wstr wstr) -@ stdcall StrCatBuffA (str str long) -@ stdcall StrCatBuffW (wstr wstr long) -@ stdcall StrCatW (ptr wstr) -@ stdcall StrChrA (str long) -@ stdcall StrChrIA (str long) -@ stdcall StrChrIW (wstr long) -@ stdcall StrChrNW(wstr long long) -@ stdcall StrChrW (wstr long) -@ stdcall StrCmpIW (wstr wstr) -@ stdcall StrCmpLogicalW(wstr wstr) -@ stdcall StrCmpNA (str str long) -@ stdcall StrCmpNIA (str str long) -@ stdcall StrCmpNIW (wstr wstr long) -@ stdcall StrCmpNW (wstr wstr long) -@ stdcall StrCmpW (wstr wstr) -@ stdcall StrCpyNW (ptr wstr long) -@ stdcall StrCpyW (ptr wstr) -@ stdcall StrDupA (str) -@ stdcall StrDupW (wstr) -@ stdcall StrFormatByteSize64A(int64 ptr long) -@ stdcall StrFormatByteSizeA(long ptr long) -@ stdcall StrFormatByteSizeW(int64 ptr long) -@ stdcall StrFormatKBSizeA(int64 str long) -@ stdcall StrFormatKBSizeW(int64 wstr long) -@ stdcall StrFromTimeIntervalA(ptr long long long) -@ stdcall StrFromTimeIntervalW(ptr long long long) -@ stdcall StrIsIntlEqualA(long str str long) -@ stdcall StrIsIntlEqualW(long wstr wstr long) -@ stdcall StrNCatA(str str long) -@ stdcall StrNCatW(wstr wstr long) -@ stdcall StrPBrkA(str str) -@ stdcall StrPBrkW(wstr wstr) -@ stdcall StrRChrA (str str long) -@ stdcall StrRChrIA (str str long) -@ stdcall StrRChrIW (wstr wstr long) -@ stdcall StrRChrW (wstr wstr long) -@ stdcall StrRStrIA (str str str) -@ stdcall StrRStrIW (wstr wstr wstr) -@ stdcall StrRetToBSTR(ptr ptr ptr) -@ stdcall StrRetToBufA(ptr ptr ptr long) -@ stdcall StrRetToBufW(ptr ptr ptr long) -@ stdcall StrRetToStrA(ptr ptr ptr) -@ stdcall StrRetToStrW(ptr ptr ptr) -@ stdcall StrSpnA (str str) -@ stdcall StrSpnW (wstr wstr) -@ stdcall StrStrA(str str) -@ stdcall StrStrIA(str str) -@ stdcall StrStrIW(wstr wstr) -@ stdcall StrStrNW(wstr wstr long) -@ stdcall StrStrNIW(wstr wstr long) -@ stdcall StrStrW(wstr wstr) -@ stdcall StrToInt64ExA(str long ptr) -@ stdcall StrToInt64ExW(wstr long ptr) -@ stdcall StrToIntA(str) -@ stdcall StrToIntExA(str long ptr) -@ stdcall StrToIntExW(wstr long ptr) -@ stdcall StrToIntW(wstr) -@ stdcall StrTrimA(str str) -@ stdcall StrTrimW(wstr wstr) -@ stdcall UrlApplySchemeA(str ptr ptr long) -@ stdcall UrlApplySchemeW(wstr ptr ptr long) -@ stdcall UrlCanonicalizeA(str ptr ptr long) -@ stdcall UrlCanonicalizeW(wstr ptr ptr long) -@ stdcall UrlCombineA(str str ptr ptr long) -@ stdcall UrlCombineW(wstr wstr ptr ptr long) -@ stdcall UrlCompareA(str str long) -@ stdcall UrlCompareW(wstr wstr long) -@ stdcall UrlCreateFromPathA(str ptr ptr long) -@ stdcall UrlCreateFromPathW(wstr ptr ptr long) -@ stdcall UrlEscapeA(str ptr ptr long) -@ stdcall UrlEscapeW(wstr ptr ptr long) -@ stdcall UrlGetLocationA(str) -@ stdcall UrlGetLocationW(wstr) -@ stdcall UrlGetPartA(str ptr ptr long long) -@ stdcall UrlGetPartW(wstr ptr ptr long long) -@ stdcall UrlHashA(str ptr long) -@ stdcall UrlHashW(wstr ptr long) -@ stdcall UrlIsA(str long) -@ stdcall UrlIsNoHistoryA(str) -@ stdcall UrlIsNoHistoryW(wstr) -@ stdcall UrlIsOpaqueA(str) -@ stdcall UrlIsOpaqueW(wstr) -@ stdcall UrlIsW(wstr long) -@ stdcall UrlUnescapeA(str ptr ptr long) -@ stdcall UrlUnescapeW(wstr ptr ptr long) -@ stdcall _SHGetInstanceExplorer(ptr) -@ varargs wnsprintfA(ptr long str) -@ varargs wnsprintfW(ptr long wstr) -@ stdcall wvnsprintfA(ptr long str ptr) -@ stdcall wvnsprintfW(ptr long wstr ptr) +575 stdcall GetMenuPosFromID(ptr long) +576 stdcall HashData(ptr long ptr long) +577 stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA +578 stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW +579 stdcall IsCharSpaceA(long) +580 stdcall PathAddBackslashA(str) +581 stdcall PathAddBackslashW(wstr) +582 stdcall PathAddExtensionA(str str) +583 stdcall PathAddExtensionW(wstr wstr) +584 stdcall PathAppendA(str str) +585 stdcall PathAppendW(wstr wstr) +586 stdcall PathBuildRootA(ptr long) +587 stdcall PathBuildRootW(ptr long) +588 stdcall PathCanonicalizeA(ptr str) +589 stdcall PathCanonicalizeW(ptr wstr) +590 stdcall PathCombineA(ptr str str) +591 stdcall PathCombineW(ptr wstr wstr) +592 stdcall PathCommonPrefixA(str str ptr) +593 stdcall PathCommonPrefixW(wstr wstr ptr) +594 stdcall PathCompactPathA(long str long) +595 stdcall PathCompactPathExA(ptr str long long) +596 stdcall PathCompactPathExW(ptr wstr long long) +597 stdcall PathCompactPathW(long wstr long) +598 stdcall PathCreateFromUrlA(str ptr ptr long) +599 stdcall PathCreateFromUrlW(wstr ptr ptr long) +600 stdcall PathFileExistsA(str) +601 stdcall PathFileExistsW(wstr) +602 stdcall PathFindExtensionA(str) +603 stdcall PathFindExtensionW(wstr) +604 stdcall PathFindFileNameA(str) +605 stdcall PathFindFileNameW(wstr) +606 stdcall PathFindNextComponentA(str) +607 stdcall PathFindNextComponentW(wstr) +608 stdcall PathFindOnPathA(str ptr) +609 stdcall PathFindOnPathW(wstr ptr) +610 stdcall PathFindSuffixArrayA(str ptr long) +611 stdcall PathFindSuffixArrayW(wstr ptr long) +612 stdcall PathGetArgsA(str) +613 stdcall PathGetArgsW(wstr) +614 stdcall PathGetCharTypeA(long) +615 stdcall PathGetCharTypeW(long) +616 stdcall PathGetDriveNumberA(str) +617 stdcall PathGetDriveNumberW(wstr) +618 stdcall PathIsContentTypeA(str str) +619 stdcall PathIsContentTypeW(wstr wstr) +620 stdcall PathIsDirectoryA(str) +621 stdcall PathIsDirectoryEmptyA(str) +622 stdcall PathIsDirectoryEmptyW(wstr) +623 stdcall PathIsDirectoryW(wstr) +624 stdcall PathIsFileSpecA(str) +625 stdcall PathIsFileSpecW(wstr) +626 stdcall PathIsLFNFileSpecA(str) +627 stdcall PathIsLFNFileSpecW(wstr) +628 stdcall PathIsNetworkPathA(str) +629 stdcall PathIsNetworkPathW(wstr) +630 stdcall PathIsPrefixA(str str) +631 stdcall PathIsPrefixW(wstr wstr) +632 stdcall PathIsRelativeA(str) +633 stdcall PathIsRelativeW(wstr) +634 stdcall PathIsRootA(str) +635 stdcall PathIsRootW(wstr) +636 stdcall PathIsSameRootA(str str) +637 stdcall PathIsSameRootW(wstr wstr) +638 stdcall PathIsSystemFolderA(str long) +639 stdcall PathIsSystemFolderW(wstr long) +640 stdcall PathIsUNCA(str) +641 stdcall PathIsUNCServerA(str) +642 stdcall PathIsUNCServerShareA(str) +643 stdcall PathIsUNCServerShareW(wstr) +644 stdcall PathIsUNCServerW(wstr) +645 stdcall PathIsUNCW(wstr) +646 stdcall PathIsURLA(str) +647 stdcall PathIsURLW(wstr) +648 stdcall PathMakePrettyA(str) +649 stdcall PathMakePrettyW(wstr) +650 stdcall PathMakeSystemFolderA(str) +651 stdcall PathMakeSystemFolderW(wstr) +652 stdcall PathMatchSpecA(str str) +653 stdcall PathMatchSpecW(wstr wstr) +654 stdcall PathParseIconLocationA(str) +655 stdcall PathParseIconLocationW(wstr) +656 stdcall PathQuoteSpacesA(str) +657 stdcall PathQuoteSpacesW(wstr) +658 stdcall PathRelativePathToA(ptr str long str long) +659 stdcall PathRelativePathToW(ptr wstr long wstr long) +660 stdcall PathRemoveArgsA(str) +661 stdcall PathRemoveArgsW(wstr) +662 stdcall PathRemoveBackslashA(str) +663 stdcall PathRemoveBackslashW(wstr) +664 stdcall PathRemoveBlanksA(str) +665 stdcall PathRemoveBlanksW(wstr) +666 stdcall PathRemoveExtensionA(str) +667 stdcall PathRemoveExtensionW(wstr) +668 stdcall PathRemoveFileSpecA(str) +669 stdcall PathRemoveFileSpecW(wstr) +670 stdcall PathRenameExtensionA(str str) +671 stdcall PathRenameExtensionW(wstr wstr) +672 stdcall PathSearchAndQualifyA(str ptr long) +673 stdcall PathSearchAndQualifyW(wstr ptr long) +674 stdcall PathSetDlgItemPathA(long long ptr) +675 stdcall PathSetDlgItemPathW(long long ptr) +676 stdcall PathSkipRootA(str) +677 stdcall PathSkipRootW(wstr) +678 stdcall PathStripPathA(str) +679 stdcall PathStripPathW(wstr) +680 stdcall PathStripToRootA(str) +681 stdcall PathStripToRootW(wstr) +682 stdcall PathUnExpandEnvStringsA(str ptr long) +683 stdcall PathUnExpandEnvStringsW(wstr ptr long) +684 stdcall PathUndecorateA(str) +685 stdcall PathUndecorateW(wstr) +686 stdcall PathUnmakeSystemFolderA(str) +687 stdcall PathUnmakeSystemFolderW(wstr) +688 stdcall PathUnquoteSpacesA(str) +689 stdcall PathUnquoteSpacesW(wstr) +690 stdcall SHAutoComplete(ptr long) +691 stdcall SHCopyKeyA(long str long long) +692 stdcall SHCopyKeyW(long wstr long long) +693 stdcall SHCreateShellPalette(long) +694 stdcall SHCreateStreamOnFileA(str long ptr) +695 stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) +696 stdcall SHCreateStreamOnFileW(wstr long ptr) +697 stdcall SHCreateStreamWrapper(ptr ptr long ptr) +698 stdcall SHCreateThreadRef(ptr ptr) +699 stdcall SHDeleteEmptyKeyA(long ptr) +700 stdcall SHDeleteEmptyKeyW(long ptr) +701 stdcall SHDeleteKeyA(long str) +702 stdcall SHDeleteKeyW(long wstr) +703 stdcall SHDeleteOrphanKeyA(long str) +704 stdcall SHDeleteOrphanKeyW(long wstr) +705 stdcall SHDeleteValueA(long str str) +706 stdcall SHDeleteValueW(long wstr wstr) +707 stdcall SHEnumKeyExA(long long str ptr) +708 stdcall SHEnumKeyExW(long long wstr ptr) +709 stdcall SHEnumValueA(long long str ptr ptr ptr ptr) +710 stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) +711 stdcall SHGetInverseCMAP(ptr long) +712 stdcall SHGetThreadRef(ptr) +713 stdcall SHGetValueA(long str str ptr ptr ptr) +714 stdcall SHGetValueW(long wstr wstr ptr ptr ptr) +715 stdcall SHIsLowMemoryMachine(long) +716 stdcall SHOpenRegStream2A(long str str long) +717 stdcall SHOpenRegStream2W(long wstr wstr long) +718 stdcall SHOpenRegStreamA(long str str long) +719 stdcall SHOpenRegStreamW(long wstr wstr long) +720 stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) +721 stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) +722 stdcall SHQueryValueExA(long str ptr ptr ptr ptr) +723 stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) +724 stdcall SHRegCloseUSKey(ptr) +725 stdcall SHRegCreateUSKeyA(str long long ptr long) +726 stdcall SHRegCreateUSKeyW(wstr long long ptr long) +727 stdcall SHRegDeleteEmptyUSKeyA(long str long) +728 stdcall SHRegDeleteEmptyUSKeyW(long wstr long) +729 stdcall SHRegDeleteUSValueA(long str long) +730 stdcall SHRegDeleteUSValueW(long wstr long) +731 stdcall SHRegDuplicateHKey(long) +732 stdcall SHRegEnumUSKeyA(long long str ptr long) +733 stdcall SHRegEnumUSKeyW(long long wstr ptr long) +734 stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long) +735 stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long) +736 stdcall SHRegGetBoolUSValueA(str str long long) +737 stdcall SHRegGetBoolUSValueW(wstr wstr long long) +738 stdcall SHRegGetPathA(long str str ptr long) +739 stdcall SHRegGetPathW(long wstr wstr ptr long) +740 stdcall SHRegGetUSValueA(str str ptr ptr ptr long ptr long) +741 stdcall SHRegGetUSValueW(wstr wstr ptr ptr ptr long ptr long) +742 stdcall SHRegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +743 stdcall SHRegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +744 stdcall SHRegOpenUSKeyA(str long long long long) +745 stdcall SHRegOpenUSKeyW(wstr long long long long) +746 stdcall SHRegQueryInfoUSKeyA(long ptr ptr ptr ptr long) +747 stdcall SHRegQueryInfoUSKeyW(long ptr ptr ptr ptr long) +748 stdcall SHRegQueryUSValueA(long str ptr ptr ptr long ptr long) +749 stdcall SHRegQueryUSValueW(long wstr ptr ptr ptr long ptr long) +750 stdcall SHRegSetPathA(long str str str long) +751 stdcall SHRegSetPathW(long wstr wstr wstr long) +752 stdcall SHRegSetUSValueA(str str long ptr long long) +753 stdcall SHRegSetUSValueW(wstr wstr long ptr long long) +754 stdcall SHRegWriteUSValueA(long str long ptr long long) +755 stdcall SHRegWriteUSValueW(long wstr long ptr long long) +756 stdcall SHRegisterValidateTemplate(wstr long) +757 stdcall SHReleaseThreadRef() +758 stdcall SHSetThreadRef(ptr) +759 stdcall SHSetValueA(long str str long ptr long) +760 stdcall SHSetValueW(long wstr wstr long ptr long) +761 stdcall SHSkipJunction(ptr ptr) +762 stdcall SHStrDupA(str ptr) +763 stdcall SHStrDupW(wstr ptr) +764 stdcall StrCSpnA(str str) +765 stdcall StrCSpnIA(str str) +766 stdcall StrCSpnIW(wstr wstr) +767 stdcall StrCSpnW(wstr wstr) +768 stdcall StrCatBuffA(str str long) +769 stdcall StrCatBuffW(wstr wstr long) +#770 StrCatChainW +771 stdcall StrCatW(ptr wstr) +772 stdcall StrChrA(str long) +773 stdcall StrChrIA(str long) +774 stdcall StrChrIW(wstr long) +#775 StrChrNIW +776 stdcall StrChrNW(wstr long long) +777 stdcall StrChrW(wstr long) +778 stdcall StrCmpIW(wstr wstr) +779 stdcall StrCmpLogicalW(wstr wstr) +780 stdcall StrCmpNA(str str long) +781 stdcall StrCmpNIA(str str long) +782 stdcall StrCmpNIW(wstr wstr long) +783 stdcall StrCmpNW(wstr wstr long) +784 stdcall StrCmpW(wstr wstr) +785 stdcall StrCpyNW(ptr wstr long) +786 stdcall StrCpyW(ptr wstr) +787 stdcall StrDupA(str) +788 stdcall StrDupW(wstr) +789 stdcall StrFormatByteSize64A(int64 ptr long) +790 stdcall StrFormatByteSizeA(long ptr long) +791 stdcall StrFormatByteSizeW(int64 ptr long) +792 stdcall StrFormatKBSizeA(int64 str long) +793 stdcall StrFormatKBSizeW(int64 wstr long) +794 stdcall StrFromTimeIntervalA(ptr long long long) +795 stdcall StrFromTimeIntervalW(ptr long long long) +796 stdcall StrIsIntlEqualA(long str str long) +797 stdcall StrIsIntlEqualW(long wstr wstr long) +798 stdcall StrNCatA(str str long) +799 stdcall StrNCatW(wstr wstr long) +800 stdcall StrPBrkA(str str) +801 stdcall StrPBrkW(wstr wstr) +802 stdcall StrRChrA(str str long) +803 stdcall StrRChrIA(str str long) +804 stdcall StrRChrIW(wstr wstr long) +805 stdcall StrRChrW(wstr wstr long) +806 stdcall StrRStrIA(str str str) +807 stdcall StrRStrIW(wstr wstr wstr) +808 stdcall StrRetToBSTR(ptr ptr ptr) +809 stdcall StrRetToBufA(ptr ptr ptr long) +810 stdcall StrRetToBufW(ptr ptr ptr long) +811 stdcall StrRetToStrA(ptr ptr ptr) +812 stdcall StrRetToStrW(ptr ptr ptr) +813 stdcall StrSpnA(str str) +814 stdcall StrSpnW(wstr wstr) +815 stdcall StrStrA(str str) +816 stdcall StrStrIA(str str) +817 stdcall StrStrIW(wstr wstr) +818 stdcall StrStrNIW(wstr wstr long) +819 stdcall StrStrNW(wstr wstr long) +820 stdcall StrStrW(wstr wstr) +821 stdcall StrToInt64ExA(str long ptr) +822 stdcall StrToInt64ExW(wstr long ptr) +823 stdcall StrToIntA(str) +824 stdcall StrToIntExA(str long ptr) +825 stdcall StrToIntExW(wstr long ptr) +826 stdcall StrToIntW(wstr) +827 stdcall StrTrimA(str str) +828 stdcall StrTrimW(wstr wstr) +829 stdcall UrlApplySchemeA(str ptr ptr long) +830 stdcall UrlApplySchemeW(wstr ptr ptr long) +831 stdcall UrlCanonicalizeA(str ptr ptr long) +832 stdcall UrlCanonicalizeW(wstr ptr ptr long) +833 stdcall UrlCombineA(str str ptr ptr long) +834 stdcall UrlCombineW(wstr wstr ptr ptr long) +835 stdcall UrlCompareA(str str long) +836 stdcall UrlCompareW(wstr wstr long) +837 stdcall UrlCreateFromPathA(str ptr ptr long) +838 stdcall UrlCreateFromPathW(wstr ptr ptr long) +839 stdcall UrlEscapeA(str ptr ptr long) +840 stdcall UrlEscapeW(wstr ptr ptr long) +841 stdcall UrlGetLocationA(str) +842 stdcall UrlGetLocationW(wstr) +843 stdcall UrlGetPartA(str ptr ptr long long) +844 stdcall UrlGetPartW(wstr ptr ptr long long) +845 stdcall UrlHashA(str ptr long) +846 stdcall UrlHashW(wstr ptr long) +847 stdcall UrlIsA(str long) +848 stdcall UrlIsNoHistoryA(str) +849 stdcall UrlIsNoHistoryW(wstr) +850 stdcall UrlIsOpaqueA(str) +851 stdcall UrlIsOpaqueW(wstr) +852 stdcall UrlIsW(wstr long) +853 stdcall UrlUnescapeA(str ptr ptr long) +854 stdcall UrlUnescapeW(wstr ptr ptr long) +855 varargs wnsprintfA(ptr long str) +856 varargs wnsprintfW(ptr long wstr) +857 stdcall wvnsprintfA(ptr long str ptr) +858 stdcall wvnsprintfW(ptr long wstr ptr) From 433665c0067e2e7ebf48d395f1148ec53b973b19 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Jun 2014 23:23:50 +0000 Subject: [PATCH 11/75] [URLMON] * Remove some exports that do not exist in native. * Reorder some exports. * Comment out some stubs. * Add some missing exports. CORE-8174 svn path=/trunk/; revision=63662 --- reactos/dll/win32/urlmon/urlmon.spec | 194 ++++++++++++--------------- 1 file changed, 89 insertions(+), 105 deletions(-) diff --git a/reactos/dll/win32/urlmon/urlmon.spec b/reactos/dll/win32/urlmon/urlmon.spec index 96ba40a9c24..7efa84ce321 100644 --- a/reactos/dll/win32/urlmon/urlmon.spec +++ b/reactos/dll/win32/urlmon/urlmon.spec @@ -1,112 +1,96 @@ -# Up until Windows 2000 these APIs have hardcoded ordinals. -# Keep it that way for compatibility. -1 stub CDLGetLongPathNameA -2 stub CDLGetLongPathNameW -# IsJITInProgress has a hardcoded ordinal on WinME and Windows 2000 -#3 stub IsJITInProgress - -@ stub AsyncGetClassBits -@ stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long) -@ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) -@ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) -@ stub CoInstall -@ stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) -@ stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) -@ stdcall CoInternetCompareUrl(wstr wstr long) -@ stdcall CoInternetCombineIUri(ptr ptr long ptr long) -@ stdcall CoInternetCreateSecurityManager(ptr ptr long) -@ stdcall CoInternetCreateZoneManager(ptr ptr long) -@ stub CoInternetGetProtocolFlags -@ stdcall CoInternetGetSecurityUrl(ptr ptr long long) -@ stdcall CoInternetGetSecurityUrlEx(ptr ptr long long) -@ stdcall CoInternetGetSession(long ptr long) -@ stdcall CoInternetIsFeatureEnabled(long long) -@ stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) -@ stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) -@ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) -@ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) -@ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) -@ stdcall CoInternetSetFeatureEnabled(long long long) -@ stdcall CompareSecurityIds(ptr long ptr long long) -@ stdcall CopyBindInfo(ptr ptr) -@ stdcall CopyStgMedium(ptr ptr) -@ stdcall CreateAsyncBindCtx(long ptr ptr ptr) -@ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) -@ stdcall CreateFormatEnumerator(long ptr ptr) -@ stdcall CreateIUriBuilder(ptr long long ptr) -@ stdcall CreateUri(wstr long long ptr) -@ stdcall CreateUriWithFragment(wstr wstr long long ptr) -@ stdcall CreateURLMoniker(ptr wstr ptr) -@ stdcall CreateURLMonikerEx(ptr wstr ptr long) -@ stdcall CreateURLMonikerEx2(ptr ptr ptr long) +#100 ZoneMappingToRegKey +#101 stub AsyncGetClassBits +102 stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long) +103 stdcall BindAsyncMoniker(ptr long ptr ptr ptr) +#104 stub CDLGetLongPathNameA +#105 stub CDLGetLongPathNameW +106 stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) +#107 stub CoInstall +108 stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) +109 stdcall CoInternetCompareUrl(wstr wstr long) +110 stdcall CoInternetCreateSecurityManager(ptr ptr long) +111 stdcall CoInternetCreateZoneManager(ptr ptr long) +#112 CoInternetFeatureSettingsChanged +#113 stub CoInternetGetProtocolFlags +114 stdcall CoInternetGetSecurityUrl(ptr ptr long long) +115 stdcall CoInternetGetSession(long ptr long) +116 stdcall CoInternetIsFeatureEnabled(long long) +117 stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) +118 stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) +119 stdcall CoInternetParseUrl(wstr long long wstr long ptr long) +120 stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +121 stdcall CoInternetSetFeatureEnabled(long long long) +122 stdcall CompareSecurityIds(ptr long ptr long long) +#123 CompatFlagsFromClsid +124 stdcall CopyBindInfo(ptr ptr) +125 stdcall CopyStgMedium(ptr ptr) +126 stdcall CreateAsyncBindCtx(long ptr ptr ptr) +127 stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) +128 stdcall CreateFormatEnumerator(long ptr ptr) +129 stdcall CreateURLMoniker(ptr wstr ptr) +130 stdcall CreateURLMonikerEx(ptr wstr ptr long) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllRegisterServerEx() @ stdcall -private DllUnregisterServer() -@ stdcall Extract(long ptr) -@ stdcall FaultInIEFeature(long ptr ptr long) -@ stub FindMediaType -@ stub FindMediaTypeClass -@ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) -@ stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) -@ stub GetClassURL -@ stub GetComponentIDFromCLSSPEC -@ stub GetMarkOfTheWeb -@ stdcall GetSoftwareUpdateInfo(ptr ptr) -@ stub HlinkGoBack -@ stub HlinkGoForward -@ stub HlinkNavigateMoniker -@ stdcall HlinkNavigateString(ptr wstr) -@ stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) -@ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) -@ stub IEInstallScope -@ stdcall IsAsyncMoniker(ptr) -@ stdcall IsLoggingEnabledA(str) -@ stdcall IsLoggingEnabledW(wstr) -@ stdcall IsValidURL(ptr wstr long) -@ stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) -@ stdcall ObtainUserAgentString(long str ptr) -@ stub PrivateCoInstall -@ stdcall RegisterBindStatusCallback(ptr ptr ptr long) -@ stdcall RegisterFormatEnumerator(ptr ptr long) -@ stub RegisterMediaTypeClass -@ stdcall RegisterMediaTypes(long ptr ptr) -@ stdcall ReleaseBindInfo(ptr) -@ stdcall RevokeBindStatusCallback(ptr ptr) -@ stdcall RevokeFormatEnumerator(ptr ptr) -@ stub SetSoftwareUpdateAdvertisementState -@ stub URLDownloadA -@ stdcall URLDownloadToCacheFileA(ptr str str long long ptr) -@ stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) -@ stdcall URLDownloadToFileA(ptr str str long ptr) -@ stdcall URLDownloadToFileW(ptr wstr wstr long ptr) -@ stub URLDownloadW -@ stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) -@ stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) -@ stub URLOpenPullStreamA -@ stub URLOpenPullStreamW -@ stdcall URLOpenStreamA(ptr str long ptr) -@ stdcall URLOpenStreamW(ptr wstr long ptr) -@ stub UrlMkBuildVersion -@ stdcall UrlMkGetSessionOption(long ptr long ptr long) -@ stdcall UrlMkSetSessionOption(long ptr long long) -@ stub WriteHitLogging -@ stub ZonesReInit +137 stdcall Extract(long ptr) +138 stdcall FaultInIEFeature(long ptr ptr long) +#139 stub FindMediaType +#140 stub FindMediaTypeClass +141 stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) +#142 GetAddSitesFileUrl +143 stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) +#144 stub GetClassURL +#145 stub GetComponentIDFromCLSSPEC +#146 stub GetMarkOfTheWeb +147 stdcall GetSoftwareUpdateInfo(ptr ptr) +#148 stub HlinkGoBack +#149 stub HlinkGoForward +#150 stub HlinkNavigateMoniker +151 stdcall HlinkNavigateString(ptr wstr) +152 stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) +153 stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) +#154 InstallFlash +155 stdcall IsAsyncMoniker(ptr) +#156 stub IsJITInProgress +157 stdcall IsLoggingEnabledA(str) +158 stdcall IsLoggingEnabledW(wstr) +159 stdcall IsValidURL(ptr wstr long) +160 stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) +161 stdcall ObtainUserAgentString(long str ptr) +#162 stub PrivateCoInstall +163 stdcall RegisterBindStatusCallback(ptr ptr ptr long) +164 stdcall RegisterFormatEnumerator(ptr ptr long) +#165 stub RegisterMediaTypeClass +166 stdcall RegisterMediaTypes(long ptr ptr) +167 stdcall ReleaseBindInfo(ptr) +168 stdcall RevokeBindStatusCallback(ptr ptr) +169 stdcall RevokeFormatEnumerator(ptr ptr) +#170 stub SetSoftwareUpdateAdvertisementState +#171 ShowTrustAlertDialog +#172 stub URLDownloadA +173 stdcall URLDownloadToCacheFileA(ptr str str long long ptr) +174 stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) +175 stdcall URLDownloadToFileA(ptr str str long ptr) +176 stdcall URLDownloadToFileW(ptr wstr wstr long ptr) +#177 stub URLDownloadW +178 stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) +179 stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) +#180 stub URLOpenPullStreamA +#181 stub URLOpenPullStreamW +182 stdcall URLOpenStreamA(ptr str long ptr) +183 stdcall URLOpenStreamW(ptr wstr long ptr) +#184 stub UrlMkBuildVersion +185 stdcall UrlMkGetSessionOption(long ptr long ptr long) +186 stdcall UrlMkSetSessionOption(long ptr long long) +#187 stub WriteHitLogging +#188 stub ZonesReInit -108 stdcall @() IsInternetESCEnabledLocal -111 stdcall @(wstr) IsProtectedModeURL -328 stdcall @(ptr ptr) propsys.VariantCompare -329 stdcall @(ptr ptr) propsys.VariantToGUID -331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer -335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer -350 stdcall @(ptr ptr) propsys.PropVariantToGUID -362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString -363 stdcall @(long long ptr) propsys.InitVariantFromResource -387 stdcall @(ptr long) propsys.VariantToUInt32WithDefault -410 stdcall @(long long) LogSqmBits -423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal -444 stdcall @(long long long) MapUriToBrowserEmulationState -445 stdcall @(long long) MapBrowserEmulationModeToUserAgent -455 stdcall @() FlushUrlmonZonesCache +#FIXME: Needed by Wine +@ stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) +@ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) +@ stdcall CreateIUriBuilder(ptr long long ptr) +@ stdcall CreateUri(wstr long long ptr) +@ stdcall CreateURLMonikerEx2(ptr ptr ptr long) From aa3b023aa4679259cd0f4bb92e0c44f3bf433d4a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 29 Jun 2014 10:18:36 +0000 Subject: [PATCH 12/75] [COMCTL32] * Remove some exports that do not exist in native. * Fix some existing exports. * Reorder some exports. * Comment out some stubs. * Add some missing exports. CORE-8174 svn path=/trunk/; revision=63663 --- reactos/dll/win32/comctl32/comctl32.spec | 218 +++++++++++------------ 1 file changed, 102 insertions(+), 116 deletions(-) diff --git a/reactos/dll/win32/comctl32/comctl32.spec b/reactos/dll/win32/comctl32/comctl32.spec index 653efd71f15..20209f50018 100644 --- a/reactos/dll/win32/comctl32/comctl32.spec +++ b/reactos/dll/win32/comctl32/comctl32.spec @@ -1,30 +1,95 @@ -# Functions exported by the Win95 comctl32.dll -# (these need to have these exact ordinals, because some win95 dlls -# import comctl32.dll by ordinal) -# This list was created from a comctl32.dll v5.81 (IE5.01). - - 2 stdcall MenuHelp(long long long long long long ptr) - 3 stdcall ShowHideMenuCtl(long long ptr) - 4 stdcall GetEffectiveClientRect(long long long) - 5 stdcall DrawStatusTextA(long ptr str long) - 6 stdcall CreateStatusWindowA(long str long long) - 7 stdcall CreateToolbar(long long long long long long ptr long) - 8 stdcall CreateMappedBitmap(long long long ptr long) - 9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) - 10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) - 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) -#12 stub Cctl1632_ThunkData32 - 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long double long) #(long int64 long) - 15 stdcall DrawInsert(long long long) - 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) - 17 stdcall InitCommonControls() - 71 stdcall -noname Alloc(long) - 72 stdcall -noname ReAlloc(ptr long) - 73 stdcall -noname Free(ptr) - 74 stdcall -noname GetSize(ptr) +2 stdcall MenuHelp(long long long long long long ptr) +3 stdcall ShowHideMenuCtl(long long ptr) +4 stdcall GetEffectiveClientRect(long long long) +5 stdcall DrawStatusTextA(long ptr str long) +6 stdcall CreateStatusWindowA(long str long long) +7 stdcall CreateToolbar(long long long long long long ptr long) +8 stdcall CreateMappedBitmap(long long long ptr long) +9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) +10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) +11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) +12 stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA +13 stdcall MakeDragList(long) +14 stdcall LBItemFromPt(long double long) #(long int64 long) +15 stdcall DrawInsert(long long long) +16 stdcall CreateUpDownControl(long long long long long long long long long long long long) +17 stdcall InitCommonControls() +18 stdcall CreatePropertySheetPageA(ptr) +19 stdcall CreatePropertySheetPageW(ptr) +20 stdcall CreateStatusWindow(long str long long) CreateStatusWindowA +21 stdcall CreateStatusWindowW(long wstr long long) +22 stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) +23 stdcall DestroyPropertySheetPage(long) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +26 stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA +27 stdcall DrawStatusTextW(long ptr wstr long) +28 stdcall FlatSB_EnableScrollBar(long long long) +29 stdcall FlatSB_GetScrollInfo(long long ptr) +30 stdcall FlatSB_GetScrollPos(long long) +31 stdcall FlatSB_GetScrollProp(long long ptr) +32 stdcall FlatSB_GetScrollRange(long long ptr ptr) +33 stdcall FlatSB_SetScrollInfo(long long ptr long) +34 stdcall FlatSB_SetScrollPos(long long long long) +35 stdcall FlatSB_SetScrollProp(long long long long) +36 stdcall FlatSB_SetScrollRange(long long long long long) +37 stdcall FlatSB_ShowScrollBar(long long long) +38 stdcall GetMUILanguage() +39 stdcall ImageList_Add(ptr long long) +40 stdcall ImageList_AddIcon(ptr long) +41 stdcall ImageList_AddMasked(ptr long long) +42 stdcall ImageList_BeginDrag(ptr long long long) +43 stdcall ImageList_Copy(ptr long ptr long long) +44 stdcall ImageList_Create(long long long long long) +45 stdcall ImageList_Destroy(ptr) +46 stdcall ImageList_DragEnter(long long long) +47 stdcall ImageList_DragLeave(long) +48 stdcall ImageList_DragMove(long long) +49 stdcall ImageList_DragShowNolock(long) +50 stdcall ImageList_Draw(ptr long long long long long) +51 stdcall ImageList_DrawEx(ptr long long long long long long long long long) +52 stdcall ImageList_DrawIndirect(ptr) +53 stdcall ImageList_Duplicate(ptr) +54 stdcall ImageList_EndDrag() +55 stdcall ImageList_GetBkColor(ptr) +56 stdcall ImageList_GetDragImage(ptr ptr) +57 stdcall ImageList_GetFlags(ptr) +58 stdcall ImageList_GetIcon(ptr long long) +59 stdcall ImageList_GetIconSize(ptr ptr ptr) +60 stdcall ImageList_GetImageCount(ptr) +61 stdcall ImageList_GetImageInfo(ptr long ptr) +62 stdcall ImageList_GetImageRect(ptr long ptr) +63 stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA +64 stdcall ImageList_LoadImageA(long str long long long long long) +65 stdcall ImageList_LoadImageW(long wstr long long long long long) +66 stdcall ImageList_Merge(ptr long ptr long long long) +67 stdcall ImageList_Read(ptr) +68 stdcall ImageList_Remove(ptr long) +69 stdcall ImageList_Replace(ptr long long long) +70 stdcall ImageList_ReplaceIcon(ptr long long) +71 stdcall -noname Alloc(long) +72 stdcall -noname ReAlloc(ptr long) +73 stdcall -noname Free(ptr) +74 stdcall -noname GetSize(ptr) +75 stdcall ImageList_SetBkColor(ptr long) +76 stdcall ImageList_SetDragCursorImage(ptr long long long) +77 stdcall ImageList_SetFilter(ptr long long) +78 stdcall ImageList_SetFlags(ptr long) +79 stdcall ImageList_SetIconSize(ptr long long) +80 stdcall ImageList_SetImageCount(ptr long) +81 stdcall ImageList_SetOverlayImage(ptr long long) +82 stdcall ImageList_Write(ptr ptr) +83 stdcall InitCommonControlsEx(ptr) +84 stdcall InitMUILanguage(long) +85 stdcall InitializeFlatSB(long) +86 stdcall PropertySheet(ptr) PropertySheetA +87 stdcall PropertySheetA(ptr) +88 stdcall PropertySheetW(ptr) +89 stdcall RegisterClassNameW(wstr) +90 stdcall UninitializeFlatSB(long) +91 stdcall _TrackMouseEvent(ptr) 151 stdcall -noname CreateMRUListA(ptr) -152 stdcall -noname FreeMRUList(long) +152 stdcall -ordinal FreeMRUList(long) 153 stdcall -noname AddMRUStringA(long str) 154 stdcall -noname EnumMRUListA(long long ptr long) 155 stdcall -noname FindMRUStringA(long str ptr) @@ -37,31 +102,30 @@ 233 stdcall -noname Str_GetPtrA(str str long) 234 stdcall -noname Str_SetPtrA(str str) 235 stdcall -noname Str_GetPtrW(wstr wstr long) -236 stdcall -noname Str_SetPtrW(wstr wstr) +236 stdcall -ordinal Str_SetPtrW(wstr wstr) 320 stdcall -ordinal DSA_Create(long long) 321 stdcall -ordinal DSA_Destroy(ptr) -322 stdcall -ordinal DSA_GetItem(ptr long long) +322 stdcall -noname DSA_GetItem(ptr long long) 323 stdcall -ordinal DSA_GetItemPtr(ptr long) 324 stdcall -ordinal DSA_InsertItem(ptr long long) -325 stdcall -ordinal DSA_SetItem (ptr long long) -326 stdcall -ordinal DSA_DeleteItem(ptr long) +325 stdcall -noname DSA_SetItem (ptr long long) +326 stdcall -noname DSA_DeleteItem(ptr long) 327 stdcall -ordinal DSA_DeleteAllItems(ptr) 328 stdcall -ordinal DPA_Create(long) 329 stdcall -ordinal DPA_Destroy(ptr) -330 stdcall -ordinal DPA_Grow(ptr long) -331 stdcall -ordinal DPA_Clone(ptr ptr) +330 stdcall -noname DPA_Grow(ptr long) +331 stdcall -noname DPA_Clone(ptr ptr) 332 stdcall -ordinal DPA_GetPtr(ptr long) -333 stdcall -ordinal DPA_GetPtrIndex(ptr ptr) +333 stdcall -noname DPA_GetPtrIndex(ptr ptr) 334 stdcall -ordinal DPA_InsertPtr(ptr long ptr) 335 stdcall -ordinal DPA_SetPtr(ptr long ptr) 336 stdcall -ordinal DPA_DeletePtr(ptr long) 337 stdcall -ordinal DPA_DeleteAllPtrs(ptr) 338 stdcall -ordinal DPA_Sort(ptr ptr long) 339 stdcall -ordinal DPA_Search(ptr ptr long ptr long long) -340 stdcall -ordinal DPA_CreateEx(long long) +340 stdcall -noname DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) -345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) 350 stdcall -noname -private StrChrA(str str) 351 stdcall -noname -private StrRChrA(str str long) 352 stdcall -noname -private StrCmpNA(str str long) @@ -93,9 +157,9 @@ 384 stdcall -noname SetPathWordBreakProc(ptr long) 385 stdcall -ordinal DPA_EnumCallback(long long long) 386 stdcall -ordinal DPA_DestroyCallback(ptr ptr long) -387 stdcall -ordinal DSA_EnumCallback(ptr ptr long) +387 stdcall -noname DSA_EnumCallback(ptr ptr long) 388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) -389 stdcall -noname SHGetProcessDword(long long) +#389 CControl::v_OnNotify 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) 400 stdcall -ordinal CreateMRUListW(ptr) 401 stdcall -ordinal AddMRUStringW(long wstr) @@ -103,7 +167,7 @@ 403 stdcall -ordinal EnumMRUListW(long long ptr long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long) 410 stdcall -ordinal SetWindowSubclass(long ptr long long) -411 stdcall -ordinal GetWindowSubclass(long ptr long ptr) +411 stdcall -noname GetWindowSubclass(long ptr long ptr) 412 stdcall -ordinal RemoveWindowSubclass(long ptr long) 413 stdcall -ordinal DefSubclassProc(long long long long) 414 stdcall -noname MirrorIcon(ptr ptr) @@ -114,81 +178,3 @@ 419 stdcall -noname GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW 420 stdcall -noname GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W 421 stdcall -noname TextOutWrap(long long long wstr long) gdi32.TextOutW - -# Functions imported by name - -@ stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA -@ stdcall CreatePropertySheetPageA(ptr) -@ stdcall CreatePropertySheetPageW(ptr) -@ stdcall CreateStatusWindow(long str long long) CreateStatusWindowA -@ stdcall CreateStatusWindowW(long wstr long long) -@ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) -@ stdcall DestroyPropertySheetPage(long) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall DPA_GetSize(ptr) -@ stdcall DrawShadowText(long wstr long ptr long long long long long) -@ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA -@ stdcall DrawStatusTextW(long ptr wstr long) -@ stdcall FlatSB_EnableScrollBar (long long long) -@ stdcall FlatSB_GetScrollInfo (long long ptr) -@ stdcall FlatSB_GetScrollPos (long long) -@ stdcall FlatSB_GetScrollProp (long long ptr) -@ stdcall FlatSB_GetScrollRange (long long ptr ptr) -@ stdcall FlatSB_SetScrollInfo (long long ptr long) -@ stdcall FlatSB_SetScrollPos (long long long long) -@ stdcall FlatSB_SetScrollProp (long long long long) -@ stdcall FlatSB_SetScrollRange (long long long long long) -@ stdcall FlatSB_ShowScrollBar (long long long) -@ stdcall GetMUILanguage() -@ stdcall HIMAGELIST_QueryInterface(ptr ptr ptr) -@ stdcall ImageList_Add(ptr long long) -@ stdcall ImageList_AddIcon(ptr long) -@ stdcall ImageList_AddMasked(ptr long long) -@ stdcall ImageList_BeginDrag(ptr long long long) -@ stdcall ImageList_CoCreateInstance(ptr ptr ptr ptr) -@ stdcall ImageList_Copy(ptr long ptr long long) -@ stdcall ImageList_Create(long long long long long) -@ stdcall ImageList_Destroy(ptr) -@ stdcall ImageList_DragEnter(long long long) -@ stdcall ImageList_DragLeave(long) -@ stdcall ImageList_DragMove(long long) -@ stdcall ImageList_DragShowNolock(long) -@ stdcall ImageList_Draw(ptr long long long long long) -@ stdcall ImageList_DrawEx(ptr long long long long long long long long long) -@ stdcall ImageList_DrawIndirect(ptr) -@ stdcall ImageList_Duplicate(ptr) -@ stdcall ImageList_EndDrag() -@ stdcall ImageList_GetBkColor(ptr) -@ stdcall ImageList_GetDragImage(ptr ptr) -@ stdcall ImageList_GetFlags(ptr) -@ stdcall ImageList_GetIcon(ptr long long) -@ stdcall ImageList_GetIconSize(ptr ptr ptr) -@ stdcall ImageList_GetImageCount(ptr) -@ stdcall ImageList_GetImageInfo(ptr long ptr) -@ stdcall ImageList_GetImageRect(ptr long ptr) -@ stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA -@ stdcall ImageList_LoadImageA(long str long long long long long) -@ stdcall ImageList_LoadImageW(long wstr long long long long long) -@ stdcall ImageList_Merge(ptr long ptr long long long) -@ stdcall ImageList_Read(ptr) -@ stdcall ImageList_Remove(ptr long) -@ stdcall ImageList_Replace(ptr long long long) -@ stdcall ImageList_ReplaceIcon(ptr long long) -@ stdcall ImageList_SetBkColor(ptr long) -@ stdcall ImageList_SetDragCursorImage(ptr long long long) -@ stdcall ImageList_SetFilter(ptr long long) -@ stdcall ImageList_SetFlags(ptr long) -@ stdcall ImageList_SetIconSize(ptr long long) -@ stdcall ImageList_SetImageCount(ptr long) -@ stdcall ImageList_SetOverlayImage(ptr long long) -@ stdcall ImageList_Write(ptr ptr) -@ stdcall InitCommonControlsEx(ptr) -@ stdcall InitMUILanguage(long) -@ stdcall InitializeFlatSB(long) -@ stdcall PropertySheet(ptr) PropertySheetA -@ stdcall PropertySheetA(ptr) -@ stdcall PropertySheetW(ptr) -@ stdcall RegisterClassNameW(wstr) -@ stdcall UninitializeFlatSB(long) -@ stdcall _TrackMouseEvent(ptr) From 420285a3c03a2109bb019c5876337adc793ea8a2 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 29 Jun 2014 11:32:49 +0000 Subject: [PATCH 13/75] [SPEC2DEF] - Do not include an export's ordinal in the .def file for the import lib unless import by ordinal is intended (via -noname or -ordinal). MSVC will always import by ordinal if it finds one in the def file, which would break apps on different versions of Windows if applied to the wrong functions. svn path=/trunk/; revision=63664 --- reactos/tools/spec2def/spec2def.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reactos/tools/spec2def/spec2def.c b/reactos/tools/spec2def/spec2def.c index 1d11a97df41..2b796937a57 100644 --- a/reactos/tools/spec2def/spec2def.c +++ b/reactos/tools/spec2def/spec2def.c @@ -569,7 +569,9 @@ ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine) else { exp.nOrdinal = atol(pc); - exp.uFlags |= FL_ORDINAL; + /* The import lib should contain the ordinal only if -ordinal was specified */ + if (!gbImportLib) + exp.uFlags |= FL_ORDINAL; } /* Go to next token (type) */ From 75c0ba4cf3097307928e5ed94e7604e628fb6464 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 29 Jun 2014 12:39:10 +0000 Subject: [PATCH 14/75] [LIBUSB] - Correctly stub IRP_MJ_POWER handling - Stub handlers for the (mandatory!) IRP_MJ_SYSTEM_CONTROL svn path=/trunk/; revision=63665 --- .../lib/drivers/libusb/common_interfaces.h | 9 +++++++++ reactos/lib/drivers/libusb/hcd_controller.cpp | 17 +++++++++++----- reactos/lib/drivers/libusb/hub_controller.cpp | 20 ++++++++++++++++--- reactos/lib/drivers/libusb/libusb.cpp | 11 ++++++++-- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/reactos/lib/drivers/libusb/common_interfaces.h b/reactos/lib/drivers/libusb/common_interfaces.h index ca1c5bb228c..a3d1f9bfbc8 100644 --- a/reactos/lib/drivers/libusb/common_interfaces.h +++ b/reactos/lib/drivers/libusb/common_interfaces.h @@ -491,6 +491,15 @@ DECLARE_INTERFACE_(IDispatchIrp, IUnknown) virtual NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandleSystemControl +// +// Description: handles WMI system control requests + + virtual NTSTATUS HandleSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; }; typedef IDispatchIrp *PDISPATCHIRP; diff --git a/reactos/lib/drivers/libusb/hcd_controller.cpp b/reactos/lib/drivers/libusb/hcd_controller.cpp index 996c126aa78..9efac909b8a 100644 --- a/reactos/lib/drivers/libusb/hcd_controller.cpp +++ b/reactos/lib/drivers/libusb/hcd_controller.cpp @@ -43,6 +43,7 @@ public: NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + NTSTATUS HandleSystemControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); // local functions NTSTATUS CreateFDO(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT * OutDeviceObject); @@ -605,12 +606,18 @@ CHCDController::HandlePower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(m_NextDeviceObject, Irp); +} - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_NOT_IMPLEMENTED; +NTSTATUS +CHCDController::HandleSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); } NTSTATUS diff --git a/reactos/lib/drivers/libusb/hub_controller.cpp b/reactos/lib/drivers/libusb/hub_controller.cpp index 763fd5c395a..418b633f28f 100644 --- a/reactos/lib/drivers/libusb/hub_controller.cpp +++ b/reactos/lib/drivers/libusb/hub_controller.cpp @@ -48,6 +48,7 @@ public: virtual NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); virtual NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); virtual NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + virtual NTSTATUS HandleSystemControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); // local functions NTSTATUS HandleQueryInterface(PIO_STACK_LOCATION IoStack); @@ -759,10 +760,23 @@ CHubController::HandlePower( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp) { - UNIMPLEMENTED - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + Status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return Status; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + NTSTATUS Status; + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } //----------------------------------------------------------------------------------------- diff --git a/reactos/lib/drivers/libusb/libusb.cpp b/reactos/lib/drivers/libusb/libusb.cpp index dcf2021e616..8f51eb1b5cb 100644 --- a/reactos/lib/drivers/libusb/libusb.cpp +++ b/reactos/lib/drivers/libusb/libusb.cpp @@ -102,7 +102,7 @@ USBLIB_Dispatch( case IRP_MJ_POWER: { // - // dispatch pnp + // dispatch power // return DeviceExtension->Dispatcher->HandlePower(DeviceObject, Irp); } @@ -110,10 +110,17 @@ USBLIB_Dispatch( case IRP_MJ_DEVICE_CONTROL: { // - // dispatch pnp + // dispatch io control // return DeviceExtension->Dispatcher->HandleDeviceControl(DeviceObject, Irp); } + case IRP_MJ_SYSTEM_CONTROL: + { + // + // dispatch system control + // + return DeviceExtension->Dispatcher->HandleSystemControl(DeviceObject, Irp); + } default: { DPRINT1("USBLIB_Dispatch> Major %lu Minor %lu unhandeled\n", IoStack->MajorFunction, IoStack->MinorFunction); From 23b20f6a50ca35047cc521947fed859077a3d106 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 29 Jun 2014 12:43:06 +0000 Subject: [PATCH 15/75] [LIBUSB] - Fix stack corruption due to incorrect StatusChangeEndpointCallBack calling convention svn path=/trunk/; revision=63666 --- reactos/lib/drivers/libusb/hub_controller.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/lib/drivers/libusb/hub_controller.cpp b/reactos/lib/drivers/libusb/hub_controller.cpp index 418b633f28f..464b49e471b 100644 --- a/reactos/lib/drivers/libusb/hub_controller.cpp +++ b/reactos/lib/drivers/libusb/hub_controller.cpp @@ -13,7 +13,7 @@ #define NDEBUG #include -VOID StatusChangeEndpointCallBack( +VOID NTAPI StatusChangeEndpointCallBack( PVOID Context); class CHubController : public IHubController, @@ -78,7 +78,7 @@ public: NTSTATUS HandleSyncResetAndClearStall(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleAbortPipe(IN OUT PIRP Irp, PURB Urb); - friend VOID StatusChangeEndpointCallBack(PVOID Context); + friend VOID NTAPI StatusChangeEndpointCallBack(PVOID Context); // constructor / destructor CHubController(IUnknown *OuterUnknown){} @@ -3981,7 +3981,7 @@ CreateHubController( return STATUS_SUCCESS; } -VOID StatusChangeEndpointCallBack(PVOID Context) +VOID NTAPI StatusChangeEndpointCallBack(PVOID Context) { CHubController* This; PIRP Irp; From 6916c31c9ea62190bb7fa0ed4f346007ff03fbd3 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 29 Jun 2014 12:47:17 +0000 Subject: [PATCH 16/75] [LIBUSB] - Fix a typo'd function name svn path=/trunk/; revision=63667 --- reactos/lib/drivers/libusb/hub_controller.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/reactos/lib/drivers/libusb/hub_controller.cpp b/reactos/lib/drivers/libusb/hub_controller.cpp index 464b49e471b..32b3f7efd4f 100644 --- a/reactos/lib/drivers/libusb/hub_controller.cpp +++ b/reactos/lib/drivers/libusb/hub_controller.cpp @@ -111,7 +111,7 @@ protected: //Internal Functions - BOOLEAN QueryStatusChageEndpoint(PIRP Irp); + BOOLEAN QueryStatusChangeEndpoint(PIRP Irp); }; typedef struct @@ -286,7 +286,7 @@ CHubController::Initialize( // Queries the ports to see if there has been a device connected or removed. // BOOLEAN -CHubController::QueryStatusChageEndpoint( +CHubController::QueryStatusChangeEndpoint( PIRP Irp) { ULONG PortCount, PortId; @@ -846,7 +846,7 @@ CHubController::HandleBulkOrInterruptTransfer( if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this) || Urb->UrbHeader.UsbdDeviceHandle == NULL) { ASSERT(m_PendingSCEIrp == NULL); - if (QueryStatusChageEndpoint(Irp)) + if (QueryStatusChangeEndpoint(Irp)) { StatusChangeEndpointCallBack(this); return STATUS_SUCCESS; @@ -1111,7 +1111,7 @@ CHubController::HandleSelectConfiguration( // select configuration // Status = UsbDevice->SelectConfiguration(Urb->UrbSelectConfiguration.ConfigurationDescriptor, &Urb->UrbSelectConfiguration.Interface, &Urb->UrbSelectConfiguration.ConfigurationHandle); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { // successfully configured device Urb->UrbSelectConfiguration.Hdr.Status = USBD_STATUS_SUCCESS; @@ -1590,7 +1590,7 @@ CHubController::HandleGetDescriptor( Length = BufferLength > sizeof(USB_CONFIGURATION_DESCRIPTOR) ? sizeof(USB_CONFIGURATION_DESCRIPTOR) : BufferLength; RtlCopyMemory(Buffer, &ROOTHUB2_CONFIGURATION_DESCRIPTOR, Length); - + // // Check if we still have some space left // @@ -1614,7 +1614,7 @@ CHubController::HandleGetDescriptor( Length = BufferLength > sizeof(USB_INTERFACE_DESCRIPTOR) ? sizeof(USB_INTERFACE_DESCRIPTOR) : BufferLength; RtlCopyMemory(Buffer, &ROOTHUB2_INTERFACE_DESCRIPTOR, Length); - + // // Check if we still have some space left // @@ -1631,8 +1631,8 @@ CHubController::HandleGetDescriptor( // Buffer += Length; BufferLength -= Length; - - + + // // copy end point descriptor template // @@ -1665,7 +1665,7 @@ CHubController::HandleGetDescriptor( // get device // UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - + // // Allocate temporary buffer // @@ -1681,14 +1681,14 @@ CHubController::HandleGetDescriptor( // perform work in IUSBDevice // UsbDevice->GetConfigurationDescriptors((PUSB_CONFIGURATION_DESCRIPTOR)Buffer, BufferLength, &Length); - + // // Copy what we can // - Length = Urb->UrbControlDescriptorRequest.TransferBufferLength > Length ? + Length = Urb->UrbControlDescriptorRequest.TransferBufferLength > Length ? Length : Urb->UrbControlDescriptorRequest.TransferBufferLength; RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Buffer, Length); - + // // Free temporary buffer // @@ -3997,7 +3997,7 @@ VOID NTAPI StatusChangeEndpointCallBack(PVOID Context) } This->m_PendingSCEIrp = NULL; - This->QueryStatusChageEndpoint(Irp); + This->QueryStatusChangeEndpoint(Irp); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; From 07644dbb393ca16ef797f5b246bfdd13fb1d7fe7 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 29 Jun 2014 12:53:11 +0000 Subject: [PATCH 17/75] {USBEHCI][USBOHCI][USBUHCI] - Let libusb handle IRP_MJ_POWER and IRP_MJ_SYSTEM_CONTROL requests svn path=/trunk/; revision=63668 --- reactos/drivers/usb/usbehci/usbehci.cpp | 7 ++++--- reactos/drivers/usb/usbohci/usbohci.cpp | 4 +++- reactos/drivers/usb/usbuhci/usbuhci.cpp | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/usb/usbehci/usbehci.cpp b/reactos/drivers/usb/usbehci/usbehci.cpp index d1d36372a7a..41e630fd126 100644 --- a/reactos/drivers/usb/usbehci/usbehci.cpp +++ b/reactos/drivers/usb/usbehci/usbehci.cpp @@ -22,7 +22,7 @@ DriverEntry( PUNICODE_STRING RegistryPath) { - /* initialize driver object*/ + /* initialize driver object */ DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch; @@ -30,13 +30,14 @@ DriverEntry( DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch; - return STATUS_SUCCESS; } extern "C" { - void + void __cxa_pure_virtual() { // put error handling here diff --git a/reactos/drivers/usb/usbohci/usbohci.cpp b/reactos/drivers/usb/usbohci/usbohci.cpp index b5e6f0efbad..d51d609d729 100644 --- a/reactos/drivers/usb/usbohci/usbohci.cpp +++ b/reactos/drivers/usb/usbohci/usbohci.cpp @@ -22,7 +22,7 @@ DriverEntry( PUNICODE_STRING RegistryPath) { - /* initialize driver object*/ + /* initialize driver object */ DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch; @@ -30,6 +30,8 @@ DriverEntry( DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch; return STATUS_SUCCESS; } diff --git a/reactos/drivers/usb/usbuhci/usbuhci.cpp b/reactos/drivers/usb/usbuhci/usbuhci.cpp index 9d53418dba2..54b54360872 100644 --- a/reactos/drivers/usb/usbuhci/usbuhci.cpp +++ b/reactos/drivers/usb/usbuhci/usbuhci.cpp @@ -22,7 +22,7 @@ DriverEntry( PUNICODE_STRING RegistryPath) { - /* initialize driver object*/ + /* initialize driver object */ DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch; @@ -30,6 +30,8 @@ DriverEntry( DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch; return STATUS_SUCCESS; } From 05e3584260d711a535a2d150d8016f7a901e60fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 29 Jun 2014 15:00:22 +0000 Subject: [PATCH 18/75] [USERSRV]: Convert remaining language files into UTF-8. svn path=/trunk/; revision=63670 --- .../win32ss/user/winsrv/usersrv/lang/bg-BG.rc | 22 +++++----- .../win32ss/user/winsrv/usersrv/lang/cs-CZ.rc | 18 ++++----- .../win32ss/user/winsrv/usersrv/lang/de-DE.rc | 6 +-- .../win32ss/user/winsrv/usersrv/lang/el-GR.rc | 22 +++++----- .../win32ss/user/winsrv/usersrv/lang/es-ES.rc | 4 +- .../win32ss/user/winsrv/usersrv/lang/fr-FR.rc | 8 ++-- .../win32ss/user/winsrv/usersrv/lang/ja-JP.rc | 20 +++++----- .../win32ss/user/winsrv/usersrv/lang/no-NO.rc | 10 ++--- .../win32ss/user/winsrv/usersrv/lang/sk-SK.rc | 22 +++++----- .../win32ss/user/winsrv/usersrv/lang/sv-SE.rc | 10 ++--- .../win32ss/user/winsrv/usersrv/lang/zh-CN.rc | 22 +++++----- .../win32ss/user/winsrv/usersrv/lang/zh-TW.rc | 20 +++++----- .../win32ss/user/winsrv/usersrv/usersrv.rc | 40 +++++++++---------- 13 files changed, 112 insertions(+), 112 deletions(-) diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/bg-BG.rc b/reactos/win32ss/user/winsrv/usersrv/lang/bg-BG.rc index 935c0c172fe..c4cb589b3ae 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/bg-BG.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/bg-BG.rc @@ -2,25 +2,25 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ïðåêðàòÿâàíå íà ïðèëîæåíèå - " +CAPTION "ПрекратÑване на приложение - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ïðåêðàòÿâàíå íà ïðèëîæåíèåòî... Ïî÷àêàéòå", IDC_STATIC, 7, 7, 186, 11 - CONTROL "Õîä", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Àêî ðåøèòå äà çàòâîðèòå ïðèëîæåíèåòî âåäíàãà, ùå èçãóáèòå âñè÷êè íåçàïèñàíè äàííè. Çà äà ïðåêðàòèòå ïðèëîæåíèåòî âåäíàãà, íàòèñíåòå „Ïðåêðàòÿâàíå âåäíàãà„.", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "&Ïðåêðàòÿâàíå âåäíàãà", IDC_END_NOW, 150, 71, 60, 17 + LTEXT "ПрекратÑване на приложението... Почакайте", IDC_STATIC, 7, 7, 186, 11 + CONTROL "Ход", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 + LTEXT "Ðко решите да затворите приложението веднага, ще изгубите вÑички незапиÑани данни. За да прекратите приложението веднага, натиÑнете „ПрекратÑване веднага„.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&ПрекратÑване веднага", IDC_END_NOW, 150, 71, 60, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ïðåêðàòÿâàíå íà ïðèëîæåíèå - " +CAPTION "ПрекратÑване на приложение - " FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Îòêàç", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "&Ïðåêðàòÿâàíå âåäíàãà", IDC_END_NOW, 150, 71, 60, 17 - LTEXT "Ïðèëîæåíèåòî íå îòãîâàðÿ.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "Çà äà ñå âúðíåòå â ÐåàêòÎÑ è äà ïðîâåðèòå ñúñòîÿíèåòî íà ïðèëîæåíèåòî, íàòèñíåòå „Îòêàç“.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Àêî ðåøèòå äà çàòâîðèòå ïðèëîæåíèåòî âåäíàãà, ùå èçãóáèòå âñè÷êè íåçàïèñàíè äàííè. Çà äà ïðåêðàòèòå ïðèëîæåíèåòî âåäíàãà, íàòèñíåòå „Ïðåêðàòÿâàíå âåäíàãà“.", IDC_STATIC, 7, 53, 178, 26 + DEFPUSHBUTTON "Отказ", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "&ПрекратÑване веднага", IDC_END_NOW, 150, 71, 60, 17 + LTEXT "Приложението не отговарÑ.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "За да Ñе върнете в РеактОС и да проверите ÑÑŠÑтоÑнието на приложението, натиÑнете „Отказ“.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Ðко решите да затворите приложението веднага, ще изгубите вÑички незапиÑани данни. За да прекратите приложението веднага, натиÑнете „ПрекратÑване веднага“.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc b/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc index 6a1ba28e310..8e3022db8bd 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc @@ -4,25 +4,25 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ukonèit program - " +CAPTION "UkonÄit program - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Probíhá ukonèení programu... Èekejte, prosím", IDC_STATIC, 7, 7, 186, 11 + LTEXT "Probíhá ukonÄení programu... ÄŒekejte, prosím", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "IPokud zvolíte okamžité ukonèení programu, všechna neuložená data budou ztracena. Kliknutím na Ukonèit okamžitì ukonèíte program.", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "&Ukonèit okamžitì", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "IPokud zvolíte okamžité ukonÄení programu, vÅ¡echna neuložená data budou ztracena. Kliknutím na UkonÄit okamžitÄ› ukonÄíte program.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&UkonÄit okamžitÄ›", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ukonèit program - " +CAPTION "UkonÄit program - " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Storno", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "&Ukonèit okamžitì", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "Tento program neodpovídá.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "Kliknutím na Storno se lze vrátit do systému ReactOS a ovìøit stav programu.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Pokud zvolíte okamžité ukonèení programu, všechna neuložená data budou ztracena. Kliknutím na Ukonèit okamžitì ukonèíte program.", IDC_STATIC, 7, 53, 178, 26 + PUSHBUTTON "&UkonÄit okamžitÄ›", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "Tento program neodpovídá.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "Kliknutím na Storno se lze vrátit do systému ReactOS a ověřit stav programu.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Pokud zvolíte okamžité ukonÄení programu, vÅ¡echna neuložená data budou ztracena. Kliknutím na UkonÄit okamžitÄ› ukonÄíte program.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/de-DE.rc b/reactos/win32ss/user/winsrv/usersrv/lang/de-DE.rc index 40075d53cbc..f207a0e7c2f 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/de-DE.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/de-DE.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Programm wird beendet...", IDC_STATIC, 7, 7, 186, 11 CONTROL "Fortschritt", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC, 7, 40, 186, 26 + LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC, 7, 40, 186, 26 DEFPUSHBUTTON "J&etzt beenden", IDC_END_NOW, 150, 71, 43, 17 END @@ -19,8 +19,8 @@ BEGIN DEFPUSHBUTTON "Abbechen", IDCANCEL, 142, 98, 43, 17 PUSHBUTTON "J&etzt beenden", IDC_END_NOW, 78, 98, 43, 17 LTEXT "Das Programm reagiert nicht.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "Um zu ReactOS zurückzukehren und den Status der Anwendung zu überprüfen, wählen Sie Abbrechen.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC, 7, 53, 178, 26 + LTEXT "Um zu ReactOS zurückzukehren und den Status der Anwendung zu überprüfen, wählen Sie Abbrechen.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/el-GR.rc b/reactos/win32ss/user/winsrv/usersrv/lang/el-GR.rc index b14d5b30b40..22ab8b06928 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/el-GR.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/el-GR.rc @@ -2,25 +2,25 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Êëåßóéìï ðñïãñÜììáôïò - " +CAPTION "Κλείσιμο Ï€ÏογÏάμματος - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Êëåßóéìï ðñïãñÜììáôïò... Ðáñáêáëþ ðåñéìÝíåôå", IDC_STATIC, 7, 7, 186, 11 - CONTROL "Ðñüïäïò", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Áí êëåßóåôå ôçí åöáñìïãÞ ôþñá , èá ÷Üóåôå üëá ôá ìç áðïèçêåõìÝíá äåäïìÝíá. Ãéá íá êëåßóåôå ôï ðñüãñáììá ôþñá, ðáôÞóôå 'Êëåßóéìï Ôþñá'.", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "&Êëåßóéìï Ôþñá", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "Κλείσιμο Ï€ÏογÏάμματος... ΠαÏακαλώ πεÏιμένετε", IDC_STATIC, 7, 7, 186, 11 + CONTROL "ΠÏόοδος", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 + LTEXT "Αν κλείσετε την εφαÏμογή Ï„ÏŽÏα , θα χάσετε όλα τα μη αποθηκευμένα δεδομένα. Για να κλείσετε το Ï€ÏόγÏαμμα Ï„ÏŽÏα, πατήστε 'Κλείσιμο ΤώÏα'.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&Κλείσιμο ΤώÏα", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Êëåßóçìï ðñïãñÜììáôïò - " +CAPTION "Κλείσημο Ï€ÏογÏάμματος - " FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "¢êõñï", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "&Êëåßóéìï Ôþñá", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "Ôï ðñüãñáììá äåí áðïêñßíåôáé.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "Ãéá íá åðéóôñÝøåôå óôï ReactOS êáé íá åëÝãîåôå ôçí êáôÜóôáóç ôïõ ðñïãñÜììáôïò, ðáôÞóôå '¢êõñï'.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Áí êëåßóåôå ôçí åöáñìïãÞ ôþñá , èá ÷Üóåôå üëá ôá ìç áðïèçêåõìÝíá äåäïìÝíá. Ãéá íá êëåßóåôå ôï ðñüãñáììá ôþñá, ðáôÞóôå 'Êëåßóéìï Ôþñá'.", IDC_STATIC, 7, 53, 178, 26 + DEFPUSHBUTTON "ʼκυÏο", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "&Κλείσιμο ΤώÏα", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "Το Ï€ÏόγÏαμμα δεν αποκÏίνεται.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "Για να επιστÏέψετε στο ReactOS και να ελέγξετε την κατάσταση του Ï€ÏογÏάμματος, πατήστε 'ʼκυÏο'.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Αν κλείσετε την εφαÏμογή Ï„ÏŽÏα , θα χάσετε όλα τα μη αποθηκευμένα δεδομένα. Για να κλείσετε το Ï€ÏόγÏαμμα Ï„ÏŽÏα, πατήστε 'Κλείσιμο ΤώÏα'.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/es-ES.rc b/reactos/win32ss/user/winsrv/usersrv/lang/es-ES.rc index 17b17578dce..1639fb7c3d7 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/es-ES.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/es-ES.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Finalizando programa... Por favor, espere", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progreso", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", IDC_STATIC, 7, 40, 186, 26 + LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", IDC_STATIC, 7, 40, 186, 26 DEFPUSHBUTTON "&Finalizar ahora", IDC_END_NOW, 150, 71, 43, 17 END @@ -22,7 +22,7 @@ BEGIN PUSHBUTTON "&Finalizar ahora", IDC_END_NOW, 78, 98, 43, 17 LTEXT "Este programa no responde.", IDC_STATIC, 7, 7, 178, 8 LTEXT "Para volver a ReactOS y ver el estado del programa, haga clic en Cancelar.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", IDC_STATIC, 7, 53, 178, 26 + LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/fr-FR.rc b/reactos/win32ss/user/winsrv/usersrv/lang/fr-FR.rc index a6d6fe02a5c..48c6328bd67 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/fr-FR.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/fr-FR.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Termine le programme... Veuillez patienter", IDC_STATIC, 7, 7, 186, 11 CONTROL "Avancement", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", IDC_STATIC, 7, 40, 186, 26 + LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", IDC_STATIC, 7, 40, 186, 26 DEFPUSHBUTTON "T&erminer maintenant", IDC_END_NOW, 150, 71, 43, 17 END @@ -18,9 +18,9 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Annuler", IDCANCEL, 142, 98, 43, 17 PUSHBUTTON "T&erminer maintenant", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "Ce programme ne répond pas.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "Pour retourner à ReactOS et vérifier l'état du programme, cliquez sur Annuler.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", IDC_STATIC, 7, 53, 178, 26 + LTEXT "Ce programme ne répond pas.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "Pour retourner à ReactOS et vérifier l'état du programme, cliquez sur Annuler.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/ja-JP.rc b/reactos/win32ss/user/winsrv/usersrv/lang/ja-JP.rc index 7832565d949..fd9e0b01564 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/ja-JP.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/ja-JP.rc @@ -2,25 +2,25 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ƒvƒƒOƒ‰ƒ€‚ÌI—¹ - " +CAPTION "プログラムã®çµ‚了 - " FONT 9, "MS UI Gothic" BEGIN - LTEXT "ƒvƒƒOƒ‰ƒ€‚ðI—¹‚µ‚Ä‚¢‚Ü‚·... ‚µ‚΂炭‚¨‘Ò‚¿‚­‚¾‚³‚¢", IDC_STATIC, 7, 7, 186, 11 + LTEXT "プログラムを終了ã—ã¦ã„ã¾ã™... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "ƒvƒƒOƒ‰ƒ€‚ð‚·‚®‚ÉI—¹‚³‚¹‚é‚悤‘I‘ð‚µ‚½ê‡A•Û‘¶‚³‚ê‚Ä‚¢‚È‚¢ƒf[ƒ^‚Í‚·‚ׂϸ‚í‚ê‚Ü‚·BƒvƒƒOƒ‰ƒ€‚ðI—¹‚·‚é‚É‚Í[‚·‚®‚ÉI—¹]‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢B", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "‚·‚®‚ÉI—¹(&E)", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "プログラムをã™ãã«çµ‚了ã•ã›ã‚‹ã‚ˆã†é¸æŠžã—ãŸå ´åˆã€ä¿å­˜ã•ã‚Œã¦ã„ãªã„データã¯ã™ã¹ã¦å¤±ã‚ã‚Œã¾ã™ã€‚プログラムを終了ã™ã‚‹ã«ã¯[ã™ãã«çµ‚了]をクリックã—ã¦ãã ã•ã„。", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "ã™ãã«çµ‚了(&E)", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ƒvƒƒOƒ‰ƒ€‚ÌI—¹ - " +CAPTION "プログラムã®çµ‚了 - " FONT 9, "MS UI Gothic" BEGIN - DEFPUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "‚·‚®‚ÉI—¹(&E)", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "‚±‚̃vƒƒOƒ‰ƒ€‚͉ž“š‚µ‚Ä‚¢‚Ü‚¹‚ñ", IDC_STATIC, 7, 7, 178, 8 - LTEXT "ReactOS ‚É–ß‚Á‚ăvƒƒOƒ‰ƒ€‚Ìó‘Ô‚ðŠm”F‚·‚é‚É‚Í[ƒLƒƒƒ“ƒZƒ‹]‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢", IDC_STATIC, 7, 26, 178, 16 - LTEXT "ƒvƒƒOƒ‰ƒ€‚ð‚·‚®‚ÉI—¹‚³‚¹‚é‚悤‘I‘ð‚µ‚½ê‡A•Û‘¶‚³‚ê‚Ä‚¢‚È‚¢ƒf[ƒ^‚Í‚·‚ׂϸ‚í‚ê‚Ü‚·BƒvƒƒOƒ‰ƒ€‚𒼂¿‚ÉI—¹‚·‚é‚É‚Í[‚·‚®‚ÉI—¹]‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢", IDC_STATIC, 7, 53, 178, 26 + DEFPUSHBUTTON "キャンセル", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "ã™ãã«çµ‚了(&E)", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "ã“ã®ãƒ—ログラムã¯å¿œç­”ã—ã¦ã„ã¾ã›ã‚“", IDC_STATIC, 7, 7, 178, 8 + LTEXT "ReactOS ã«æˆ»ã£ã¦ãƒ—ログラムã®çŠ¶æ…‹ã‚’確èªã™ã‚‹ã«ã¯[キャンセル]をクリックã—ã¦ãã ã•ã„", IDC_STATIC, 7, 26, 178, 16 + LTEXT "プログラムをã™ãã«çµ‚了ã•ã›ã‚‹ã‚ˆã†é¸æŠžã—ãŸå ´åˆã€ä¿å­˜ã•ã‚Œã¦ã„ãªã„データã¯ã™ã¹ã¦å¤±ã‚ã‚Œã¾ã™ã€‚プログラムを直ã¡ã«çµ‚了ã™ã‚‹ã«ã¯[ã™ãã«çµ‚了]をクリックã—ã¦ãã ã•ã„", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/no-NO.rc b/reactos/win32ss/user/winsrv/usersrv/lang/no-NO.rc index 47665fc8bf2..9c69d5cf84a 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/no-NO.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/no-NO.rc @@ -7,8 +7,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Avslutt Program... Vennligst vent", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå.", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "&Avslutt nå", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "Hvis du velger Ã¥ avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For Ã¥ avslutte programmet nÃ¥, Trykk pÃ¥ Avslutt nÃ¥.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&Avslutt nÃ¥", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 @@ -17,10 +17,10 @@ CAPTION "Avslutt program - " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Avbryt", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "&Avslutt nå", IDC_END_NOW, 78, 98, 43, 17 + PUSHBUTTON "&Avslutt nÃ¥", IDC_END_NOW, 78, 98, 43, 17 LTEXT "Programmet svarer ikke.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "For å returnere til ReactOS for å sjekke statusen på programmet, trykk på avbryt.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå.", IDC_STATIC, 7, 53, 178, 26 + LTEXT "For Ã¥ returnere til ReactOS for Ã¥ sjekke statusen pÃ¥ programmet, trykk pÃ¥ avbryt.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Hvis du velger Ã¥ avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For Ã¥ avslutte programmet nÃ¥, Trykk pÃ¥ Avslutt nÃ¥.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/sk-SK.rc b/reactos/win32ss/user/winsrv/usersrv/lang/sk-SK.rc index d2e3e53e1b6..edb7d9768a3 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/sk-SK.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/sk-SK.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk) +/* TRANSLATOR: Mário KaÄmár /Mario Kacmar/ aka Kario (kario@szm.sk) * DATE OF TR: 29-05-2008 * LastChange: 12-04-2011 */ @@ -7,25 +7,25 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ukonèenie programu - " +CAPTION "UkonÄenie programu - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ukonèujem program... Poèkajte, prosím.", IDC_STATIC, 7, 7, 186, 11 + LTEXT "UkonÄujem program... PoÄkajte, prosím.", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Ak zvolíte okamžité ukonèenie programu, stratíte všetky neuložené údaje. Ak chcete program ukonèi okamžite, kliknite na tlaèidlo Ukonèi ihneï.", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "&Ukonèi ihneï", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "Ak zvolíte okamžité ukonÄenie programu, stratíte vÅ¡etky neuložené údaje. Ak chcete program ukonÄiÅ¥ okamžite, kliknite na tlaÄidlo UkonÄiÅ¥ ihneÄ.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&UkonÄiÅ¥ ihneÄ", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ukonèenie programu - " +CAPTION "UkonÄenie programu - " FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Zruši", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "&Ukonèi ihneï", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "Tento program neodpovedá.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "Pre návrat do systému ReactOS a overenie stavu programu kliknite na tlaèidlo Zruši.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Ak zvolíte okamžité ukonèenie programu, stratíte všetky neuložené údaje. Ak chcete program ukonèi okamžite, kliknite na tlaèidlo Ukonèi ihneï.", IDC_STATIC, 7, 53, 178, 26 + DEFPUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "&UkonÄiÅ¥ ihneÄ", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "Tento program neodpovedá.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "Pre návrat do systému ReactOS a overenie stavu programu kliknite na tlaÄidlo ZruÅ¡iÅ¥.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Ak zvolíte okamžité ukonÄenie programu, stratíte vÅ¡etky neuložené údaje. Ak chcete program ukonÄiÅ¥ okamžite, kliknite na tlaÄidlo UkonÄiÅ¥ ihneÄ.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/sv-SE.rc b/reactos/win32ss/user/winsrv/usersrv/lang/sv-SE.rc index 196e567b172..31954b52cc8 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/sv-SE.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/sv-SE.rc @@ -4,12 +4,12 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " +CAPTION "Avsluta Program - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Avsluta Program... Var vänlig vänta", IDC_STATIC, 7, 7, 186, 11 + LTEXT "Avsluta Program... Var vänlig vänta", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Om du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", IDC_STATIC, 7, 40, 186, 26 + LTEXT "Om du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", IDC_STATIC, 7, 40, 186, 26 DEFPUSHBUTTON "&Avsluta Nu", IDC_END_NOW, 150, 71, 43, 17 END @@ -21,8 +21,8 @@ BEGIN DEFPUSHBUTTON "Avbryt", IDCANCEL, 142, 98, 43, 17 PUSHBUTTON "&Avsluta Nu", IDC_END_NOW, 78, 98, 43, 17 LTEXT "Detta programmet svarar inte.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "För att återgå till ReactOS och undersöka programmets status klicka Avbryt.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "m du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", IDC_STATIC, 7, 53, 178, 26 + LTEXT "För att Ã¥tergÃ¥ till ReactOS och undersöka programmets status klicka Avbryt.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Om du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/zh-CN.rc b/reactos/win32ss/user/winsrv/usersrv/lang/zh-CN.rc index 77d5b5797d3..63a37494836 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/zh-CN.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/zh-CN.rc @@ -2,25 +2,25 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÖÕÖ¹³ÌÐò - " +CAPTION "ç»ˆæ­¢ç¨‹åº - " FONT 9, "MS Shell Dlg" BEGIN - LTEXT "ÕýÔÚÖÕÖ¹³ÌÐò... ÇëµÈ´ý", IDC_STATIC, 7, 7, 186, 11 - CONTROL "½ø³Ì", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "Èç¹ûÄúÑ¡ÔñÁ¢¼´ÖÕÖ¹³ÌÐò£¬Äú½«Ê§È¥ËùÓÐδ±£´æµÄÊý¾Ý¡£ÈôÒªÁ¢¼´½áÊø³ÌÐò£¬µ¥»÷¡°Á¢¼´ÖÕÖ¹¡±¡£", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "Á¢¼´ÖÕÖ¹(&E)", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "正在终止程åº... 请等待", IDC_STATIC, 7, 7, 186, 11 + CONTROL "进程", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 + LTEXT "如果您选择立å³ç»ˆæ­¢ç¨‹åºï¼Œæ‚¨å°†å¤±åŽ»æ‰€æœ‰æœªä¿å­˜çš„æ•°æ®ã€‚è‹¥è¦ç«‹å³ç»“æŸç¨‹åºï¼Œå•å‡»â€œç«‹å³ç»ˆæ­¢â€ã€‚", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "ç«‹å³ç»ˆæ­¢(&E)", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÖÕÖ¹³ÌÐò - " +CAPTION "ç»ˆæ­¢ç¨‹åº - " FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "È¡Ïû", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "Á¢¼´ÖÕÖ¹(&E)", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "´Ë³ÌÐò²¢Î´ÏìÓ¦", IDC_STATIC, 7, 7, 178, 8 - LTEXT "ÈôÒª·µ»ØÖÁ ReactOS ²¢¼ì²é¸Ã³ÌÐòµÄ״̬£¬Çëµã»÷¡°È¡Ïû¡±¡£", IDC_STATIC, 7, 26, 178, 16 - LTEXT "Èç¹ûÄúÑ¡ÔñÁ¢¼´ÖÕÖ¹³ÌÐò£¬Äú½«Ê§È¥ËùÓÐδ±£´æµÄÊý¾Ý¡£ÈôÒªÁ¢¼´½áÊø³ÌÐò£¬µ¥»÷¡°Á¢¼´ÖÕÖ¹¡±¡£", IDC_STATIC, 7, 53, 178, 26 + DEFPUSHBUTTON "å–消", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "ç«‹å³ç»ˆæ­¢(&E)", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "此程åºå¹¶æœªå“应", IDC_STATIC, 7, 7, 178, 8 + LTEXT "è‹¥è¦è¿”回至 ReactOS 并检查该程åºçš„状æ€ï¼Œè¯·ç‚¹å‡»â€œå–消â€ã€‚", IDC_STATIC, 7, 26, 178, 16 + LTEXT "如果您选择立å³ç»ˆæ­¢ç¨‹åºï¼Œæ‚¨å°†å¤±åŽ»æ‰€æœ‰æœªä¿å­˜çš„æ•°æ®ã€‚è‹¥è¦ç«‹å³ç»“æŸç¨‹åºï¼Œå•å‡»â€œç«‹å³ç»ˆæ­¢â€ã€‚", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/lang/zh-TW.rc b/reactos/win32ss/user/winsrv/usersrv/lang/zh-TW.rc index 632b24b247c..8e021b0bfb0 100644 --- a/reactos/win32ss/user/winsrv/usersrv/lang/zh-TW.rc +++ b/reactos/win32ss/user/winsrv/usersrv/lang/zh-TW.rc @@ -2,25 +2,25 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "µ²§ôµ{¦¡" +CAPTION "çµæŸç¨‹å¼" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "¥¿¦bµ²§ôµ{¦¡... ½Ðµyµ¥", IDC_STATIC, 7, 7, 186, 11 + LTEXT "正在çµæŸç¨‹å¼... è«‹ç¨ç­‰", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "¦pªG±z¿ï¾Ü¥ß§Yµ²§ôµ{¦¡¡A±z±N¥¢¥h©Ò¦³¥¼Àx¦sªº¸ê®Æ¡C­Y­n¥ß§Yµ²§ôµ{¦¡¡A½Ð«ö¤U¡§¥ß§Yµ²§ô¡¨¡C", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "¥ß§Yµ²§ô(&E)", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "如果您é¸æ“‡ç«‹å³çµæŸç¨‹å¼ï¼Œæ‚¨å°‡å¤±åŽ»æ‰€æœ‰æœªå„²å­˜çš„資料。若è¦ç«‹å³çµæŸç¨‹å¼ï¼Œè«‹æŒ‰ä¸‹â€œç«‹å³çµæŸâ€ã€‚", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "ç«‹å³çµæŸ(&E)", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "µ²§ôµ{¦¡ - " +CAPTION "çµæŸç¨‹å¼ - " FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "¨ú®ø", IDCANCEL, 142, 98, 43, 17 - PUSHBUTTON "¥ß§Yµ²§ô(&E) ", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "¦¹µ{¦¡¨Ã¥¼ÅTÀ³", IDC_STATIC, 7, 7, 178, 8 - LTEXT "­Y­nªð¦^¦Ü ReactOS ¨ÃÀ˵øµ{¦¡ªºª¬ºA¡A½Ð«ö¤U¡§¨ú®ø¡¨", IDC_STATIC, 7, 26, 178, 16 - LTEXT "¦pªG±z¿ï¾Ü¥ß§Yµ²§ôµ{¦¡¡A±z±N¥¢¥h©Ò¦³¥¼Àx¦sªº¸ê®Æ¡C­Y­n¥ß§Yµ²§ôµ{¦¡¡A½Ð«ö¤U¡§¥ß§Yµ²§ô¡¨¡C", IDC_STATIC, 7, 53, 178, 26 + DEFPUSHBUTTON "å–消", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "ç«‹å³çµæŸ(&E) ", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "此程å¼ä¸¦æœªéŸ¿æ‡‰", IDC_STATIC, 7, 7, 178, 8 + LTEXT "è‹¥è¦è¿”回至 ReactOS 並檢視程å¼çš„狀態，請按下“å–消â€", IDC_STATIC, 7, 26, 178, 16 + LTEXT "如果您é¸æ“‡ç«‹å³çµæŸç¨‹å¼ï¼Œæ‚¨å°‡å¤±åŽ»æ‰€æœ‰æœªå„²å­˜çš„資料。若è¦ç«‹å³çµæŸç¨‹å¼ï¼Œè«‹æŒ‰ä¸‹â€œç«‹å³çµæŸâ€ã€‚", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 diff --git a/reactos/win32ss/user/winsrv/usersrv/usersrv.rc b/reactos/win32ss/user/winsrv/usersrv/usersrv.rc index d254c5722ad..5e9aeaf3628 100644 --- a/reactos/win32ss/user/winsrv/usersrv/usersrv.rc +++ b/reactos/win32ss/user/winsrv/usersrv/usersrv.rc @@ -3,6 +3,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -24,6 +27,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif @@ -36,24 +42,6 @@ #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.rc" -#endif -#ifdef LANGUAGE_ZH_TW - #include "lang/zh-TW.rc" -#endif - -// UTF-8 -#pragma code_page(65001) -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif @@ -66,9 +54,21 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" #endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif From ccd4c4e5e783bf481cb32e008d7706b5f862581c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 29 Jun 2014 16:37:18 +0000 Subject: [PATCH 19/75] [SAL] * Add _Field_size_bytes_part_ annotation. svn path=/trunk/; revision=63672 --- reactos/include/psdk/sal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h index f726c63f128..e3318b20ff5 100644 --- a/reactos/include/psdk/sal.h +++ b/reactos/include/psdk/sal.h @@ -605,7 +605,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Field_size_bytes_full_(size) //#define _Field_size_bytes_full_opt_(size) #define _Field_size_bytes_opt_(size) _SAL2_NAME(_Field_size_bytes_opt_) _Group_(_Maybenull_ _Writable_bytes_(size)) -//#define _Field_size_bytes_part_(size, count) +#define _Field_size_bytes_part_(size,count) _SAL2_NAME(_Field_size_bytes_part_) _Group_(_Notnull_ _Writable_bytes_(size) _Readable_bytes_(count)) #define _Field_size_bytes_part_opt_(size, count) _SAL2_NAME(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) //#define _Field_size_full_(size) //#define _Field_size_full_opt_(size) From b0100b94abb325a8644d791796f1c88f74be6f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 29 Jun 2014 17:54:59 +0000 Subject: [PATCH 20/75] [NDK] - Add PsGetThreadProcess prototype. - Remove Win32DataCollectionProcedure member in WIN32_CALLOUTS_FPNS structure that doesn't exist in Win2k3 SP1 and SP2. svn path=/trunk/; revision=63673 --- reactos/include/ndk/psfuncs.h | 7 +++++++ reactos/include/ndk/pstypes.h | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h index b45574d78b6..71d4bb7c9d4 100644 --- a/reactos/include/ndk/psfuncs.h +++ b/reactos/include/ndk/psfuncs.h @@ -109,6 +109,13 @@ PsGetThreadId( _In_ PETHREAD Thread ); +NTKERNELAPI +PEPROCESS +NTAPI +PsGetThreadProcess( + _In_ PETHREAD Thread +); + NTKERNELAPI BOOLEAN NTAPI diff --git a/reactos/include/ndk/pstypes.h b/reactos/include/ndk/pstypes.h index 999d8c3602a..b3437418218 100644 --- a/reactos/include/ndk/pstypes.h +++ b/reactos/include/ndk/pstypes.h @@ -576,14 +576,6 @@ NTSTATUS _In_ PVOID Parameter ); -typedef -NTSTATUS -(NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( - _In_ struct _EPROCESS *Process, - _In_ PVOID Callback, - _In_ PVOID Context -); - // // Lego Callback // @@ -1421,7 +1413,6 @@ typedef struct _WIN32_CALLOUTS_FPNS PKWIN32_SESSION_CALLOUT WindowStationDeleteProcedure; PKWIN32_SESSION_CALLOUT WindowStationParseProcedure; PKWIN32_SESSION_CALLOUT WindowStationOpenProcedure; - PKWIN32_WIN32DATACOLLECTION_CALLOUT Win32DataCollectionProcedure; } WIN32_CALLOUTS_FPNS, *PWIN32_CALLOUTS_FPNS; #endif // !NTOS_MODE_USER From 84a819ad64a1e9258b453ea0b090c5313310cc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 29 Jun 2014 18:30:12 +0000 Subject: [PATCH 21/75] [NDK]: Certainly that this member exists only in Vista+. See r63673. svn path=/trunk/; revision=63674 --- reactos/include/ndk/pstypes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/reactos/include/ndk/pstypes.h b/reactos/include/ndk/pstypes.h index b3437418218..d8f1e2329b4 100644 --- a/reactos/include/ndk/pstypes.h +++ b/reactos/include/ndk/pstypes.h @@ -576,6 +576,16 @@ NTSTATUS _In_ PVOID Parameter ); +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +typedef +NTSTATUS +(NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( + _In_ struct _EPROCESS *Process, + _In_ PVOID Callback, + _In_ PVOID Context +); +#endif + // // Lego Callback // @@ -1413,6 +1423,9 @@ typedef struct _WIN32_CALLOUTS_FPNS PKWIN32_SESSION_CALLOUT WindowStationDeleteProcedure; PKWIN32_SESSION_CALLOUT WindowStationParseProcedure; PKWIN32_SESSION_CALLOUT WindowStationOpenProcedure; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PKWIN32_WIN32DATACOLLECTION_CALLOUT Win32DataCollectionProcedure; +#endif } WIN32_CALLOUTS_FPNS, *PWIN32_CALLOUTS_FPNS; #endif // !NTOS_MODE_USER From 2bfabe55222de6907137c439341d85eca7b0ca82 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 30 Jun 2014 12:00:07 +0000 Subject: [PATCH 22/75] [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861 svn path=/trunk/; revision=63675 --- reactos/base/applications/calc/lang/tr-TR.rc | 2 +- .../base/applications/charmap/lang/tr-TR.rc | 2 +- .../base/applications/dxdiag/lang/tr-TR.rc | 2 +- .../games/solitaire/lang/tr-TR.rc | 2 +- .../applications/games/spider/lang/tr-TR.rc | 2 +- .../applications/games/winmine/lang/tr-TR.rc | 2 +- .../base/applications/mplay32/lang/tr-TR.rc | 2 +- .../mscutils/devmgmt/lang/tr-TR.rc | 4 +- .../mscutils/devmgmt_new/lang/tr-TR.rc | 4 +- .../mscutils/eventvwr/lang/tr-TR.rc | 10 +- .../mscutils/servman/lang/tr-TR.rc | 18 +- .../base/applications/mspaint/lang/tr-TR.rc | 12 +- .../base/applications/notepad/lang/tr-TR.rc | 6 +- reactos/base/applications/rapps/lang/tr-TR.rc | 4 +- .../base/applications/taskmgr/lang/tr-TR.rc | 12 +- reactos/base/applications/winhlp32/lang/Tr.rc | 2 +- reactos/base/applications/write/lang/Sq.rc | 2 +- reactos/base/setup/reactos/lang/tr-TR.rc | 12 +- reactos/base/setup/vmwinst/lang/tr-TR.rc | 24 +- reactos/base/setup/welcome/lang/tr-TR.rc | 4 +- reactos/boot/freeldr/fdebug/fdebug.rc | 2 +- reactos/boot/freeldr/fdebug/lang/tr-TR.rc | 14 +- reactos/dll/cpl/access/lang/tr-TR.rc | 82 +++---- reactos/dll/cpl/appwiz/lang/tr-TR.rc | 22 +- reactos/dll/cpl/appwiz/rsrc.rc | 6 +- reactos/dll/cpl/console/lang/tr-TR.rc | 12 +- reactos/dll/cpl/desk/lang/tr-TR.rc | 64 +++--- reactos/dll/cpl/hdwwiz/lang/tr-TR.rc | 66 +++--- reactos/dll/cpl/inetcpl/lang/tr-TR.rc | 24 +- reactos/dll/cpl/input/lang/tr-TR.rc | 74 +++--- reactos/dll/cpl/intl/lang/tr-TR.rc | 92 ++++---- reactos/dll/cpl/joy/lang/tr-TR.rc | 12 +- reactos/dll/cpl/liccpa/lang/tr-TR.rc | 4 +- reactos/dll/cpl/main/lang/tr-TR.rc | 58 ++--- reactos/dll/cpl/mmsys/lang/tr-TR.rc | 98 ++++---- reactos/dll/cpl/powercfg/lang/tr-TR.rc | 56 ++--- reactos/dll/cpl/sysdm/lang/tr-TR.rc | 98 ++++---- reactos/dll/cpl/telephon/lang/tr-TR.rc | 2 +- reactos/dll/cpl/timedate/lang/tr-TR.rc | 18 +- reactos/dll/cpl/usrmgr/lang/tr-TR.rc | 215 ++++++++++++++++++ reactos/dll/cpl/usrmgr/usrmgr.rc | 3 + reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc | 30 +-- reactos/dll/shellext/deskadp/deskadp.rc | 6 +- reactos/dll/shellext/deskadp/lang/tr-TR.rc | 12 +- reactos/dll/shellext/deskmon/deskmon.rc | 6 +- reactos/dll/shellext/deskmon/lang/tr-TR.rc | 2 +- reactos/dll/shellext/slayer/lang/tr-TR.rc | 16 +- reactos/dll/shellext/slayer/slayer.rc | 6 +- reactos/dll/win32/aclui/lang/tr-TR.rc | 2 +- reactos/dll/win32/mpr/lang/mpr_Tr.rc | 14 +- reactos/dll/win32/mpr/mpr.rc | 6 +- reactos/dll/win32/msacm32/lang/msacm_Tr.rc | 16 +- reactos/dll/win32/msacm32/msacm.rc | 6 +- reactos/dll/win32/msi/msi_Tr.rc | 16 +- .../dll/win32/oleaut32/lang/oleaut32_Tr.rc | 12 +- reactos/dll/win32/oleaut32/oleaut32.rc | 6 +- reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc | 8 +- reactos/dll/win32/shlwapi/shlwapi.rc | 6 +- reactos/dll/win32/wininet/lang/wininet_Tr.rc | 14 +- reactos/dll/win32/wininet/rsrc.rc | 6 +- reactos/dll/win32/wldap32/lang/wldap32_Tr.rc | 104 ++++----- reactos/dll/win32/wldap32/wldap32.rc | 6 +- 62 files changed, 834 insertions(+), 616 deletions(-) create mode 100644 reactos/dll/cpl/usrmgr/lang/tr-TR.rc diff --git a/reactos/base/applications/calc/lang/tr-TR.rc b/reactos/base/applications/calc/lang/tr-TR.rc index f7246aec919..ece24b3bc8f 100644 --- a/reactos/base/applications/calc/lang/tr-TR.rc +++ b/reactos/base/applications/calc/lang/tr-TR.rc @@ -310,7 +310,7 @@ END IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sayımlama Kutusu" +CAPTION "Sayımlama Penceresi" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/base/applications/charmap/lang/tr-TR.rc b/reactos/base/applications/charmap/lang/tr-TR.rc index 8abff7d2017..d39cf78b400 100644 --- a/reactos/base/applications/charmap/lang/tr-TR.rc +++ b/reactos/base/applications/charmap/lang/tr-TR.rc @@ -50,7 +50,7 @@ END STRINGTABLE BEGIN - IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki herhangi bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "&Ãœzerine..." IDS_TITLE "Damga EÅŸlemi" END diff --git a/reactos/base/applications/dxdiag/lang/tr-TR.rc b/reactos/base/applications/dxdiag/lang/tr-TR.rc index 9734d84ce80..9b34a0a4188 100644 --- a/reactos/base/applications/dxdiag/lang/tr-TR.rc +++ b/reactos/base/applications/dxdiag/lang/tr-TR.rc @@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bu araç, dizgenizdeki yüklü ReactX bileÅŸenleri ve sürücüleri üzerine ayrıntılı bilgi raporlar.", -1, 10, 10, 443, 17 - LTEXT "Soruna neden olan bölümü biliyorsanız yukarıdaki uygun sekmeyi tıklayınız. Yoksa sırayla her bir bölüme gitmek için aÅŸağıdaki ""Sonraki Bölüm"" düğmesini kullanabilirsiniz.", -1, 10, 30, 443, 25 + LTEXT "Soruna neden olan bölümü biliyorsanız yukarıdaki uygun sekmeyi tıklayınız. Yoksa sırayla tüm bölümlere gitmek için aÅŸağıdaki ""Sonraki Bölüm"" düğmesini kullanabilirsiniz.", -1, 10, 30, 443, 25 GROUPBOX "Dizge Bilgisi", -1, 10, 55, 443, 130, SS_RIGHT LTEXT "Geçerli Zaman:", -1, 70, 70, 80, 10, SS_RIGHT LTEXT "Bilgisayar Adı:", -1, 70, 80, 80, 10, SS_RIGHT diff --git a/reactos/base/applications/games/solitaire/lang/tr-TR.rc b/reactos/base/applications/games/solitaire/lang/tr-TR.rc index 8ddadb88227..55cbc0cd7bd 100644 --- a/reactos/base/applications/games/solitaire/lang/tr-TR.rc +++ b/reactos/base/applications/games/solitaire/lang/tr-TR.rc @@ -30,7 +30,7 @@ BEGIN END IDD_CARDBACK DIALOGEX 6, 6, 186, 104 -CAPTION "Kâğıt Arkalığı Seçme" +CAPTION "Kâğıt Arkalığı Seç" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN diff --git a/reactos/base/applications/games/spider/lang/tr-TR.rc b/reactos/base/applications/games/spider/lang/tr-TR.rc index f6df4f09f76..5a83387815c 100644 --- a/reactos/base/applications/games/spider/lang/tr-TR.rc +++ b/reactos/base/applications/games/spider/lang/tr-TR.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* Dialogs */ IDD_CARDBACK DIALOGEX 6, 6, 186, 104 -CAPTION "Kâğıt Arkalığı Seçme" +CAPTION "Kâğıt Arkalığı Seç" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN diff --git a/reactos/base/applications/games/winmine/lang/tr-TR.rc b/reactos/base/applications/games/winmine/lang/tr-TR.rc index 3a6cc118919..b099f26c890 100644 --- a/reactos/base/applications/games/winmine/lang/tr-TR.rc +++ b/reactos/base/applications/games/winmine/lang/tr-TR.rc @@ -54,7 +54,7 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELL CAPTION "Tebrikler!" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Adınızı giriniz.", -1, 10, 10, 150, 10 + LTEXT "Lütfen adınızı giriniz.", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "Tamam", IDOK, 60, 40, 40, 15 END diff --git a/reactos/base/applications/mplay32/lang/tr-TR.rc b/reactos/base/applications/mplay32/lang/tr-TR.rc index bdf4b2521cc..0d6c416f558 100644 --- a/reactos/base/applications/mplay32/lang/tr-TR.rc +++ b/reactos/base/applications/mplay32/lang/tr-TR.rc @@ -33,7 +33,7 @@ BEGIN IDS_TOOLTIP_SEEKBACK "Geri Sar" IDS_TOOLTIP_SEEKFORW "Ä°leri Sar" IDS_TOOLTIP_FORWARD "Bir Sonrakine Geç" - IDS_APPTITLE "Ortam Oynatıcısı" + IDS_APPTITLE "Çoklu Ortam Oynatıcısı" IDS_PLAY "Çal" IDS_DEFAULTMCIERRMSG "Bu yanlışlığın hiçbir tanımı yoktur." IDS_UNKNOWNFILEEXT "Verilen kütük türünden aygıt türü belirlenemiyor." diff --git a/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc b/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc index 8d1e5ef8434..76638bff41d 100644 --- a/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc +++ b/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc @@ -47,7 +47,7 @@ CAPTION "Aygıt Yöneticisi Ãœzerine" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Aygıt Yöneticisi - Sürüm: 0.1\nTelif Hakkı: 2006\nGed Murphy (gedmurphy@gmail.com) eliyle.", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Aygıt Yöneticisi - Sürüm: 0.1\nTelif Hakkı: 2006\nGed Murphy (gedmurphy@gmail.com) ile.", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN - IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki herhangi bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc index f21d6341a43..1e8e036f6e1 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc @@ -40,7 +40,7 @@ CAPTION "Aygıt Yöneticisi Ãœzerine" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Aygıt Yöneticisi - Sürüm: 0.1\nTelif Hakkı: 2006\nGed Murphy (gedmurphy@gmail.com) eliyle.", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Aygıt Yöneticisi - Sürüm: 0.1\nTelif Hakkı: 2006\nGed Murphy (gedmurphy@gmail.com) ile.", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN - IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki herhangi bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE diff --git a/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc index e60c19c3f34..1b54204c7ec 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -16,9 +16,9 @@ BEGIN MENUITEM "&Güvenlik", ID_LOG_SECURITY MENUITEM "&Dizge", ID_LOG_SYSTEM MENUITEM SEPARATOR - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "&Protokolü Kaydet...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "&Tüm Olayları Sil", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&Çıkış", IDM_EXIT END @@ -98,7 +98,7 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Olay Görüntüleyicisi" IDS_APP_TITLE_EX "%s - %s Oturum Aç \\\\" - IDS_STATUS_MSG "%s'nin %lu olayı var." + IDS_STATUS_MSG "%s -> %lu olay var." IDS_EVENTSTRINGIDNOTFOUND "%s kaynağındaki %lu olay kimliÄŸi için açıklama bulunamıyor. Yerli bilgisayarda, uzak bilgisayardan iletileri görüntülemesi için gerekli DeÄŸer Defteri bilgisi veyâ ileti DLL kütükleri olmayabilir." IDS_EVENTLOG_ERROR_TYPE "Yanlışlık" IDS_EVENTLOG_WARNING_TYPE "Uyarı" @@ -107,8 +107,8 @@ BEGIN IDS_EVENTLOG_AUDIT_FAILURE "BaÅŸarısızlık Denetimi" IDS_EVENTLOG_SUCCESS "BaÅŸarı" IDS_EVENTLOG_UNKNOWN_TYPE "Bilinmeyen Olay" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" - IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Silmeden önce bu olay kaydını kaydetmek ister misiniz?" + IDS_SAVE_FILTER "Olay Kaydı (*.evt)\0*.evt\0" END STRINGTABLE diff --git a/reactos/base/applications/mscutils/servman/lang/tr-TR.rc b/reactos/base/applications/mscutils/servman/lang/tr-TR.rc index e9c1274b80b..4d3aac2fcc2 100644 --- a/reactos/base/applications/mscutils/servman/lang/tr-TR.rc +++ b/reactos/base/applications/mscutils/servman/lang/tr-TR.rc @@ -70,7 +70,7 @@ CAPTION "Himet Yöneticisi Ãœzerine" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Hizmet Yöneticisi - Sürüm: 0.8\nTelif Hakkı: 2005-2007\nGed Murphy (gedmurphy@reactos.org) eliyle.", IDC_STATIC, 48, 7, 135, 30 + LTEXT "Hizmet Yöneticisi - Sürüm: 0.8\nTelif Hakkı: 2005-2007\nGed Murphy (gedmurphy@reactos.org) ile.", IDC_STATIC, 48, 7, 135, 30 PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -97,7 +97,7 @@ BEGIN LTEXT "B&aÅŸlama Türü:", IDC_STATIC, 6, 108, 53, 11 LTEXT "Hizmet Durumu:", IDC_STATIC, 4, 138, 53, 11 LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE - LTEXT "Buradan hizmeti baÅŸlattığınız zaman uygulanan baÅŸlangıç deÄŸiÅŸkenlerini belirtebilirsiniz.", IDC_STATIC, 6, 177, 240, 15 + LTEXT "Buradan hizmeti baÅŸlattığınızda uygulanan baÅŸlangıç deÄŸiÅŸkenlerini belirtebilirsiniz.", IDC_STATIC, 6, 177, 240, 15 LTEXT "Ba&ÅŸlangıç DeÄŸiÅŸkenleri:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "D&üzenle", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED @@ -114,13 +114,13 @@ BEGIN CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67 - LTEXT "Birtakım hizmetler, baÅŸka hizmetlere, dizge sürücülerine ve yükleme sıra öbeklerine bağımlıdır. EÄŸer bir dizge bileÅŸeni, durdurulmuÅŸsa ya da düzgün bir ÅŸekilde çalışmıyorsa bağımlı hizmetler etkilenebilir.", IDC_STATIC, 8, 7, 238, 26 + LTEXT "Birtakım hizmetler, baÅŸka hizmetlere, dizge sürücülerine ve yükleme sıra öbeklerine bağımlıdır. EÄŸer bir dizge bileÅŸeni, durdurulmuÅŸsa ya da düzgün çalışmıyorsa bağımlı hizmetler etkilenebilir.", IDC_STATIC, 8, 7, 238, 26 LTEXT "Bu hizmet aÅŸağıdaki bileÅŸenlere bağımlıdır:", IDC_STATIC, 8, 57, 236, 9 LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 END IDD_DLG_CREATE DIALOGEX 6, 6, 225, 209 -CAPTION "Bir Hizmet OluÅŸturma" +CAPTION "Bir Hizmet OluÅŸtur" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN @@ -140,7 +140,7 @@ BEGIN END IDD_DLG_DELETE DIALOGEX 6, 6, 185, 148 -CAPTION "Bir Hizmet Silme" +CAPTION "Bir Hizmet Sil" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN @@ -155,7 +155,7 @@ BEGIN END IDD_DLG_DEPEND_STOP DIALOGEX 6, 6, 240, 148 -CAPTION "BaÅŸka Hizmetleri Kapatma" +CAPTION "BaÅŸka Hizmetleri Kapat" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN @@ -211,7 +211,7 @@ BEGIN IDS_NUM_SERVICES "Hizmet Sayısı: %d" IDS_STOP_DEPENDS "%s durduÄŸunda bu hizmetler de duracaktır:" IDS_NO_DEPENDS "" - IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki herhangi bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE @@ -233,8 +233,8 @@ BEGIN IDS_PROGRESS_INFO_STOP "ReactOS, aÅŸağıdaki hizmeti durdurmaya çalışıyor:" IDS_PROGRESS_INFO_PAUSE "ReactOS, aÅŸağıdaki hizmeti duraklatmaya çalışıyor:" IDS_PROGRESS_INFO_RESUME "ReactOS, aÅŸağıdaki hizmeti sürdürmeye çalışıyor:" - IDS_CREATE_SUCCESS "Hizmet, baÅŸarılı bir ÅŸekilde oluÅŸturuldu." - IDS_DELETE_SUCCESS "Hizmet, baÅŸarılı bir ÅŸekilde silindi." + IDS_CREATE_SUCCESS "Hizmet, baÅŸarıyla oluÅŸturuldu." + IDS_DELETE_SUCCESS "Hizmet, baÅŸarıyla silindi." IDS_CREATE_REQ "Yıldızla imlenen\nyerler zorunludur." IDS_DELETE_STOP "Hizmeti silmeden önce onu elle durdurmalısınız." END diff --git a/reactos/base/applications/mspaint/lang/tr-TR.rc b/reactos/base/applications/mspaint/lang/tr-TR.rc index 3312dd81872..11b00909982 100644 --- a/reactos/base/applications/mspaint/lang/tr-TR.rc +++ b/reactos/base/applications/mspaint/lang/tr-TR.rc @@ -66,11 +66,11 @@ BEGIN POPUP "&Resim" BEGIN MENUITEM "&Döndür ya da Evir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Yeniden Boyutlandır veyâ EÄŸrilt...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Yeniden Boyutlandır veyâ EÄŸ...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Kırp", IDM_IMAGECROP MENUITEM "&Renkleri Evir\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Öz Nitelikler...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "R&esmi Temizle\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "R&esmi Arıt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "D&onuk Çiz", IDM_IMAGEDRAWOPAQUE END POPUP "R&enkler" @@ -157,7 +157,7 @@ END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Yeniden Boyutlandır veyâ EÄŸrilt" +CAPTION "Yeniden Boyutlandır veyâ EÄŸ" BEGIN GROUPBOX "Yeniden Boyutlandır", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 @@ -168,7 +168,7 @@ BEGIN LTEXT "Dikey:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "EÄŸrilt", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "EÄŸ", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "Yatay:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 @@ -209,8 +209,8 @@ BEGIN IDS_OPENFILTER "Bit EÅŸlem Resimleri (*.bmp, *.dib)\1*.bmp;*.dib\1Tüm Kütükler (*.*)\1*.*\1" IDS_SAVEFILTER "24 Bitlik Bit EÅŸlem Resmi (*.bmp, *.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d çoklu" - IDS_PRINTRES "Her metrekarede %d*%d nokta" - IDS_INTNUMBERS "Yalnızca tam sayı giriniz." + IDS_PRINTRES "Tüm metrekarelerde %d*%d nokta" + IDS_INTNUMBERS "Lütfen yalnızca tam sayı giriniz." IDS_PERCENTAGE "Yüzde 1 ilâ 500 olmalıdır." IDS_ANGLE "Açı -89 ilâ 89 olmalıdır." IDS_LOADERRORTEXT "%s kütüğü yüklenemedi." diff --git a/reactos/base/applications/notepad/lang/tr-TR.rc b/reactos/base/applications/notepad/lang/tr-TR.rc index 5934566c445..211586744dd 100644 --- a/reactos/base/applications/notepad/lang/tr-TR.rc +++ b/reactos/base/applications/notepad/lang/tr-TR.rc @@ -134,7 +134,7 @@ END STRINGTABLE BEGIN - STRING_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki herhangi bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + STRING_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE @@ -152,8 +152,8 @@ BEGIN STRING_UNTITLED "Adsız" STRING_ALL_FILES "Tüm Kütükler (*.*)" STRING_TEXT_FILES_TXT "Metin Belgeleri (*.txt)" - STRING_TOOLARGE "%s kütüğü Not Defteri için çok büyük. BaÅŸka bir düzenleyici kullanınız." - STRING_NOTEXT "Hiçbir metin girmediniz. BirÅŸeyler yazıp yeniden deneyiniz." + STRING_TOOLARGE "%s kütüğü Not Defteri için çok büyük. Lütfen baÅŸka bir düzenleyici kullanınız." + STRING_NOTEXT "Hiçbir metin girmediniz. Lütfen birÅŸeyler yazıp yeniden deneyiniz." STRING_DOESNOTEXIST "%s kütüğü yok. Yeni bir kütük oluÅŸturmak ister misiniz?" STRING_NOTSAVED "%s kütüğü deÄŸiÅŸtirilmiÅŸ. DeÄŸiÅŸiklikleri kaydetmek ister misiniz?" STRING_NOTFOUND "%s bulunamadı." diff --git a/reactos/base/applications/rapps/lang/tr-TR.rc b/reactos/base/applications/rapps/lang/tr-TR.rc index bd0a12ffb37..9459c1fe3d7 100644 --- a/reactos/base/applications/rapps/lang/tr-TR.rc +++ b/reactos/base/applications/rapps/lang/tr-TR.rc @@ -100,7 +100,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME CAPTION "Ãœzerine" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Uygulama Yöneticisi\nTelif Hakkı: 2009 - \nDmitry Chapyshev (dmitry@reactos.org) eliyle yazılmıştır.", IDC_STATIC, 48, 7, 130, 39 + LTEXT "ReactOS Uygulama Yöneticisi\nTelif Hakkı: 2009\nDmitry Chapyshev (dmitry@reactos.org) ile.", IDC_STATIC, 48, 7, 130, 39 PUSHBUTTON "Tamam", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END @@ -179,7 +179,7 @@ BEGIN IDS_UNINSTALL "Kaldır" IDS_MODIFY "DeÄŸiÅŸtir" IDS_APPS_COUNT "Uygulama Sayısı: %d" - IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoÅŸgeldiniz.\n\n" + IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoÅŸ geldiniz.\n\n" IDS_WELCOME_TEXT "Solda bir ulam seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un Umûmî AÄŸ sitesi: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Kurulanlar" diff --git a/reactos/base/applications/taskmgr/lang/tr-TR.rc b/reactos/base/applications/taskmgr/lang/tr-TR.rc index 93329ebe90f..101d781baff 100644 --- a/reactos/base/applications/taskmgr/lang/tr-TR.rc +++ b/reactos/base/applications/taskmgr/lang/tr-TR.rc @@ -159,7 +159,7 @@ BEGIN CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "&Ä°ÅŸlemi Sonlandır", IDC_ENDPROCESS, 171, 189, 69, 14 - CONTROL "&Her Kullanıcının Ä°ÅŸlemlerini Göster", IDC_SHOWALLPROCESSES, "Button", + CONTROL "&Tüm Kullanıcıların Ä°ÅŸlemlerini Göster", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 END @@ -323,10 +323,10 @@ BEGIN ID_VIEW_REFRESH "Yenileme Hızı ayârını önemsemeden Görev Yöneticisi'ni ÅŸimdi yenilemeye zorlar." ID_VIEW_LARGE "Görevleri büyük simgeler kullanarak gösterir." ID_VIEW_SMALL "Görevleri küçük simgeler kullanarak gösterir." - ID_VIEW_DETAILS "Her bir görev için bilgi görüntüler." - ID_VIEW_UPDATESPEED_HIGH "Her sâniyede iki kez görünümü yeniler." - ID_VIEW_UPDATESPEED_NORMAL "Her iki sâniyede bir görünümü yeniler." - ID_VIEW_UPDATESPEED_LOW "Her dört sâniyede bir görünümü yeniler." + ID_VIEW_DETAILS "Her bir görev üzerine bilgi görüntüler." + ID_VIEW_UPDATESPEED_HIGH "Sâniyede iki kez görünümü yeniler." + ID_VIEW_UPDATESPEED_NORMAL "Ä°ki sâniyede bir görünümü yeniler." + ID_VIEW_UPDATESPEED_LOW "Dört sâniyede bir görünümü yeniler." END STRINGTABLE @@ -345,7 +345,7 @@ BEGIN ID_VIEW_SELECTCOLUMNS "Ä°ÅŸlemler sayfasında hangi dikeçlerin görünür olacağını seçer." ID_VIEW_SHOWKERNELTIMES "BaÅŸarım çizgelerinde çekirdek sürelerini görüntüler." ID_VIEW_CPUHISTORY_ONEGRAPHALL "Bir bayağı geçmiÅŸ çizgesi toplam CPU kullanımını gösterir." - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Her bir CPU'nun kendi geçmiÅŸ çizgesi vardır." + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Her CPU'nun kendi geçmiÅŸ çizgesi vardır." ID_APPLICATION_PAGE_SWITCHTO "Bir görevi ön plana getirir, o göreve odaklatır." END diff --git a/reactos/base/applications/winhlp32/lang/Tr.rc b/reactos/base/applications/winhlp32/lang/Tr.rc index 1de9609571c..3e736bed6fe 100644 --- a/reactos/base/applications/winhlp32/lang/Tr.rc +++ b/reactos/base/applications/winhlp32/lang/Tr.rc @@ -1,7 +1,7 @@ /* * Turkish Resources for ReactOS Winhlp32 * - * Copyrights: 2006 Fatih Aşıcı (fasici@linux-sevenler.org), 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) + * Copyrights: 2006 Fatih Aşıcı (fasici@linux-sevenler.org); 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/base/applications/write/lang/Sq.rc b/reactos/base/applications/write/lang/Sq.rc index ec40c93c639..b16ddab53d3 100644 --- a/reactos/base/applications/write/lang/Sq.rc +++ b/reactos/base/applications/write/lang/Sq.rc @@ -2,7 +2,7 @@ * Albanian language support * * Copyright (C) 2007 Mikolaj Zalewski - * TRANALTOR: Ardit Dani + * TRANSALTOR: Ardit Dani * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/base/setup/reactos/lang/tr-TR.rc b/reactos/base/setup/reactos/lang/tr-TR.rc index 0468cd7c2f8..6f21236e7d4 100644 --- a/reactos/base/setup/reactos/lang/tr-TR.rc +++ b/reactos/base/setup/reactos/lang/tr-TR.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Kur Büyücüsü'ne HoÅŸgeldiniz", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "ReactOS Kur Yardımcısı'na HoÅŸ Geldiniz", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Daha bu CD'den ReactOS'u doÄŸrudan kuramazsınız. Lütfen ReactOS'u kurmak için bu CD'den bilgisayarınızı yeniden baÅŸlatınız.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Kur'dan çıkmak için Ä°ptal'e tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END @@ -67,7 +67,7 @@ END IDD_PARTITION DIALOGEX 0, 0, 145, 90 STYLE WS_VISIBLE | WS_CAPTION -CAPTION "Bölüm OluÅŸturma" +CAPTION "Bölüm OluÅŸtur" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 @@ -89,8 +89,8 @@ BEGIN CONTROL "Kurulum Dizini", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE CONTROL "Ön Yükleyici Kurulumu", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Ön yükleyiciyi diskin üzerine kur. (MBR ve VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Ön yükleyiciyi diskin üzerine kur. (Yalnızca VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 + CONTROL "Ön yükleyiciyi sâbit diskin üzerine kur. (MBR ve VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 + CONTROL "Ön yükleyiciyi sâbit diskin üzerine kur. (Yalnızca VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 CONTROL "Ön yükleyici kurulumu yok.", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 PUSHBUTTON "Tamam", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "Ä°ptal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE @@ -122,7 +122,7 @@ CAPTION "ReactOS Kurulumunun Bitirilmesi" FONT 8, "MS Shell Dlg" BEGIN CONTROL "ReactOS Kurulumunun Ä°lk AÅŸaması Bitmesi", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "ReactOS kurulumunun ilk aÅŸamasını baÅŸarılı bir ÅŸekilde bitirdiniz.", IDC_STATIC, 20, 50, 277, 10 + LTEXT "ReactOS kurulumunun ilk aÅŸamasını baÅŸarıyla bitirdiniz.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Bitir'e tıkladığınızda bilgisayarınız yeniden baÅŸlatılacaktır.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 LTEXT "EÄŸer bir sürücüde bir CD varsa onu çıkartınız. Sonra, bilgisayarınızı yeniden baÅŸlatmak için Bitir'e tıklayınız.", IDC_STATIC, 10, 180, 297, 20 @@ -132,7 +132,7 @@ STRINGTABLE BEGIN IDS_LANGTITLE "Dil Seçimi" IDS_LANGSUBTITLE "Kurulum ve son dizge dilini seçiniz." - IDS_TYPETITLE "ReactOS Kur'a HoÅŸgeldiniz" + IDS_TYPETITLE "ReactOS Kur'a HoÅŸ Geldiniz" IDS_TYPESUBTITLE "Kurulum türünü seçiniz." IDS_DEVICETITLE "Ana Aygıtların Kurulumu" IDS_DEVICESUBTITLE "Görüntü ve düğme takımı ayarlarını yapınız." diff --git a/reactos/base/setup/vmwinst/lang/tr-TR.rc b/reactos/base/setup/vmwinst/lang/tr-TR.rc index 657dcb770fd..4bbf06b54cd 100644 --- a/reactos/base/setup/vmwinst/lang/tr-TR.rc +++ b/reactos/base/setup/vmwinst/lang/tr-TR.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vidyo Sürücüsü Kurulumu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "VMware(r) SVGA sürücüsü, baÅŸarılı bir ÅŸekilde kuruldu. Lütfen gözde görüntülük çözünürlüğünüzü seçiniz:", -1, 25, 5, 225, 20 + LTEXT "VMware(r) SVGA sürücüsü, baÅŸarıyla kuruldu. Lütfen gözde görüntülük çözünürlüğünüzü seçiniz:", -1, 25, 5, 225, 20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON @@ -66,7 +66,7 @@ BEGIN PUSHBUTTON "Görüntülük Ayarlarını Yapılandırma", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "BaÅŸka Bir Çizge Sürücüsü Kurma", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "VMware(r) SVGA Sürücüsünü Kaldırma", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Sürdürmek için ""Ä°leri""ye ya da büyücüden çıkmak için ""Ä°ptal""e tıklayınız.", -1, 25, 93, 225, 19 + LTEXT "Sürdürmek için ""Ä°leri""ye ya da yardımcıdan çıkmak için ""Ä°ptal""e tıklayınız.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -102,9 +102,9 @@ END STRINGTABLE BEGIN - 10001 "En Düşük (Her Noktada 8 Bit)" - 10002 "Orta (Her Noktada 16 Bit)" - 10003 "En Yüksek (Her Noktada 32 Bit)" + 10001 "En Düşük (Tüm Noktalarda 8 Bit)" + 10002 "Orta (Tüm Noktalarda 16 Bit)" + 10003 "En Yüksek (Tüm Noktalarda 32 Bit)" END STRINGTABLE @@ -116,18 +116,18 @@ END STRINGTABLE BEGIN - IDD_INSERT_VMWARE_TOOLSTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_INSERT_VMWARE_TOOLSTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_INSERT_VMWARE_TOOLSSUBTITLE "Lütfen VMWare(r) Araç CD-ROM'unu takınız." - IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VMware(r) SVGA sürücüsünü arayınız ve çoÄŸaltınız." - IDD_CONFIGTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_CONFIGTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_CONFIGSUBTITLE "Gözde görüntülük çözünürlüğünüzü seçiniz." - IDD_INSTALLATION_FAILEDTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_INSTALLATION_FAILEDTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_INSTALLATION_FAILEDSUBTITLE "VMware(r) SVGA sürücüsünün kurulumu baÅŸarısız oldu." - IDD_CHOOSEACTIONTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_CHOOSEACTIONTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_CHOOSEACTIONSUBTITLE "Ne yapmak istediÄŸinizi seçiniz." - IDD_SELECTDRIVERTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_SELECTDRIVERTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_SELECTDRIVERSUBTITLE "Bir sürücü seçiniz." - IDD_DOUNINSTALLTITLE "VMware(r) SVGA Sürücüsünün Kurulum Büyücüsü" + IDD_DOUNINSTALLTITLE "VMware(r) SVGA Sürücüsünün Kurulum Yardımcısı" IDD_DOUNINSTALLSUBTITLE "Sürücüyü kaldırınız." END diff --git a/reactos/base/setup/welcome/lang/tr-TR.rc b/reactos/base/setup/welcome/lang/tr-TR.rc index 78802c65f12..abde0ea6344 100644 --- a/reactos/base/setup/welcome/lang/tr-TR.rc +++ b/reactos/base/setup/welcome/lang/tr-TR.rc @@ -7,9 +7,9 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* Default settings */ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS - HoÅŸgeldiniz" + IDS_APPTITLE "ReactOS - HoÅŸ Geldiniz" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "React Ä°ÅŸletim Dizgesi'ne hoÅŸgeldiniz.\n\nSolda bir konuya tıklayınız." + IDS_DEFAULTTOPICDESC "React Ä°ÅŸletim Dizgesi'ne hoÅŸ geldiniz.\n\nSolda bir konuya tıklayınız." // IDS_CHECKTEXT "Bu iletiyi yine göster." // IDS_CLOSETEXT "Çıkış" END diff --git a/reactos/boot/freeldr/fdebug/fdebug.rc b/reactos/boot/freeldr/fdebug/fdebug.rc index 3660a9a7e80..7ed576885bb 100644 --- a/reactos/boot/freeldr/fdebug/fdebug.rc +++ b/reactos/boot/freeldr/fdebug/fdebug.rc @@ -26,6 +26,6 @@ IDI_FDEBUG ICON "fdebug.ico" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" +#include "lang/sq-AL.rc" #include "lang/tr-TR.rc" #include "lang/uk-UA.rc" -#include "lang/sq-AL.rc" diff --git a/reactos/boot/freeldr/fdebug/lang/tr-TR.rc b/reactos/boot/freeldr/fdebug/lang/tr-TR.rc index 8531e5e28c0..0f577efb25d 100644 --- a/reactos/boot/freeldr/fdebug/lang/tr-TR.rc +++ b/reactos/boot/freeldr/fdebug/lang/tr-TR.rc @@ -10,7 +10,7 @@ BEGIN MENUITEM "&BaÄŸlan", IDM_FILE_CONNECT MENUITEM "B&aÄŸlantıyı Kes", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Görüntüyü Temizle", IDM_FILE_CLEARDISPLAY + MENUITEM "&Görüntüyü Sil", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR MENUITEM "&Yakalamayı BaÅŸlat", IDM_FILE_STARTCAPTURE MENUITEM "Ya&kalamayı Durdur", IDM_FILE_STOPCAPTURE, GRAYED @@ -39,7 +39,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "FreeLoader Yanlışlık Ayıklayıcı Ãœzerine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "FreeLoader Yanlışlık Ayıklayıcı - Sürüm 1.0\nTelif Hakkı: 2003 - Brian Palmer\n(brianp@reactos.org)", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26 + CONTROL "FreeLoader Yanlışlık Ayıklayıcı - Sürüm 1.0\nTelif Hakkı: 2003\nBrian Palmer(brianp@reactos.org) ile.", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26 DEFPUSHBUTTON "Tamam", IDOK, 183, 189, 44, 14, WS_GROUP ICON IDI_FDEBUG, IDC_STATIC, 19, 30, 20, 20 EDITTEXT IDC_LICENSE_EDIT, 53, 63, 174, 107, ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -50,9 +50,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "BaÄŸlantı Seçenekleri" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "COM giriÅŸini giriniz: (Örnek: COM1)", IDC_STATIC, 7, 7, 108, 8 + LTEXT "COM giriÅŸini giriniz (Örnek: COM1): ", IDC_STATIC, 7, 7, 108, 8 EDITTEXT IDC_COMPORT, 7, 17, 182, 14, ES_AUTOHSCROLL - LTEXT "Baud hızını giriniz: (Örnek: 115200)", IDC_STATIC, 7, 38, 114, 8 + LTEXT "Baud hızını giriniz (Örnek: 115200): ", IDC_STATIC, 7, 38, 114, 8 EDITTEXT IDC_BAUTRATE, 7, 48, 182, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "Tamam", IDOK, 45, 79, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 100, 79, 50, 14 @@ -60,10 +60,10 @@ END IDD_CAPTURE DIALOGEX 0, 0, 251, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kütük Yakalama" +CAPTION "Yakalama Kütüğü" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Yakalanacak Kütük Adı:", IDC_STATIC, 7, 17, 62, 8 + LTEXT "Yakalama Kütüğü Adı:", IDC_STATIC, 7, 17, 62, 8 EDITTEXT IDC_CAPTUREFILENAME, 7, 26, 181, 14, ES_AUTOHSCROLL PUSHBUTTON "&Göz At", IDC_BROWSE, 194, 26, 50, 14 DEFPUSHBUTTON "Tamam", IDOK, 139, 74, 50, 14 @@ -81,5 +81,5 @@ END STRINGTABLE BEGIN - IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki herhangi bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "ÖNEMLÄ°: AÅŸağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size baÄŸlı.) koÅŸulları altında yeniden dağıtabilir veyâ deÄŸiÅŸtirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceÄŸi beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBÄ°R GÃœVENCESÄ° YOKTUR, SATILABÄ°LÄ°RLİĞİN ve BELÄ°RLÄ° BÄ°R AMACA UYGUNLUÄžUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eÄŸer yoksa Özgür Yazılım Vakfı AÅž'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END diff --git a/reactos/dll/cpl/access/lang/tr-TR.rc b/reactos/dll/cpl/access/lang/tr-TR.rc index fc62f56e062..c9f50a8f1cd 100644 --- a/reactos/dll/cpl/access/lang/tr-TR.rc +++ b/reactos/dll/cpl/access/lang/tr-TR.rc @@ -8,17 +8,17 @@ CAPTION "Düğme Takımı" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Yapışkan Düğmeler", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Düğmeleri Ãœst Damga, Denetim ve Seçenek düğmeleriyle tek tek kullanmak için Yapışkan Düğmeler'i kullanınız.", + LTEXT "EÄŸer bir kez bir düğmeye basarak Ãœst Damga, Denetim ve Seçenek düğmelerini kullanmak istiyorsanız Yapışkan Düğmeler'i kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Yapışkan Düğmeler'i Kullan", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Ayarlar", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "Süzgeç Düğmeleri", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Kısa veyâ yinelenen düğme vuruÅŸlarının yok sayılması için veyâ yinelenme hızını yavaÅŸlatmak için Süzgeç Düğmeleri'ni kullanınız.", + LTEXT "EÄŸer ReactOS'un kısa veyâ yinelenen düğme vuruÅŸlarını yok saymasını veyâ yinelenme hızını yavaÅŸlatmasını istiyorsanız Süzgeç Düğmeleri'ni kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Süzgeç Düğmeleri'ni Kullan", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Aya&rlar", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "GeçiÅŸ Düğmeleri", -1, PROPSHEETPADDING(1), LABELLINE(16) + 3, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Büyük Harf Kilidi'ni, Sayılık Kilit'i ve Kaydırma Kilidi'ni basarken ses çıkması için GeçiÅŸ Düğmeleri'ni kullanınız.", + LTEXT "EÄŸer Büyük Harf Kilidi'ni, Sayılık Kilit'i ve Kaydırma Kilidi'ni basarken ses duymanızı istiyorsanız GeçiÅŸ Düğmeleri'ni kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(18) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) AUTOCHECKBOX "&GeçiÅŸ Düğmeleri'ni Kullan", IDC_TOGGLE_BOX, PROPSHEETPADDING(2), LABELLINE(20) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Ayar&lar", IDC_TOGGLE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(20) + 2, PROPSHEETPADDING(15), 14 @@ -32,30 +32,30 @@ CAPTION "Ses" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ses Nöbetçisi", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Dizge bir ses çıkardığında basarî uyarının da oluÅŸması için Ses Nöbetçisi'ni kullanınız.", + LTEXT "EÄŸer dizgeniz bir ses çıkardığında ReactOS'un görmelik uyarılar oluÅŸturmasını istiyorsanız Ses Nöbetçisi'ni kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Ses Nöbetçisi'ni Kullan", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "&AÅŸağıdaki Uyarıyı Kullan:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "ShowSounds", -1, PROPSHEETPADDING(1), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Ä°zlencelerin ürettiÄŸi seslerle konuÅŸma altyazılarını göstermek için ShowSounds kullanınız.", + GROUPBOX "Ses Göster", -1, PROPSHEETPADDING(1), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 + LTEXT "KonuÅŸma alt yazılarını ve çıkardıkları sesleri göstermek nedeniyle izlencelerinize bildirmek için Ses Göster'i kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(14) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) - AUTOCHECKBOX "S&howSounds Kullan", IDC_SSHOW_BOX, PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 + AUTOCHECKBOX "S&es Göster'i Kullan", IDC_SSHOW_BOX, PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Görünüm" +CAPTION "Görüntü" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Yüksek Karşıtlık", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Kolay okuma için tasarlanmış renklerle yazı tipleri için bu seçeneÄŸi kullanınız.", + LTEXT "EÄŸer ReactOS'un kolay okuma için tasarlanmış renklerle yazı tiplerini kullanmasını istiyorsanız bu seçeneÄŸi kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Yüksek Karşıtlık Kullan", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Ayarlar", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "Ä°mleç Ayarları", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(13) - LTEXT "Ä°mleç geniÅŸliÄŸini ve imlecin yanıp sönme hızını deÄŸiÅŸtirmek için bu sürgüleri kullanınız.", + LTEXT "Ä°mleç geniÅŸliÄŸini ve imlecin yanıp sönme hızını deÄŸiÅŸtirmek için sürgüleri kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(9) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) CTEXT "Ya&nıp Sönme Hızı:", -1, PROPSHEETPADDING(2), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) LTEXT "Yok", -1, PROPSHEETPADDING(3), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1) @@ -76,7 +76,7 @@ CAPTION "Fâre" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Fâre Düğmeleri", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Fâre imlecini sayılık düğme takımı ile denetlemek için bu seçeneÄŸi kullanınız.", + LTEXT "EÄŸer imleci düğme takımınızdaki sayılık düğme takımıyla denetlemek istiyorsanız bu seçeneÄŸi kullanınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Fâre Düğmeleri'ni Kullan", IDC_MOUSE_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Ayarlar", IDC_MOUSE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 @@ -88,45 +88,45 @@ CAPTION "Umûmî" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "KendiliÄŸinden Yeniden Ayarla", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) - AUTOCHECKBOX "&Åžu Denli BoÅŸta Kalındığında Tüm EriÅŸilebilirlik Husûsiyetlerini Kapat:", + AUTOCHECKBOX "&Åžu Denli BoÅŸta Kaldıktan Sonra EriÅŸilebilirlik Husûsiyetlerini Kapat:", IDC_RESET_BOX, PROPSHEETPADDING(2), LABELLINE(2) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Bildirim", -1, PROPSHEETPADDING(1), LABELLINE(7) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) - AUTOCHECKBOX "&Bir Husûsiyet Açıldığında Bir Uyarı Ä°letisi Çıkar", IDC_NOTIFICATION_MESSAGE, + AUTOCHECKBOX "&Bir Husûsiyet Açıldığında Uyarı Ä°letisi Göster", IDC_NOTIFICATION_MESSAGE, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 AUTOCHECKBOX "B&ir Husûsiyet Açıldığında ve Kapatıldığında Bir Ses Çıkar", IDC_NOTIFICATION_SOUND, PROPSHEETPADDING(2), LABELLINE(10) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 GROUPBOX "Dizilik Düğme Aygıtları", -1, PROPSHEETPADDING(1), LABELLINE(13) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) - LTEXT "Dizilik Düğme aygıtları, düğme takımı ve fâre iÅŸlevleri için eriÅŸim seçeneÄŸi sunar.", + LTEXT "Dizilik Düğme aygıtları, düğme takımı ve fâre husûsiyetleri için baÅŸka eriÅŸim saÄŸlar.", -1, PROPSHEETPADDING(2), LABELLINE(14) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) AUTOCHECKBOX "&Dizilik Düğme Aygıtlarını Destekle", IDC_SERIAL_BOX, PROPSHEETPADDING(2), LABELLINE(16) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Ayarlar", IDC_SERIAL_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(16) - 4, PROPSHEETPADDING(15), 14 - GROUPBOX "Yönetim Ayarları", -1, PROPSHEETPADDING(1), LABELLINE(19) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) - AUTOCHECKBOX "&Tüm Ayarları Oturum Açma Masaüstüne Uygula", IDC_ADMIN_LOGON_BOX, + GROUPBOX "Yönetim Seçenekleri", -1, PROPSHEETPADDING(1), LABELLINE(19) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) + AUTOCHECKBOX "&Oturum Açma Masaüstüne Tüm Ayarları Uygula", IDC_ADMIN_LOGON_BOX, PROPSHEETPADDING(2), LABELLINE(20) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 - AUTOCHECKBOX "T&üm Ayarları Yeni OluÅŸturulacak Kullanıcıların Ön Tanımlılarına Uygula", IDC_ADMIN_USERS_BOX, + AUTOCHECKBOX "&Yeni OluÅŸturulacak Kullanıcılar İçin Ön Tanımlılara Tüm Ayarları Uygula", IDC_ADMIN_USERS_BOX, PROPSHEETPADDING(2), LABELLINE(22) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 END IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Yapışkan Düğmelerin Ayarları" +CAPTION "Yapışkan Düğmeler Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Düğmeler", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Yapışkan Düğmeler'i etkinleÅŸtirmek için Ãœst Damga düğmesine 5 kez art arda basınız.", + LTEXT "Yapışkan Düğmeler husûsiyetini etkinleÅŸtirmek için Ãœst Damga düğmesine 5 kez basınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Yapışkan Düğmeler'i EtkinleÅŸtir", IDC_STICKY_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 GROUPBOX "Seçenekler", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) - AUTOCHECKBOX "&Kilitlemek İçin DeÄŸiÅŸtirici Düğmeye Ä°ki Kez Basılsın", IDC_STICKY_LOCK_CHECK, + AUTOCHECKBOX "&Kilitlemek İçin Ä°ki Kez DeÄŸiÅŸtirici Düğmeye Bas", IDC_STICKY_LOCK_CHECK, PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 - AUTOCHECKBOX "&Ä°ki Düğmeye Aynı Anda Basıldığında Yapışkan Düğmeler'i Kapat", IDC_STICKY_UNLOCK_CHECK, + AUTOCHECKBOX "&EÄŸer Ä°ki Düğmeye Birden Basılırsa Yapışkan Düğmeler'i Kapat", IDC_STICKY_UNLOCK_CHECK, PROPSHEETPADDING(2), LABELLINE(12), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 GROUPBOX "Bildirimler", -1, PROPSHEETPADDING(1), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) AUTOCHECKBOX "&DeÄŸiÅŸtirici Düğmeye Basıldığında Ses Çıkar", IDC_STICKY_SOUND_CHECK, PROPSHEETPADDING(2), LABELLINE(16) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 - AUTOCHECKBOX "&Görüntülükte Yapışkan Düğmeler'in Durumunu Göster", IDC_STICKY_STATUS_CHECK, + AUTOCHECKBOX "&Görüntülükte Yapışkan Düğmeler Durumunu Göster", IDC_STICKY_STATUS_CHECK, PROPSHEETPADDING(2), LABELLINE(18), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 DEFPUSHBUTTON "Tamam", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 @@ -138,7 +138,7 @@ CAPTION "Süzgeç Düğmeleri Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Düğme Takımı Kısayolu", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Süzgeç Düğmeleri İçin Kısayol: \nSaÄŸ Ãœst Damga düğmesine 8 sâniye boyunca basınız.", + LTEXT "Süzgeç Düğmeleri İçin Kısayol: \nSaÄŸ Ãœst Damga'ya 8 sâniye süresince basılı tutunuz.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Kısayol Kullan", IDC_FILTER_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 GROUPBOX "Süzgeç Ayarları", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(8) + 5 @@ -148,12 +148,12 @@ BEGIN PROPSHEETPADDING(2), LABELLINE(11) + 5, PROPSHEETPADDING(20), LABELLINE(2), BS_TOP | BS_MULTILINE PUSHBUTTON "&Ayarlar", IDC_FILTER_BOUNCE_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(9) + 5, PROPSHEETPADDING(15), 14, WS_GROUP PUSHBUTTON "Aya&rlar", IDC_FILTER_REPEAT_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(11) + 5, PROPSHEETPADDING(15), 14, WS_GROUP - LTEXT "Ayar&ları sınamak için buraya tıklayıp birÅŸeyler yazınız:", -1, PROPSHEETPADDING(2), LABELLINE(14) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + LTEXT "Ayar&ları sınamak için buraya tıklayınız ve birÅŸeyler yazınız:", -1, PROPSHEETPADDING(2), LABELLINE(14) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) EDITTEXT IDC_FILTER_TEST_EDIT, PROPSHEETPADDING(2), LABELLINE(15) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14, WS_GROUP | ES_AUTOHSCROLL GROUPBOX "Bildirimler", -1, PROPSHEETPADDING(1), LABELLINE(17) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + 3 AUTOCHECKBOX "&Düğmelere Basıldığında veyâ DoÄŸrulandığında Ses Çıkar", IDC_FILTER_SOUND_CHECK, PROPSHEETPADDING(2), LABELLINE(19), PROPSHEETWIDTH - PROPSHEETPADDING(4), 10 - AUTOCHECKBOX "&Görüntülükte Süzgeç Düğmeleri'nin Durumunu Göster", IDC_FILTER_STATUS_CHECK, + AUTOCHECKBOX "&Görüntülükte Süzgeç Düğmeleri Durumunu Göster", IDC_FILTER_STATUS_CHECK, PROPSHEETPADDING(2), LABELLINE(20) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(4), 10 DEFPUSHBUTTON "Tamam", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 @@ -165,7 +165,7 @@ CAPTION "GeçiÅŸ Düğmeleri Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Düğme Takımı Kısayolu", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "GeçiÅŸ Düğmeleri İçin Kısayol: \nSayılık Kilit düğmesine beÅŸ sâniye boyunca basınız.", + LTEXT "GeçiÅŸ Düğmeleri İçin Kısayol: \nSayılık Kilit'e beÅŸ sâniye süresince basılı tutunuz.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Kısayol Kullan", IDC_TOGGLE_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 DEFPUSHBUTTON "Tamam", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 @@ -178,7 +178,7 @@ CAPTION "Yüksek Karşıtlık Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Düğme Takımı Kısayolu", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Yüksek Karşıtlık İçin Kısayol: \nSol Seçenek, Sol Ãœst Damga ve Görüntülüğü Yazdır düğmelerine basınız.", + LTEXT "Yüksek Karşıtlık İçin Kısayol: \nSol Seçenek, Sol Ãœst Damga ve Görüntülüğü Yazdır'a basınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Kısayol Kullan", IDC_CONTRAST_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 GROUPBOX "Yüksek Karşıtlık Renk Düzeni", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) @@ -195,7 +195,7 @@ CAPTION "Fâre Düğmeleri Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Düğme Takımı Kısayolu", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Fâre Düğmeleri İçin Kısayol: \nSol Seçenek, Sol Ãœst Damga ve Sayılık Kilit düğmelerine basınız.", + LTEXT "Fâre Düğmeleri İçin Kısayol: \nSol Seçenek, Sol Ãœst Damga ve Sayılık Kilit'e basınız.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Kısayol Kullan", IDC_MOUSEKEYS_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 @@ -210,12 +210,12 @@ BEGIN CONTROL "", IDC_MOUSEKEYS_ACCEL_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, PROPSHEETPADDING(15), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(22), LABELLINE(2) LTEXT "Çok", -1, PROPSHEETWIDTH - PROPSHEETPADDING(7), LABELLINE(13) + 4, PROPSHEETPADDING(3), LABELLINE(1) - AUTOCHECKBOX "&Hızlandırmak için Denetim düğmesine, yavaÅŸlatmak için Ãœst Damga düğmesine basılsın.", IDC_MOUSEKEYS_SPEED_CHECK, + AUTOCHECKBOX "&Hızlandırmak İçin Denetim'e, YavaÅŸlatmak İçin Ãœst Damga'ya Basılı Tut", IDC_MOUSEKEYS_SPEED_CHECK, PROPSHEETPADDING(2), LABELLINE(16), PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 - LTEXT "Sayılık Kilit Şöyleyken Fâre Düğmelerini Kullan:", -1, PROPSHEETPADDING(1), LABELLINE(18) + 7, PROPSHEETPADDING(20), LABELLINE(1) + LTEXT "Sayılık Kilit Şöyleyken Fâre Düğmeleri'ni Kullan:", -1, PROPSHEETPADDING(1), LABELLINE(18) + 7, PROPSHEETPADDING(20), LABELLINE(1) AUTORADIOBUTTON "&Açık", IDC_MOUSEKEYS_ON_RADIO, PROPSHEETWIDTH - PROPSHEETPADDING(14), LABELLINE(18) + 7, PROPSHEETPADDING(5), LABELLINE(1) AUTORADIOBUTTON "Ka&palı", IDC_MOUSEKEYS_OFF_RADIO, PROPSHEETWIDTH - PROPSHEETPADDING(8), LABELLINE(18) + 7, PROPSHEETPADDING(5), LABELLINE(1) - AUTOCHECKBOX "&Görüntülükte Fâre Düğmeleri'nin Durumunu Göster", IDC_MOUSEKEYS_STATUS_CHECK, + AUTOCHECKBOX "&Görüntülükte Fâre Düğmeleri Durumunu Göster", IDC_MOUSEKEYS_STATUS_CHECK, PROPSHEETPADDING(1), LABELLINE(20) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 DEFPUSHBUTTON "Tamam", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, PROPSHEETWIDTH - 57, PROPSHEETHEIGHT - 21, 50, 14 @@ -227,7 +227,7 @@ CAPTION "GeliÅŸmiÅŸ Süzgeç Düğmeleri Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Sıçrama Düğmeleri", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) - LTEXT "&Åžundan Sonra Hızlı Yinelenen Düğme VuruÅŸlarını Yok Say:", -1, PROPSHEETPADDING(2), LABELLINE(2) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) + LTEXT "&Åžundan Daha Hızlı Yinelenen Düğme VuruÅŸlarını Yok Say:", -1, PROPSHEETPADDING(2), LABELLINE(2) + 1, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "&Sınama Yeri:", -1, PROPSHEETPADDING(1), LABELLINE(7) + 3, PROPSHEETPADDING(8), LABELLINE(1) @@ -242,10 +242,10 @@ CAPTION "GeliÅŸmiÅŸ Süzgeç Düğmeleri Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Yinelenen Düğmeler", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(12) - LTEXT "Denetim Masası'ndaki Düğme Takımı Ayarlarını Geçersiz Kıl:", + LTEXT "Düğme Takımı Denetim Masası'ndaki Ayarları Geçersiz Kıl:", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) - AUTORADIOBUTTON "&Düğme Yinelenmesi Olmasın", IDC_REPEAT_NOREPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(3) + 3, 78, LABELLINE(1), WS_GROUP - AUTORADIOBUTTON "D&üğme Yinelenmesini YavaÅŸlat", IDC_REPEAT_REPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(4) + 7, 131, LABELLINE(1) + AUTORADIOBUTTON "&Düğme Takımı Yinelenmesi Yok", IDC_REPEAT_NOREPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(3) + 3, 78, LABELLINE(1), WS_GROUP + AUTORADIOBUTTON "D&üğme Takımı Yinelenme Hızını Düşür", IDC_REPEAT_REPEAT_RADIO, PROPSHEETPADDING(2), LABELLINE(4) + 7, 131, LABELLINE(1) LTEXT "&Yinelenme Gecikmesi:", -1, PROPSHEETPADDING(4), LABELLINE(6) + 4, PROPSHEETPADDING(10), LABELLINE(1) COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7) + 6, PROPSHEETWIDTH - PROPSHEETPADDING(6), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -253,7 +253,7 @@ BEGIN COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10) + 8, PROPSHEETWIDTH - PROPSHEETPADDING(6), LABELLINE(7), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "YavaÅŸlatma Düğmeleri", -1, PROPSHEETPADDING(1), LABELLINE(14), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + 4 - LTEXT "Dü&ÄŸmeler Åžu Denli Basılı Tutulmalıdır:", -1, PROPSHEETPADDING(2), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + LTEXT "Dü&ÄŸmeler Åžu Denli Basılı TutulmuÅŸ Olmalıdır:", -1, PROPSHEETPADDING(2), LABELLINE(15), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16) + 4, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(8), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "&Sınama Yeri:", -1, PROPSHEETPADDING(1), LABELLINE(20), PROPSHEETPADDING(8), LABELLINE(1) @@ -268,7 +268,7 @@ CAPTION "Dizilik Düğme Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Dizilik Düğmeler", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) - LTEXT "BaÅŸka türdeki giriÅŸ aygıtını baÄŸlayacağınız bir giriÅŸ seçiniz.", + LTEXT "BaÅŸka bir giriÅŸ aygıtı baÄŸlayacağınız bir giriÅŸ seçiniz.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) LTEXT "&Dizilik GiriÅŸ:", -1, PROPSHEETPADDING(2), LABELLINE(3) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4) + 7, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), @@ -283,11 +283,11 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "EriÅŸilebilirlik" - IDS_CPLSYSTEMDESCRIPTION "Bilgisayardaki eriÅŸilebilirlik husûsiyetlerini ÅŸahsîleÅŸtirir." + IDS_CPLSYSTEMDESCRIPTION "Bilgisayarınız için eriÅŸilebilirlik husûsiyetlerini ÅŸahsîleÅŸtirir." IDS_SENTRY_NONE "[Yok]" - IDS_SENTRY_TITLE "BaÅŸlık ÇubuÄŸu Yanıp Sönsün" - IDS_SENTRY_WINDOW "Etkin Pencere Yanıp Sönsün" - IDS_SENTRY_DISPLAY "Masaüstü Yanıp Sönsün" + IDS_SENTRY_TITLE "BaÅŸlık ÇubuÄŸunu Yanıp Söndür" + IDS_SENTRY_WINDOW "Etkin Pencereyi Yanıp Söndür" + IDS_SENTRY_DISPLAY "Masaüstüyü Yanıp Söndür" IDS_SECONDS "Sâniye" IDS_MINUTES "Dakîka" END diff --git a/reactos/dll/cpl/appwiz/lang/tr-TR.rc b/reactos/dll/cpl/appwiz/lang/tr-TR.rc index 6f0f7a45899..81322807f44 100644 --- a/reactos/dll/cpl/appwiz/lang/tr-TR.rc +++ b/reactos/dll/cpl/appwiz/lang/tr-TR.rc @@ -26,27 +26,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kısayol OluÅŸtur" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Bu yardımcı, aÄŸdaki ya da yakındaki izlencelere, kütüklere,\ndizinlere, bilgisayarlara ve Umûmî AÄŸ adreslerine\nkısayol oluÅŸturmanıza yardımcı olur.", -1, 120, 15, 200, 30 - LTEXT "Nesnenin konumunu yazınız:", -1, 120, 50, 120, 10 + LTEXT "Bu yardımcı, yerli ya da aÄŸdaki izlencelere, kütüklere,\ndizinlere, bilgisayarlara ve Umûmî AÄŸ adreslerine\nkısayollar oluÅŸturmanıza yardım eder.", -1, 120, 15, 200, 30 + LTEXT "Öğenin konumunu yazınız:", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "&Göz At...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Sürdürmek için ""Ä°leri"" düğmesine tıklayınız.", -1, 120, 97, 162, 10 + LTEXT "Sürdürmek için ""Ä°leri""ye tıklayınız.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Kısayolun Adını Girme" +CAPTION "Ä°zlencenin Adını Seç" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Kısayolun adını giriniz:", -1, 120, 15, 150, 10 + LTEXT "&Bu kısayol için bir ad yazınız:", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Kısayolu oluÅŸturmak için ""Bitir"" düğmesine tıklayınız.", -1, 118, 97, 178, 17 + LTEXT "Kısayolu oluÅŸturmak için ""Bitir""e tıklayınız.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Yazılım Ekle/Kaldır" - IDS_CPLSYSTEMDESCRIPTION "Yazılımları kurar ve kısayol oluÅŸturur." + IDS_CPLSYSTEMNAME "Ä°zlence Ekle ve Kaldır" + IDS_CPLSYSTEMDESCRIPTION "Ä°zlenceler kurar ve kısayollar oluÅŸturur." IDS_CREATE_SHORTCUT "Kısayol OluÅŸtur" IDS_ERROR_NOT_FOUND "%s kütüğü bulunamadı." END @@ -55,15 +55,15 @@ STRINGTABLE BEGIN IDS_DOWNLOADING "Ä°ndiriliyor..." IDS_INSTALLING "Kuruluyor..." - IDS_INVALID_SHA "Ä°ndirilen kütükte beklenmeyen saÄŸlama toplamı var. Bozuk kütüğün kurulumu iptal ediliyor." + IDS_INVALID_SHA "Ä°ndirilen kütüğün saÄŸlama toplamı beklenmeyen. Bozuk kütüğün kurulumu iptal ediliyor." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Geko Kurucusu" +CAPTION "Wine Gecko Kurucusu" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS, HTML gömülü uygulamalarını düzgün bir ÅŸekilde çalıştırmak için gereken Wine Geko paketini bulamadı. ReactOS, bunu indirip kurabilir.", + CONTROL "ReactOS, HTML gömülü uygulamaları düzgün çalıştırmak için gereken bir Wine Gecko paketi bulamadı. ReactOS, sizin için onu kendiliÄŸinden indirebilir ve kurabilir.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/reactos/dll/cpl/appwiz/rsrc.rc b/reactos/dll/cpl/appwiz/rsrc.rc index cbbfa89341d..b96025f4a4a 100644 --- a/reactos/dll/cpl/appwiz/rsrc.rc +++ b/reactos/dll/cpl/appwiz/rsrc.rc @@ -49,12 +49,12 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif diff --git a/reactos/dll/cpl/console/lang/tr-TR.rc b/reactos/dll/cpl/console/lang/tr-TR.rc index 4801f2d9a4e..23445d94baf 100644 --- a/reactos/dll/cpl/console/lang/tr-TR.rc +++ b/reactos/dll/cpl/console/lang/tr-TR.rc @@ -15,11 +15,11 @@ BEGIN CONTROL "&Pencere", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&Tüm Görüntülük", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 GROUPBOX "Komut GeçmiÅŸi", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Arabellek Boyutu:", -1, 14, 101, 70, 12 + LTEXT "&Ara Bellek Boyutu:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 - LTEXT "A&rabellek Sayısı:", -1, 14, 124, 70, 12 + LTEXT "A&ra Bellek Sayısı:", -1, 14, 124, 70, 12 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 @@ -35,7 +35,7 @@ CAPTION "Yazı Tipi" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Pencere Ön Ä°zlemesi:", -1, 10, 10, 94, 10 - LTEXT "Boyutlar:", -1, 180, 10, 36, 10 + LTEXT "&Boyutlar:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Yazı Tipi:", -1, 10, 105, 33, 10 @@ -43,7 +43,7 @@ BEGIN LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 - LTEXT "Her bir damga:", -1, 124, 166, 75, 10 + LTEXT "Tüm damgalar:", -1, 124, 166, 75, 10 LTEXT "nokta geniÅŸlikte.\nnokta yükseklikte.", -1, 136, 180, 101, 20 LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 @@ -83,7 +83,7 @@ BEGIN EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "&Pencereyi Dizge Konumlandırsın", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 + CHECKBOX "&Dizgeye Pencere Konumlandırmaya Ä°zin Ver", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 @@ -93,7 +93,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Görüntülük Metni", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 - CONTROL "G&örüntülük Zemini", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | + CONTROL "G&örüntülük Zemîni", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 CONTROL "&Açılan Metin", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 diff --git a/reactos/dll/cpl/desk/lang/tr-TR.rc b/reactos/dll/cpl/desk/lang/tr-TR.rc index 1a810be39ca..6e4969a3f95 100644 --- a/reactos/dll/cpl/desk/lang/tr-TR.rc +++ b/reactos/dll/cpl/desk/lang/tr-TR.rc @@ -10,10 +10,10 @@ BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Duvar kağıdı olarak kullanmak için bir resim seçiniz.", IDC_STATIC, 8, 103, 230, 9 + LTEXT "Duvar kağıdınız olarak kullanmak için bir resim seçiniz.", IDC_STATIC, 8, 103, 230, 9 PUSHBUTTON "&Göz At...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 PUSHBUTTON "&Renk...", IDC_COLOR_BUTTON, 188, 177, 55, 15 - LTEXT "YerleÅŸim:", IDC_STATIC, 188, 138, 55, 9 + LTEXT "&YerleÅŸim:", IDC_STATIC, 188, 138, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -35,7 +35,7 @@ BEGIN CONTROL "&Çıkışta Åžifre Sor", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "Göstergecin Güç Tutumu Husûsiyetleri", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "Göstergecin güç ayarlarını düzenlemek için ""Güç"" düğmesine tıklayınız.", IDC_STATIC, 14, 166, 146, 27 + LTEXT "Göstergeciniz için güç ayarlarını düzenlemek için ""Güç""e tıklayınız.", IDC_STATIC, 14, 166, 146, 27 PUSHBUTTON "G&üç...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 END @@ -45,7 +45,7 @@ CAPTION "Görünüm" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "&Basarî Biçem", IDC_STATIC, 7, 130, 104, 9 + LTEXT "G&örmelik Biçem", IDC_STATIC, 7, 130, 104, 9 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Renk Düzeni:", IDC_STATIC, 7, 160, 104, 9 @@ -68,20 +68,20 @@ BEGIN LTEXT "&Öğe", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "Boyut", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 + LTEXT "&Boyut", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "1. Renk", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "&1. Renk", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "2. Renk", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "&2. Renk", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Yazı Tipi", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + LTEXT "&Yazı Tipi", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Yazı Tipi Boyutu", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + LTEXT "Y&azı Tipi Boyutu", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Renk", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 + LTEXT "&Renk", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "K", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "E", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE @@ -95,11 +95,11 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "Etkiler" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Araç Ä°puçlarında ve Seçkelerde GeçiÅŸ Etkisi Kullan", + CONTROL "&Araç Ä°puçları ve Seçkeler İçin AÅŸağıdaki GeçiÅŸ Etkisi Kullan:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "&Görüntülük Yazı Tiplerinin Kıyılarını DüzgünleÅŸtirmeyi EtkinleÅŸtir", IDC_EFFAPPEARANCE_SMOOTHING, + CONTROL "&Görüntülük Yazı Tiplerinin Kıyılarını YumuÅŸatmak İçin AÅŸağıdaki Yöntemi Kullan:", IDC_EFFAPPEARANCE_SMOOTHING, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED @@ -109,7 +109,7 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 CONTROL "S&ürüklerken Pencere İçeriÄŸini Göster", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 - CONTROL "S&eçenek Düğmesine Basana Dek Düğme Takımı ile Yönlendirme Çizgilerini Gizle", + CONTROL "S&eçenek Düğmesine Basana Dek Düğme Takımıyla Gezinme İçin Altı Çizili Harfleri Gizle", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 PUSHBUTTON "Ä°ptal", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Tamam", IDOK, 172, 165, 50, 14 @@ -120,10 +120,10 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Göstergeçteki fizîkî düzenlemeyi karşılaÅŸtırmak için göstergeç simgelerini sürükleyiniz.", -1, 3, 3, 240, 20 + LTEXT "Göstergeçlerinizin fizîkî düzenlenmesini karşılaÅŸtırmak için göstergeç simgelerini sürükleyiniz.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "Görüntü", 1820, 3, 107, 70, 9 + LTEXT "Görüntü:", 1820, 3, 107, 70, 9 LTEXT "", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 GROUPBOX "G&örüntülük Alanı", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -146,16 +146,16 @@ BEGIN COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Uyumluluk", -1, 7, 67, 237, 97 - LTEXT "Birtakım izlenceler, renk ayarlarını deÄŸiÅŸtirdikten sonra yeniden baÅŸlatılmazsa eksiksiz olarak çalışmayabilir.\r\n\nRenk ayarları deÄŸiÅŸtirildikten sonra:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "¥i renk ayarları uygulanmadan önce bilgisayar yeniden baÅŸlatılsın.", IDC_RESTART_RB, 14, 116, 228, 10 - AUTORADIOBUTTON "y&eniden baÅŸlatılmadan yeni renk ayarları uygulansın.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 - AUTORADIOBUTTON "ye&ni renk ayarlarının uygulanıp uygulanmayacağı kullanıcıya sorulsun.", IDC_ASKME_RB, 14, 146, 228, 10 + LTEXT "EÄŸer renk ayarlarını deÄŸiÅŸtirdiÄŸinizden sonra bilgisayarınızı yeniden baÅŸlatmazsanız birtakım izlenceler yanlış çalışır.\r\n\nRenk ayarlarını deÄŸiÅŸtirdikten sonra:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "¥i renk ayarları uygulanmadan önce bilgisayarı yeniden baÅŸlat.", IDC_RESTART_RB, 14, 116, 228, 10 + AUTORADIOBUTTON "y&eniden baÅŸlatmadan yeni renk ayarlarını uygula.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + AUTORADIOBUTTON "ye&ni renk ayarlarıuygulanmadan önce bana sor.", IDC_ASKME_RB, 14, 146, 228, 10 END IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Bilindik", ID_MENU_NORMAL - MENUITEM "Etkin DeÄŸil", ID_MENU_DISABLED + MENUITEM "Düzgülü", ID_MENU_NORMAL + MENUITEM "Edilgin", ID_MENU_DISABLED MENUITEM "Seçili", ID_MENU_SELECTED END @@ -164,7 +164,7 @@ BEGIN POPUP "" BEGIN MENUITEM "&Ä°liÅŸtirilmiÅŸ", ID_MENU_ATTACHED - MENUITEM "&Birincil", ID_MENU_PRIMARY + MENUITEM "&Birinci", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Tanıla", ID_MENU_IDENTIFY MENUITEM "&Husûsiyetler", ID_MENU_PROPERTIES @@ -193,7 +193,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Görüntü" - IDS_CPLDESCRIPTION "Masaüstünün görünümünü ve görüntülük koruyucusunu husûsileÅŸtirir." + IDS_CPLDESCRIPTION "Masaüstü görünümünü ve görüntülük koruyucuyu husûsileÅŸtirir." IDS_NONE "(Yok)" IDS_CENTER "Ortala" IDS_STRETCH "Uzat" @@ -212,7 +212,7 @@ END STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Resimler (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_BACKGROUND_COMDLG_FILTER "Resimler (*.bmp, *.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END @@ -221,7 +221,7 @@ BEGIN IDS_INACTWIN "Edilgin Pencere" IDS_ACTWIN "Etkin Pencere" IDS_WINTEXT "Pencere Metni" - IDS_MESSBOX "Ä°leti Kutusu" + IDS_MESSBOX "Ä°leti Penceresi" IDS_MESSTEXT "Ä°leti Metni" IDS_BUTTEXT "Tamam" IDS_CLASSIC_THEME "KökleÅŸik Tema" @@ -231,9 +231,9 @@ STRINGTABLE BEGIN IDS_ELEMENT_1 "Masaüstü" IDS_ELEMENT_2 "Edilgin Pencere BaÅŸlığı" - IDS_ELEMENT_3 "Edilgin Pencere Kenarlığı" + IDS_ELEMENT_3 "Edilgin Pencere Kıyılığı" IDS_ELEMENT_4 "Etkin Pencere BaÅŸlığı" - IDS_ELEMENT_5 "Etkin Pencere Kenarlığı" + IDS_ELEMENT_5 "Etkin Pencere Kıyılığı" IDS_ELEMENT_6 "Seçke" IDS_ELEMENT_7 "Seçili Öğeler" IDS_ELEMENT_8 "Pencereler" @@ -243,19 +243,19 @@ BEGIN IDS_ELEMENT_12 "Simge Etiketi" IDS_ELEMENT_13 "BaÅŸlık ÇubuÄŸu" IDS_ELEMENT_14 "Edilgin Seçke Öğeleri" - IDS_ELEMENT_15 "Ä°leti" - IDS_ELEMENT_16 "Kaydırma Çubukları Denetimleri" + IDS_ELEMENT_15 "Ä°letiÅŸim Penceresi" + IDS_ELEMENT_16 "Kaydırma ÇubuÄŸu Denetimleri" IDS_ELEMENT_17 "Uygulama Arka Planı" IDS_ELEMENT_18 "Küçük BaÅŸlık ÇubuÄŸu" IDS_ELEMENT_19 "Simge Aralığı (Yatay)" IDS_ELEMENT_20 "Simge Aralığı (Dikey)" - IDS_ELEMENT_21 "Araç Ä°pucu" + IDS_ELEMENT_21 "Çabuk Yardım" IDS_ELEMENT_22 "Simge" END STRINGTABLE BEGIN IDS_DISPLAY_SETTINGS "Görüntü Ayarları" - IDS_APPLY_FAILED "Yeni ayarlar uygulanamadı." - IDS_APPLY_NEEDS_RESTART "DeÄŸiÅŸikliklerin uygulanması için bilgisayarınızı yeniden baÅŸlatmalısınız." + IDS_APPLY_FAILED "Yeni ayarların uygulanması baÅŸarısız oldu." + IDS_APPLY_NEEDS_RESTART "DeÄŸiÅŸiklikleri uygulamak için bilgisayarınızı yeniden baÅŸlatmanız gerekir." END diff --git a/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc b/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc index 9d7a7c85250..600dc04faf0 100644 --- a/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc +++ b/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc @@ -8,12 +8,12 @@ CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Donanım Ekleme Yardımcısı'na HoÅŸgeldiniz", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "Bu yardımcı, size iki ÅŸekilde yardım eder:", -1, 114, 40, 182, 8 - LTEXT "1. Bilgisayara eklenen donanımı desteklemek için yazılım kurmak.", -1, 121, 56, 184, 16 - LTEXT "2. Donanım ile oluÅŸabiliecek sorunları çözmek.", -1, 121, 78, 185, 16 + LTEXT "Bu yardımcı, size şöyle yardım eder:", -1, 114, 40, 182, 8 + LTEXT "1. Bilgisayarınıza eklediÄŸiniz donanımı desteklemek için yazılım kurmak.", -1, 121, 56, 184, 16 + LTEXT "2. Donanımınızla oluÅŸabilecek sorunları çözmek.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "EÄŸer donanım bir kurulum diski ile geliyorsa ""Ä°ptal"" tuÅŸuna tıklayıp donanımı kurmak için üreticisinin diskini kullanmanız önerilir.", 503, 150, 106, 155, 50 - LTEXT "Sürdürmek için ""Ä°leri >"" düğmesine tıklayınız.", -1, 114, 166, 193, 8 + LTEXT "EÄŸer donanımınız bir kurulum CD'siyle geldiyse bu yardımcıyı kapatmak için Ä°ptal'e tıklamanız ve bu donanımı kurmak için üreticinin CD'sini kullanmanız önerilir.", 503, 150, 106, 155, 50 + LTEXT "Sürdürmek için Ä°leri'ye tıklayınız.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG 0, 0, 317, 143 @@ -30,7 +30,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu donanım bilgisayarınıza önceden baÄŸlanmış mı?", -1, 20, 11, 275, 8 + LTEXT "Bu donanımı bilgisayarınıza önceden baÄŸladınız mı?", -1, 20, 11, 275, 8 AUTORADIOBUTTON "&Evet, donanımı önceden baÄŸladım.", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP AUTORADIOBUTTON "&Hayır, donanımı daha baÄŸlamadım.", IDC_NOTCONNECTED, 29, 35, 266, 8 END @@ -40,9 +40,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "AÅŸağıdaki dizelgeden kurulu donanım aygıtını seçiniz, sonra aygıtın husûsiyetleri gözden geçirmek veyâ sorunları çözmek için ""Ä°leri >"" düğmesine tıklayınız.", -1, 21, 8, 275, 22 - LTEXT "Dizelgede gözükmeyen donanımı eklemek için ""Yeni Bir Donanım Aygıtı Ekle"" öğesini seçiniz.", -1, 21, 32, 275, 24 - LTEXT "&Kurulu Donanımın Türü:", -1, 21, 62, 140, 8 + LTEXT "AÅŸağıdaki dizelgeden bir kurulu donanım aygıtı seçiniz, sonra husûsiyetleri gözden geçirmek veyâ karşılaÅŸabildiÄŸiniz bir sorun çözmek için Ä°leri'ye tıklayınız.", -1, 21, 8, 275, 22 + LTEXT "Dizelgede gözükmeyen donanımı eklemek için Yeni Bir Donanım Aygıtı Ekle'yi tıklayınız.", -1, 21, 32, 275, 24 + LTEXT "&Kurulu Donanım:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END @@ -51,10 +51,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu yardımcı, diÄŸer türdeki donanımı arayıp kurabilir. Kurulacak donanımın modelini biliyorsanız dizelgeden onu seçebilirsiniz.", -1, 21, 8, 280, 24 + LTEXT "Bu yardımcı, baÅŸka donanımı arayabilir ve sizin için onu kendiliÄŸinden kurabilir. Ya da eÄŸer kurmak istediÄŸiniz donanım modelini eksiksiz biliyorsanız bir dizelgeden onu seçebilirsiniz.", -1, 21, 8, 280, 24 LTEXT "Yardımcının ne yapmasını istiyorsunuz?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Donanımı bulup kurmak. (Önerilen)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Di&zelgeden elle seçilen donanımı kurmak. (GeliÅŸmiÅŸ)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + AUTORADIOBUTTON "&Donanımı KendiliÄŸinden Ara ve Kur (Önerilen)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Bir Dizelgeden Elle SeçtiÄŸim Donanımı Kur (GeliÅŸmiÅŸ)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG 0, 0, 317, 143 @@ -72,7 +72,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "EÄŸer donanımın türünü bulamadıysanız ""Tüm Aygıtları Göster"" öğesini seçiniz.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "EÄŸer istediÄŸiniz donanım ulamasını görmezseniz Tüm Aygıtları Göster'e tıklayınız.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "&Bilinen Donanım Türleri:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END @@ -94,10 +94,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Donanım Ekleme Yardımcısı'nı Bitirmek", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Donanım Ekleme Yardımcısı'nı Bitirme", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "Donanım Ekleme Yardımcısı'nı baÅŸarıyla bitirdiniz.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "Yardımcıyı kapatmak için ""Bitir"" düğmesine tıklayınız.", -1, 114, 166, 132, 8 + LTEXT "Bu yardımcıyı kapatmak için Bitir'e tıklayınız.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOG 0, 0, 317, 186 @@ -105,9 +105,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Donanım Ekleme Yardımcısı'nı Bitirmek", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "Yardımcı, bilgisayara baÄŸlanan aÅŸağıdaki donanımı buldu:", -1, 114, 32, 193, 19 - LTEXT "Yardımcıyı kapatmak için ""Bitir"" düğmesine tıklayınız.", -1, 114, 166, 132, 8 + LTEXT "Donanım Ekleme Yardımcısı'nı Bitirme", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Yardımcı, bilgisayarınıza baÄŸlanan aÅŸağıdaki donanımı buldu:", -1, 114, 32, 193, 19 + LTEXT "Bu yardımcıyı kapatmak için Bitir'e tıklayınız.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END @@ -116,11 +116,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Donanım Ekleme Yardımcısı'nı Bitirmek", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Seçili donanımın ÅŸimdiki durumu:", -1, 114, 40, 193, 19 + LTEXT "Donanım Ekleme Yardımcısı'nı Bitirme", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "SeçtiÄŸiniz donanımın ÅŸimdiki durumu:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Herhangi bir olası sorunu çözmenize yardımcı olan sorun çözücüyü baÅŸlatmak için ""Bitir"" düğmesine tıklayınız.", -1, 114, 136, 193, 1 - LTEXT "Yardımcıdan çıkmak için ""Ä°ptal"" düğmesine tıklayınız.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "KarşılaÅŸabildiÄŸiniz bir olası sorunu çözmenize yardımcı olabilen bir sorun çözücü baÅŸlatmak için Bitir'e tıklayınız.", -1, 114, 136, 193, 1 + LTEXT "Bu yardımcıdan çıkmak için Ä°ptal'e tıklayınız.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOG 0, 0, 317, 186 @@ -128,22 +128,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Donanım Ekleme Yardımcısı" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Donanım Ekleme Yardımcısı Sürdürülemiyor.", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "Sürdürmek için donanımı bilgisayara baÄŸlayınız.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Donanımı baÄŸlayıp bilgisayarı açmak için ""Bitir"" düğmesine tıklandıktan sonra bilgisayarı kapat.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "ÇoÄŸu durumda ReactOS, donanımı, baÄŸlandıktan sonra kendiliÄŸinden kurar. EÄŸer ReactOS onu bulamazsa desteklenen yazılımı kurmak için bu yardımcıyı yine açabilirsiniz.", -1, 114, 98, 193, 32 - LTEXT "Yardımcıyı kapatmak için ""Bitir"" düğmesine tıklayınız.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Donanım Ekleme Yardımcısı Sürdüremiyor.", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Sürdürmek için bu donanımı bilgisayarınıza baÄŸlayınız.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Bilgisayarı AçabildiÄŸim ve Donanımı BaÄŸlayabildiÄŸim İçin Bitir'e Tıkladığımda Bilgisayarı Kapat", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "ÇoÄŸu durumda ReactOS, siz donanımı baÄŸlahdıktan sonra onu kendiliÄŸinden kuracaktır. EÄŸer ReactOS onu bulamazsa desteklenen yazılımı kurmak için bu yardımcıyı yine açabilirsiniz.", -1, 114, 98, 193, 32 + LTEXT "Bu yardımcıyı kapatmak için Bitir'e tıklayınız.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Donanım Ekle" - IDS_CPLDESCRIPTION "Bilgisayara donanım ekler." - IDS_SEARCHTITLE "Yardımcı, donanımı ararken bekleyiniz..." - IDS_SEARCHTEXT "Yardımcı, az önce bilgisayara baÄŸlanan ancak daha kurulmayan donanım için arıyor." + IDS_CPLDESCRIPTION "Bilgisayarınıza donanım ekler." + IDS_SEARCHTITLE "Yardımcı ararken lütfen bekleyiniz..." + IDS_SEARCHTEXT "Bu yardımcı, yeni bilgisayarınıza baÄŸlanan ancak daha kurulmayan donanımı arıyor." IDS_ISCONNECTED "Donanım baÄŸlı mı?" - IDS_PROBELISTTITLE "AÅŸağıdaki donanım, bilgisayarda önceden kurulu." + IDS_PROBELISTTITLE "AÅŸağıdaki donanım bilgisayarınız önceden kurulmuÅŸ." IDS_ADDNEWDEVICE "Yeni Bir Donanım Aygıtı Ekle" - IDS_SELECTWAYTITLE "Bu yardımcı, diÄŸer donanımları kurmanıza yardım eder." - IDS_HDTYPESTITLE "AÅŸağıdaki dizelgeden kurduÄŸunuz donanımın türünü seçiniz." + IDS_SELECTWAYTITLE "Bu yardımcı baÅŸka donanımları kurmanıza yardım edebilir." + IDS_HDTYPESTITLE "AÅŸağıdaki dizelgeden kuruyor olduÄŸunuz donanımın türünü seçiniz." END diff --git a/reactos/dll/cpl/inetcpl/lang/tr-TR.rc b/reactos/dll/cpl/inetcpl/lang/tr-TR.rc index 21b6eefd6fb..e7904654eb9 100644 --- a/reactos/dll/cpl/inetcpl/lang/tr-TR.rc +++ b/reactos/dll/cpl/inetcpl/lang/tr-TR.rc @@ -32,14 +32,14 @@ CAPTION "Umûmî" BEGIN GROUPBOX " Ana Sayfa ", IDC_STATIC, 4, 4, 312, 52 - LTEXT "Ana sayfa olarak kullanılacak adresi deÄŸiÅŸtirebilirsiniz.", + LTEXT "Ana sayfanız olarak kullanılacak adresi deÄŸiÅŸtirebilirsiniz.", IDC_STATIC, 58, 10, 252, 10 EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Åžimdiki Sayfa", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "&Ön Tanımlı Sayfa", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "&BoÅŸ Sayfa", IDC_HOME_BLANK, 230, 36, 80, 14 GROUPBOX " Tarama GeçmiÅŸi ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "Saklanan sayfaları, yemiÅŸleri ve diÄŸer verileri silebilirsiniz.", + LTEXT "Saklanan sayfaları, çerezleri ve baÅŸka verileri silebilirsiniz.", IDC_STATIC, 58, 72, 252, 10 PUSHBUTTON "&Kütükleri Sil...", IDC_HISTORY_DELETE, 144, 86, 80, 14 PUSHBUTTON "&Ayarlar...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 @@ -50,21 +50,21 @@ END IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Tarama GeçmiÅŸini Silme" +CAPTION "Tarama GeçmiÅŸini Sil" BEGIN - AUTOCHECKBOX "Geçici Umûmî AÄŸ Kütüleri:\nSaklanan sayfa kopyaları, resimler ve onay belgeleri.", + AUTOCHECKBOX "&Geçici Umûmî AÄŸ Kütüleri:\nUmûmî AÄŸ sayfalarının, resimlerin ve onay belgelerinin saklanmış kopyaları.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "YemiÅŸler:\nUmûmî AÄŸ siteleri eliyle bilgisayara kaydedilmiÅŸ, kullanıcı yeÄŸlemeleri ve oturum açma bilgileri gibi ÅŸeyleri saklayan kütükler.", + AUTOCHECKBOX "&Çerezler:\nUmûmî AÄŸ siteleri eliyle bilgisayarınıza kaydedilmiÅŸ, kullanıcı yeÄŸlemeleri ve oturum açma bilgileri gibi ÅŸeyleri saklayan kütükler.", IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "GeçmiÅŸ:\nEriÅŸilen sayfaların dizelgesi.", + AUTOCHECKBOX "G&eçmiÅŸ:\nEriÅŸtiÄŸiniz Umûmî AÄŸ sitelerinin dizelgesi.", IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Form Verileri:\nFormlarda girilen kullanıcı adları ve diÄŸer bilgiler.", + AUTOCHECKBOX "&Form Verileri:\nFormlarda girdiÄŸiniz kullanıcı adlarıyla baÅŸka bilgiler.", IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Åžifreler:\nFormlarda girilen ÅŸifreler.", + AUTOCHECKBOX "&Åžifreler:\nFormlarda girdiÄŸiniz kaydedilmiÅŸ ÅŸifreler.", IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Ä°ptal", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Tamam (Sil)", IDOK, 120, 230, 60, 15, WS_GROUP + PUSHBUTTON "Sil", IDOK, 120, 230, 60, 15, WS_GROUP END @@ -94,7 +94,7 @@ CAPTION "İçerik" BEGIN GROUPBOX " Onay Belgeleri ", IDC_STATIC, 4, 4, 312, 50 - LTEXT "Onay belgeleri, ÅŸahsî tanılamada ve yetkili kiÅŸilerle yayımcıları tanımada kullanılır.", + LTEXT "Onay belgeleri, ÅŸahsî tanılamanızda ve onay belgesi yetkilileriyle yayımcıları tanımada kullanılır.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "&Onay Belgeleri...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "&Yayımcılar...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 @@ -104,9 +104,9 @@ END STRINGTABLE BEGIN IDS_CPL_NAME "Umûmî AÄŸ Ayarları" - IDS_CPL_INFO "Wine Umûmî AÄŸ Tarayıcısı'nı ve bununla iliÅŸkili ayarları yapılandırır." + IDS_CPL_INFO "Wine Umûmî AÄŸ Tarayıcısı'nı ve iliÅŸkili ayarları yapılandırır." IDS_SEC_SETTINGS "Bölgeye Göre Güvenlik Ayarları: " - IDS_SEC_LEVEL0 "DeÄŸiÅŸik" + IDS_SEC_LEVEL0 "Husûsî" IDS_SEC_LEVEL1 "Çok Düşük" IDS_SEC_LEVEL2 "Düşük" IDS_SEC_LEVEL3 "Orta" diff --git a/reactos/dll/cpl/input/lang/tr-TR.rc b/reactos/dll/cpl/input/lang/tr-TR.rc index 2f48d90e6bd..b9ec142da21 100644 --- a/reactos/dll/cpl/input/lang/tr-TR.rc +++ b/reactos/dll/cpl/input/lang/tr-TR.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Dizelgede gösterilen her bir giriÅŸ dili için istediÄŸiniz hizmetleri seçiniz.\nDizelgeyi deÄŸiÅŸtirmek için ""Ekle..."" veyâ ""Sil..."" düğmelerini kullanınız.", -1, 9, 6, 238, 25 + LTEXT "Dizelgede gösterilen tüm giriÅŸ dilleri için istediÄŸiniz hizmetleri seçiniz.\nBu dizelgeyi deÄŸiÅŸtirmek için Ekle veyâ Sil düğmelerini kullanınız.", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "&Ön Tanımlı Yap", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "&Ekle...", IDC_ADD_BUTTON, 27, 142, 70, 14 @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Dizge Yapılandırması", -1, 7, 7, 240, 70 AUTOCHECKBOX "&GeliÅŸmiÅŸ Metin Hizmetlerini Kapat", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 - LTEXT "Tüm izlencelerdeki geliÅŸmiÅŸ metin hizmetlerini kapatmak için bu kutucuÄŸu seçiniz.\nBu ayar, dil çubuÄŸunuu kapatacağından DoÄŸu Asya kulanıcıları için önerilmez.", -1, 14, 40, 230, 35 + LTEXT "Tüm izlencelerdeki geliÅŸmiÅŸ metin hizmetlerini kapatmak için bu kutucuÄŸu seçiniz.\nBu, dil çubuÄŸunu kapatmasından dolayı DoÄŸu Asya kullanıcılarına önerilmez.", -1, 14, 40, 230, 35 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -33,13 +33,13 @@ CAPTION "GeliÅŸmiÅŸ Düğme Ayarları" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Büyük Harf Kilidi'ni Kapatmak İçin", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "&Büyük Harf düğmesine basılsın.", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP - AUTORADIOBUTTON "&Ãœst Damga düğmesine basılsın.", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "&Büyük Harf Düğmesine Bas", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "&Ãœst Damga Düğmesine Bas", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP GROUPBOX "GiriÅŸ Dilleri İçin Kısayol Düğmeleri", -1, 7, 37, 258, 95 LTEXT "Eylem", -1, 14, 47, 60, 9 - RTEXT "Düğme Dizisi", -1, 177, 47, 79, 9 + RTEXT "&Düğme Dizisi", -1, 177, 47, 79, 9 CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE - PUSHBUTTON "&Düğme Dizisini DeÄŸiÅŸtir...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP + PUSHBUTTON "Dü&ÄŸme Dizisini DeÄŸiÅŸtir...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "Tamam", IDOK, 66, 140, 70, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 146, 140, 70, 14 END @@ -63,12 +63,12 @@ CAPTION "Düğme Dizisini DeÄŸiÅŸtir" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&GiriÅŸ Dilleri Arasında GeçiÅŸ Yapma", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + AUTOCHECKBOX "&GiriÅŸ Dilleri Arasında GeçiÅŸ Yap", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 LTEXT "Ãœst Damga", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "D&enetim", IDC_CTRL_LANG, 29, 31, 30, 11 AUTORADIOBUTTON "&Sol Seçenek", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "&Düğme Takımı Düzenleri Arasında GeçiÅŸ Yapma", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + AUTOCHECKBOX "&Düğme Takımı Düzenleri Arasında GeçiÅŸ Yap", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 LTEXT "Ãœst Damga", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "De&netim", IDC_CTRL_LAYOUT, 30, 81, 30, 11 @@ -93,15 +93,15 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Metin Hizmetleri ve GiriÅŸ Dilleri" - IDS_CPLSYSTEMDESCRIPTION "Dillerin metin giriÅŸlerini husûsileÅŸtirir." + IDS_CPLSYSTEMDESCRIPTION "Dillerin metin giriÅŸi için ayarları husûsileÅŸtirir." IDS_KEYBOARD "Düğme Takımı" IDS_NONE "(Yok)" IDS_UNKNOWN "(Bilinmiyor)" - IDS_RESTART "Åžimdi bilgisayar yeniden baÅŸlatılsın mı?" + IDS_RESTART "Åžimdi bilgisayarınızı yeniden baÅŸlatmak ister misiniz?" IDS_WHATS_THIS "Bu nedir?" IDS_LANGUAGE "Dil" IDS_LAYOUT "Düğme Takımı Düzeni" - IDS_REM_QUESTION "Seçili düğme takımı düzenini silmeyi doÄŸruluyor musunuz?" + IDS_REM_QUESTION "Seçili düğme takımı düzenini silmeyi istiyor musunuz?" IDS_CONFIRMATION "DoÄŸrulama" IDS_LAYOUT_EXISTS "Bu düzen önceden var." IDS_LAYOUT_EXISTS2 "Bu düzen önceden var ve eklenemez." @@ -119,8 +119,8 @@ BEGIN IDS_ARMENIAN_EASTERN_LAYOUT "DoÄŸu Ermenîce" IDS_ARMENIAN_WESTERN_LAYOUT "Batı Ermenîce" IDS_ASSAMESE_LAYOUT "Assamca" - IDS_AZERI_CYRILLIC_LAYOUT "Azerbaycan Türçesi (Kiril)" - IDS_AZERI_LATIN_LAYOUT "Azerbaycan Türkçesi (Latin)" + IDS_AZERI_CYRILLIC_LAYOUT "Âzerî Türkçesi (Kiril)" + IDS_AZERI_LATIN_LAYOUT "Âzerî Türkçesi (Latin)" IDS_BELARUSIAN_LAYOUT "Ak Rusça" IDS_BELGIAN_COMMA_LAYOUT "Belçika (Virgüllü)" IDS_BELGIAN_FRENCH_LAYOUT "Belçika Fransızcası" @@ -129,41 +129,41 @@ BEGIN IDS_BULGARIAN_LAYOUT "Bulgarca" IDS_BULGARIAN_BDS_LAYOUT "Bulgarca BDS 5237-1978" IDS_BULGARIAN_LATIN_LAYOUT "Bulgarca (Latin)" - IDS_BULGARIAN_PHONETIC_BDS_LAYOUT "Bulgarca Tam Seslik (BDS 5237-1978)" - IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT "Bulgarca Tam Seslik (KökleÅŸik)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT "Bulgarca Tüm Seslik (BDS 5237-1978)" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT "Bulgarca Tüm Seslik (KökleÅŸik)" IDS_BURMESE_LAYOUT "Birmanca" IDS_CANADIAN_FRENCH_LAYOUT "Kanada Fransızcası" IDS_CANADIAN_FRENCH_LEGACY_LAYOUT "Kanada Fransızcası (Eski)" IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT "Kanada Çok Dilli Ölçün" - IDS_CANTONESE_PHONETIC_LAYOUT "Kanton Lehçesi Tam Seslik" + IDS_CANTONESE_PHONETIC_LAYOUT "Güney Çince Tüm Seslik" IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT "Çince (BayağılaÅŸtırılmış) - Microsoft Pinyin IME 3.0" IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT "Çince (BayağılaÅŸtırılmış) - NeiMa" - IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT "Çince (BayağılaÅŸtırılmış) - KuanPin" - IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT "Çince (BayağılaÅŸtırılmış) - ÅžuangPin" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT "Çince (BayağılaÅŸtırılmış) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT "Çince (BayağılaÅŸtırılmış) - ShuangPin" IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT "Çince (BayağılaÅŸtırılmış) - ABD Düğme Takımı" - IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT "Çince (BayağılaÅŸtırılmış) - ZengMa" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT "Çince (BayağılaÅŸtırılmış) - ZhengMa" IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT "Çince (Geleneklik) - Harflik ve Sayılık" IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT "Çince (Geleneklik) - Düzen" IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT "Çince (Geleneklik) - Big5 Kodu" - IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT "Çince (Geleneklik) - ÇangJi" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT "Çince (Geleneklik) - ChangJie" IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT "Çince (Geleneklik) - DaYi" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT "Çince (Geleneklik) - Yeni ÇangJi" - IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT "Çince (Geleneklik) - Yeni Tam Seslik" - IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT "Çince (Geleneklik) - Tam Seslik" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT "Çince (Geleneklik) - Yeni ChangJie" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT "Çince (Geleneklik) - Yeni Tüm Seslik" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT "Çince (Geleneklik) - Tüm Seslik" IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT "Çince (Geleneklik) - Çabuk" - IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT "Çince (Geleneklik) - Evrenlik Kodluk" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT "Çince (Geleneklik) - Evrenlik Kod" IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT "Çince (Geleneklik) - ABD Düğme Takımı" IDS_CROATIAN_LAYOUT "Hırvatça" IDS_CZECH_LAYOUT "Çekçe" - IDS_CZECH_PROGRAMMERS_LAYOUT "Çekçe Yazılımcılar" + IDS_CZECH_PROGRAMMERS_LAYOUT "Çekçe Ä°zlenceciler" IDS_CZECH_QWERTY_LAYOUT "Çekçe (QWERTY)" IDS_DANISH_LAYOUT "Danca" IDS_DEVANAGARI_INSCRIPT_LAYOUT "Devanagari HarfliÄŸi - INSCRIPT" - IDS_DIVEHI_PHONETIC_LAYOUT "Divehi (Tam Seslik)" - IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi (Yazı Makinesi)" + IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Tüm Seslik" + IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Yazı Makinesi" IDS_DUTCH_LAYOUT "Flemenkçe" IDS_ESTONIAN_LAYOUT "Estçe" - IDS_FAEROESE_LAYOUT "Faeroece" + IDS_FAEROESE_LAYOUT "Faroece" IDS_FARSI_LAYOUT "Farsça" IDS_FINNISH_LAYOUT "Fince" IDS_FRENCH_LAYOUT "Fransızca" @@ -185,7 +185,7 @@ BEGIN IDS_HEBREW_LAYOUT "Ä°brânice" IDS_HINDI_TRADITIONAL_LAYOUT "Hintçe Geleneklik" IDS_HUNGARIAN_LAYOUT "Macarca" - IDS_HUNGARIAN_101_KEY_LAYOUT "Macarca 101 Düğmeli" + IDS_HUNGARIAN_101_KEY_LAYOUT "Macarca 101 Düğme" IDS_ICELANDIC_LAYOUT "Ä°zlandaca" IDS_IRISH_LAYOUT "Ä°rlandaca" IDS_ITALIAN_LAYOUT "Ä°talyanca" @@ -202,14 +202,14 @@ BEGIN IDS_LATVIAN_QWERTY_LAYOUT "Letonca (QWERTY)" IDS_LITHUANIAN_LAYOUT "Litovca" IDS_LITHUANIAN_IBM_LAYOUT "Litovca IBM" - IDS_FYRO_MACEDONIAN_LAYOUT "Makedonyaca" + IDS_FYRO_MACEDONIAN_LAYOUT "Makedonca" IDS_MALAYALAM_LAYOUT "Malayalam Dili" IDS_MARATHI_LAYOUT "Marathi Dili" IDS_MONGOLIAN_CYRILLIC_LAYOUT "MoÄŸolca (Kiril)" IDS_NORWEGIAN_LAYOUT "Norveççe" IDS_ORIYA_LAYOUT "Oriya Dili" IDS_POLISH_214_LAYOUT "Lehçe (214)" - IDS_POLISH_LAYOUT "Lehçe (Yazılımcılar)" + IDS_POLISH_LAYOUT "Lehçe Ä°zlenceciler" IDS_PORTUGUESE_LAYOUT "Portekizce" IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portekizce (Brezilya ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portekizce (Brezilya ABNT2)" @@ -223,12 +223,12 @@ BEGIN IDS_SLOVAK_QWERTY_LAYOUT "Slovakça (QWERTY)" IDS_SLOVENIAN_LAYOUT "Slovence" IDS_SPANISH_LAYOUT "Ä°spanyolca" - IDS_SPANISH_VARIANTION_LAYOUT "Ä°spanyolca Varyasyon" + IDS_SPANISH_VARIANTION_LAYOUT "Ä°spanyolca Türlülük" IDS_SWEDISH_LAYOUT "Ä°sveççe" IDS_SWISS_FRENCH_LAYOUT "Ä°sviçre Fransızcası" IDS_SWISS_GERMAN_LAYOUT "Ä°sviçre Almancası" IDS_SYRIAC_LAYOUT "Süryânice" - IDS_SYRIAC_PHONETIC_LAYOUT "Süryânice (Tam Seslik)" + IDS_SYRIAC_PHONETIC_LAYOUT "Süryânice Tüm Seslik" IDS_TAMIL_LAYOUT "Tâmilce" IDS_TATAR_LAYOUT "Tatar Türkçesi" IDS_TELUGU_LAYOUT "Telugu Dili" @@ -240,14 +240,14 @@ BEGIN IDS_TURKISH_Q_LAYOUT "Türkçe Q" IDS_UKRAINIAN_LAYOUT "Ukraynaca" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukraynaca (Öğrenci)" - IDS_UNITED_KINGDOM_LAYOUT "BirleÅŸik Krallık" + IDS_UNITED_KINGDOM_LAYOUT "Büyük Britanya" IDS_UNITED_STATES_DVIRAK_LAYOUT "ABD (Dvorak)" - IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "ABD (Dvorak - Sol El)" - IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "ABD (Dvorak - SaÄŸ El)" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "ABD (Dvorak - Sol el için.)" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "ABD (Dvorak - SaÄŸ el için.)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "ABD (Uluslararası)" IDS_URDU_LAYOUT "Urduca" IDS_US_LAYOUT "ABD" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT "ABD Ä°ngilizcesi (IBM Arapça 238_L için.)" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT "ABD Ä°ngilizce Çizelgesi (IBM Arapça 238_L için.)" IDS_UZBEK_CYRILLIC_LAYOUT "Özbek Türkçesi (Kiril)" IDS_VIETNAMESE_LAYOUT "Vietnamca" END diff --git a/reactos/dll/cpl/intl/lang/tr-TR.rc b/reactos/dll/cpl/intl/lang/tr-TR.rc index 16a084a2171..d3588a47b20 100644 --- a/reactos/dll/cpl/intl/lang/tr-TR.rc +++ b/reactos/dll/cpl/intl/lang/tr-TR.rc @@ -8,13 +8,13 @@ CAPTION "Bölgelik Seçenekler" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ölçünler ve Biçimler", -1, 5, 5, 234, 162 - LTEXT "Bu seçenek, birtakım izlencelerdeki sayıların, nakit birimlerinin, târihlerin ve saatlerin biçimlerini etkiler.", -1, 14, 17, 220, 25 - LTEXT "Husûsiyetleri karşılaÅŸtırmak için bir öğe seçiniz veyâ ""HusûsileÅŸtir..."" düğmesine tıklayarak kendi biçiminizi deÄŸiÅŸtiriniz.", -1, 14, 37, 220, 22 + LTEXT "Bu seçenek, birtakım izlencelerin sayı, para birimi, târih ve saat biçimlerini etkiler.", -1, 14, 17, 220, 25 + LTEXT "Husûsiyetleri karşılaÅŸtırmak için bir öğe seçiniz veyâ kendi biçiminizi seçmek için HusûsileÅŸtir'e tıklayınız.", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&HusûsileÅŸtir...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Örnekler", -1, 14, 73, 70, 10 LTEXT "Sayı:", -1, 16, 86, 48, 10 - LTEXT "Nakit Birimi:", -1, 16, 101, 48, 10 + LTEXT "Paralık:", -1, 16, 101, 48, 10 LTEXT "Saat:", -1, 16, 116, 48, 10 LTEXT "Kısa Târih:", -1, 16, 131, 48, 10 LTEXT "Uzun Târih:", -1, 16, 146, 48, 10 @@ -24,7 +24,7 @@ BEGIN EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "CoÄŸrâfî Konum", -1, 5, 172, 234, 55 - LTEXT "Birtakım hizmetlerin size haberler, hava durumları gibi yerli bilgileri saÄŸlayabilmesi için konumunuzu belirleyiniz.", -1, 14, 184, 210, 24 + LTEXT "Konumunuzu belirleyiniz, böylece birtakım hizmetler size haberler ve hava durumları gibi yerli bilgiler saÄŸlayabilir.", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -34,12 +34,12 @@ CAPTION "Diller" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Metin GiriÅŸ Dilleri ve Hizmetleri", -1, 5, 5, 234, 52 - LTEXT "Dil veyâ metin giriÅŸ yöntemlerini deÄŸiÅŸtirmek için ""Ayrıntılar..."" düğmesine tıklayınız.", -1, 12, 15, 220, 18 + LTEXT "Dil veyâ metin giriÅŸ yöntemlerini görüntülemek veyâ deÄŸiÅŸtirmek için ""Ayrıntılar...""a tıklayınız.", -1, 12, 15, 220, 18 PUSHBUTTON "&Ayrıntılar...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Ek Dil DesteÄŸi", -1, 5, 62, 234, 82 - LTEXT "Birçok dil ön tanımlı olarak yüklenmiÅŸtir. Ek dilleri yüklemek için aÅŸağıdaki uygun seçme kutucuklarını imleyiniz.", -1, 12, 72, 220, 18 - CHECKBOX "&Karmaşık El Yazısı ve SaÄŸdan Sola DoÄŸru Yazılan Diller İçin Gereken Kütükleri Yükle", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "&DoÄŸu Asya Dilleri İçin Gereken Kütükleri Yükle", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + LTEXT "Birçok dil ön tanımlı olarak yüklenmiÅŸtir. Ek diller yüklemek için aÅŸağıdaki uygun kutucuÄŸu seçiniz.", -1, 12, 72, 220, 18 + CHECKBOX "&Karmaşık El Yazısı ve SaÄŸdan Sola Diller İçin Kütükleri Yükle", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE + CHECKBOX "&DoÄŸu Asya Dilleri İçin Kütükleri Yükle", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -49,12 +49,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Evrenlik Kodlu Olmayan Ä°zlenceler İçin Dil", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Bu dizge ayârı, Evrenlik Kodlu olmayan izlencelerin seçkelerinin ve iletiÅŸim kutularının kendi dillerinde görüntülenmesini etkinleÅŸtirir. Bu ayar, Evrenlik Kodlu izlenceleri etkilemez ve bu ayar, bu bilgisayardaki tüm kullanıcıları etkiler.", -1, 14, 18, 223, 33 - LTEXT "Kullanmak istediÄŸiniz Evrenlik Kodlu olmayan izlencelerin dil sürümlerini karşılaÅŸtırmak için bir dil seçiniz:", -1, 14, 55, 223, 18 + LTEXT "Bu dizge ayârı, Evrenlik Kodlu olmayan izlenceleri, kendi dillerinde seçkeleri ve iletiÅŸim pencerelerini görüntülemeyle etkinleÅŸtirir. Evrenlik Kodlu izlenceleri etkilemez ancak bu bilgisayarın tüm kullanıcılarına uygular.", -1, 14, 18, 223, 33 + LTEXT "&Kullanmak istediÄŸiniz Evrenlik Kodlu olmayan izlencelerin dil sürümünü karşılaÅŸtırmak için bir dil seçiniz:", -1, 14, 55, 223, 18 GROUPBOX "Kod Sayfası Dönüştürme Çizelgesi", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Ön Tanımlı Kullanıcı Hesâbı Ayarları", -1, 5, 193, 234, 30 - CHECKBOX "Bu Kullanıcının Tüm Ayarlarını Ön Tanımlı Olarak Ayarla", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + CHECKBOX "&Tüm Ayarları Åžimdiki Kullanıcı Hesâbına Ön Tanımlılara Uygula", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -62,7 +62,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sayılar" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Görünüm Örenkleri", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + GROUPBOX "Görünüm ÖrneÄŸi", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE LTEXT "Artı:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Eksi:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -73,13 +73,13 @@ BEGIN COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Basamak Ayırma Simgesi:", -1, 8, 100, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "B&asamakların Ayrılması:", -1, 8, 117, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "B&asamak Ayrılması:", -1, 8, 117, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Eksi Ä°mi Simgesi:", -1, 8, 134, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "E&ksi Sayı Biçimi:", -1, 8, 149, 100, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Öndeki Sıfırların Görünümü:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Öncü Sıfırların Görünümü:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Dizelge Ayırıcısı:", -1, 8, 181, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -89,15 +89,15 @@ END IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Nakit Birimi" +CAPTION "Para Birimi" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Görünüm Örenkleri", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + GROUPBOX "Görünüm ÖrneÄŸi", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Artı:", -1, 13, 21, 27, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Eksi:", -1, 120, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "&Nakit Birimi Simgesi:", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Para Birimi Simgesi:", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Artı Nicelik:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -107,9 +107,9 @@ BEGIN COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Kesirli Basamakların Sayısı:", -1, 10, 128, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Basamak Ayırma Simgesi:", -1, 10, 156, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "A&yırma Simgesi:", -1, 10, 156, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Ba&samakların Ayrılması:", -1, 10, 173, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Basamak Ayrılması:", -1, 10, 173, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -119,21 +119,21 @@ CAPTION "Saat" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Görünüm ÖrneÄŸi", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE - LTEXT "Saat:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Saat ÖrneÄŸi:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "&Saat Biçimi:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "S&aat Biçimi:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Saa&t Ayırıcısı:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&AM Simgesi:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "&ÖÖ Simgesi:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&PM Simgesi:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "Ö&S Simgesi:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE - LTEXT "Saat Biçimi Açıklaması:\n\n\ -h = Saat m = Dakîka s = Sâniye t = AM veyâ PM\n\n\ + LTEXT "Saat Biçimi Gösterimi:\n\n\ +h = Saat m = Dakîka s = Sâniye t = ÖÖ veyâ ÖS\n\n\ h = 12 Saatlik H = 24 Saatlik\n\ -hh, mm, ss = BaÅŸlarda Sıfır Var h, m, s = BaÅŸlarda Sıfır Yok", -1, 13, 150, 214, 50, WS_CHILD | WS_VISIBLE | WS_GROUP +hh, mm, ss = Öncü Sıfır Var h, m, s = Öncü Sıfır Yok", -1, 13, 150, 214, 50, WS_CHILD | WS_VISIBLE | WS_GROUP END IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 @@ -142,9 +142,9 @@ CAPTION "Târih" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Takvim", -1, 7, 7, 230, 74 - LTEXT "EÄŸer yıl iki basamakla gösterildiyse yıl bu yıllar arasında varsayılır:", -1, 13, 18, 215, 8 + LTEXT "EÄŸer yıl iki basamakla gösterilmiÅŸse ÅŸunlar arsında bir yıl olduÄŸu varsayılır:", -1, 13, 18, 215, 8 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "ve", -1, 55, 32, 17, 8 + LTEXT "&ve", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 LTEXT "Takvim Türü:", -1, 13, 48, 56, 10 @@ -154,18 +154,18 @@ BEGIN GROUPBOX "Kısa Târih Biçimi", -1, 7, 83, 230, 81 LTEXT "Örnek:", -1, 13, 95, 63, 10 EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "Örnek (SaÄŸdan Sola OkunuÅŸta):", -1, 13, 109, 60, 16 + LTEXT "Örnek (SaÄŸdan Sola OkunuÅŸ):", -1, 13, 109, 60, 16 EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED - LTEXT "Kısa Biçim:", -1, 13, 131, 60, 10 + LTEXT "&Kısa Biçim:", -1, 13, 131, 60, 10 COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Târih BileÅŸenleri Ayırıcısı:", -1, 13, 148, 113, 10 + LTEXT "&Târih BileÅŸenleri Ayırıcısı:", -1, 13, 148, 113, 10 COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE GROUPBOX "Uzun Târih Biçimi", -1, 7, 167, 230, 64 LTEXT "Örnek:", -1, 13, 179, 61, 10 EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "Örnek (SaÄŸdan Sola OkunuÅŸta):", -1, 13, 193, 61, 16 + LTEXT "Örnek (SaÄŸdan Sola OkunuÅŸ):", -1, 13, 193, 61, 16 EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED - LTEXT "Uzun Biçim:", -1, 13, 215, 60, 10 + LTEXT "&Uzun Biçim:", -1, 13, 215, 60, 10 COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END @@ -175,14 +175,14 @@ CAPTION "Sıralama" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Sıralama", -1, 7, 7, 230, 74 - LTEXT "Sıralama yöntemleri; damgaların, sözcüklerin, kütüklerin ve dizinlerin sıralamasını tanımlar.", -1, 14, 17, 220, 25 + LTEXT "Sıralama yöntemleri; damgaların, sözcüklerin, kütüklerin ve dizinlerin sıralama düzenini tanımlar.", -1, 14, 17, 220, 25 LTEXT "Diliniz için bir sıralama yöntemi seçiniz:", -1, 14, 37, 220, 22 COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Bölgelik Ayarları HusûsileÅŸtirme" + IDS_CUSTOMIZE_TITLE "Bölgelik Ayarları HusûsileÅŸtir" IDS_SPAIN "Ä°spanyol (Ä°spanya)" IDS_METRIC "Ölçümlü" IDS_IMPERIAL "Ä°lhanlık" @@ -191,20 +191,20 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Bölgelik Ayarlar" - IDS_CPLDESCRIPTION "Dilleri ve sayı, nakit birimi, saat ve târih biçimlerini seçer." + IDS_CPLDESCRIPTION "Dilleri ve sayı, para birimi, saat ve târih biçimlerini seçer." END STRINGTABLE BEGIN IDS_ERROR "Yanlışlık" - IDS_ERROR_SYMBOL_SEPARATE "Girilen kısa târih ayıracı yanlış simge(ler) içeriyor." - IDS_ERROR_SYMBOL_FORMAT_SHORT "Girilen kısa târih biçimi yanlış simge(ler) içeriyor." - IDS_ERROR_SYMBOL_FORMAT_LONG "Girilen uzun târih biçimi yanlış simge(ler) içeriyor." - IDS_ERROR_OEM_CODE_PAGE "OEM kod sayfasının okunmasında sorun var." - IDS_ERROR_ANSI_CODE_PAGE "ANSI kod sayfasının okunmasında sorun var." - IDS_ERROR_INT_KEY_REG "HKCU\\Control Panel\\International dizininin açılmasında sorun var." - IDS_ERROR_DEF_INT_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin açılmasında sorun var." - IDS_ERROR_NLS_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin açılmasında sorun var." - IDS_ERROR_NLS_CODE_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin açılmasında sorun var." - IDS_ERROR_INPUT_DLL "input.dll baÅŸlatılamıyor." + IDS_ERROR_SYMBOL_SEPARATE "Kısa târih bileÅŸenleri ayıracı yanlış simge(ler) içeriyor." + IDS_ERROR_SYMBOL_FORMAT_SHORT "Kısa târih biçimi yanlış simge(ler) içeriyor." + IDS_ERROR_SYMBOL_FORMAT_LONG "Uzun târih biçimi yanlış simge(ler) içeriyor." + IDS_ERROR_OEM_CODE_PAGE "OEM kod sayfasını okumada bir sorun oldu." + IDS_ERROR_ANSI_CODE_PAGE "ANSI kod sayfasını okumada bir sorun oldu." + IDS_ERROR_INT_KEY_REG "HKCU\\Control Panel\\International dizinini açmada bir sorun oldu." + IDS_ERROR_DEF_INT_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizinini açmada bir sorun oldu." + IDS_ERROR_NLS_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizinini açmada bir sorun oldu." + IDS_ERROR_NLS_CODE_REG "HKU\\.DEFAULT\\Control Panel\\International dizinini açmada bir sorun oldu." + IDS_ERROR_INPUT_DLL "input.dll baÅŸlatılamaz." END diff --git a/reactos/dll/cpl/joy/lang/tr-TR.rc b/reactos/dll/cpl/joy/lang/tr-TR.rc index 7f5a44972ef..95a051e7c81 100644 --- a/reactos/dll/cpl/joy/lang/tr-TR.rc +++ b/reactos/dll/cpl/joy/lang/tr-TR.rc @@ -9,7 +9,7 @@ CAPTION "Oyun Denetleyicileri" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "Bu ayarlar, bilgisayarda kurulu olan oyun denetleyicilerini yapılandırmaya yardım eder.", -1, 33, 7, 214, 20, NOT WS_GROUP + LTEXT "Bu ayarlar, bilgisayarınızda yüklü oyun denetleyicilerini yapılandırmanıza yardım eder.", -1, 33, 7, 214, 20, NOT WS_GROUP GROUPBOX "&Yüklü Oyun Denetleyicileri", -1, 7, 34, 238, 117 CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 PUSHBUTTON "&Ekle...", IDC_ADD_BUTTON, 35, 129, 65, 14 @@ -27,7 +27,7 @@ CAPTION "Oyun Denetleyicisi Ekle" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 - LTEXT "AÅŸağıdaki dizelgeden bir oyun denetleyicisi seçiniz, ardından ""Tamam"" düğmesine tıklayınız. EÄŸer oyun denetleyicisi dizelgede gözükmüyorsa ""Husûsî..."" düğmesine tıklayınız.", -1, 35, 7, 210, 33 + LTEXT "AÅŸağıdaki dizelgeden bir oyun denetleyicisi seçiniz, ardından ""Tamam""a tıklayınız. EÄŸer oyun denetleyiciniz dizelgede gözükmüyorsa ""Husûsî...""ye tıklayınız.", -1, 35, 7, 210, 33 LTEXT "&Oyun Denetleyicileri:", -1, 8, 45, 126, 8 LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP AUTOCHECKBOX "&Dümenleri ve Ayaklıkları EtkinleÅŸtir", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP @@ -47,12 +47,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "DeÄŸiÅŸik Husûsiyetler", -1, 7, 7, 245, 52 AUTORADIOBUTTON "&Oyun ÇubuÄŸu", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 - AUTORADIOBUTTON "&UçuÅŸ Bağı veyâ UçuÅŸ ÇubuÄŸu", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&UçuÅŸ Dümeni veyâ UçuÅŸ ÇubuÄŸu", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 AUTORADIOBUTTON "O&yun Kolu", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 AUTORADIOBUTTON "Y&arış Arabası Denetleyicisi", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 GROUPBOX "Eksenler", -1, 7, 67, 116, 44, WS_GROUP COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTORADIOBUTTON "&Dümen/Ayaklık", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "&Dümen/Ayaklıklar", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE AUTORADIOBUTTON "&Z Ekseni", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE GROUPBOX "Düğmeler", -1, 137, 67, 116, 44 COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE @@ -72,7 +72,7 @@ BEGIN ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 DEFPUSHBUTTON "Tamam", IDOK, 106, 65, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 163, 65, 50, 14 - LTEXT "Daha eski izlencelerle kullanmak için bir aygıt seçiniz.", -1, 7, 7, 208, 10 + LTEXT "Daha eski izlencelerle kullanmak istiyorsanız bir aygıt seçiniz.", -1, 7, 7, 208, 10 LTEXT "&YeÄŸlenen Aygıt:", -1, 34, 24, 70, 10 COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL END @@ -80,7 +80,7 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Oyun Denetleyicileri" - IDS_CPLSYSTEMDESCRIPTION "Oyun çubukları veyâ oyun kolları gibi oyun denetleyicisi donanımlarını ekler, çıkarır ve yapılandırır." + IDS_CPLSYSTEMDESCRIPTION "Oyun çubukları ve oyun kolları gibi oyun denetleyicisi donanımlarını ekler, çıkarır ve yapılandırır." IDS_CONTROLLER "Denetleyici" IDS_STATUS "Durum" END diff --git a/reactos/dll/cpl/liccpa/lang/tr-TR.rc b/reactos/dll/cpl/liccpa/lang/tr-TR.rc index becf8694c5e..d46a4d96c8e 100644 --- a/reactos/dll/cpl/liccpa/lang/tr-TR.rc +++ b/reactos/dll/cpl/liccpa/lang/tr-TR.rc @@ -7,9 +7,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | W CAPTION "Ruhsatlama Kipini DeÄŸiÅŸtir" FONT 8, "Helv" BEGIN - CONTROL "Ruhsatlama Kipini DeÄŸiÅŸtir", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "&Ä°stemci Ruhsatlama Kipi", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 CONTROL "&Aygıt Başına veyâ Kullanıcı Başına", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 - CONTROL "&Sunucu Başına. Aynı zamanlı baÄŸlantı sayısı:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "&Sunucu Başına. EÅŸ zamanlı baÄŸlantı sayısı:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 CONTROL "&Ãœrün:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 1 CONTROL "Tamam", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 diff --git a/reactos/dll/cpl/main/lang/tr-TR.rc b/reactos/dll/cpl/main/lang/tr-TR.rc index 4df5a20d3d4..59fd9d75a84 100644 --- a/reactos/dll/cpl/main/lang/tr-TR.rc +++ b/reactos/dll/cpl/main/lang/tr-TR.rc @@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hız" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Damganın Yinelenmesi", -1, 5, 5, 236, 135 + GROUPBOX "Damga Yinelenmesi", -1, 5, 5, 236, 135 ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15 - LTEXT "&Yineleme Gecikmesi:", -1, 40, 18, 100, 10 + LTEXT "&Yinelenme Gecikmesi:", -1, 40, 18, 100, 10 LTEXT "Uzun", -1, 40, 33, 20, 10 LTEXT "Kısa", -1, 200, 33, 20, 10 CONTROL "", IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15 - LTEXT "Y&ineleme Hızı:", -1, 40, 70, 100, 10 + LTEXT "Y&inelenme Hızı:", -1, 40, 70, 100, 10 LTEXT "YavaÅŸ", -1, 40, 85, 20, 10 LTEXT "Hızlı", -1, 200, 85, 20, 10 CONTROL "", IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Yi&neleme hızını sınamak için buraya tıklayıp bir düğmeyi basılı tutunuz:", -1, 15, 105, 216, 10 + LTEXT "Yi&nelenme hızını sınamak için buraya tıklayınız ve bir düğmeyi basılı tutunuz:", -1, 15, 105, 216, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Ä°&mlecin Yanıp Sönme Hızı", -1, 5, 145, 236, 50 + GROUPBOX "Ä°&mleç Yanıp Sönme Hızı", -1, 5, 145, 236, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 LTEXT "Yok", -1, 40, 165, 25, 10 LTEXT "Hızlı", -1, 200, 165, 30, 10 @@ -44,7 +44,7 @@ BEGIN CONTROL "", IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17 PUSHBUTTON "Tamam", IDOK, 110, 59, 60, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 174, 59, 60, 14 - LTEXT "&Tıklamanız kilitlenmeden önce bir fâre düğmesinin ya da bir fâre tekerinin ne denli basılı tutulacağını ayarlayınız:", -1, 37, 5, 200, 27 + LTEXT "&Tıklamanız kilitlenmeden önce bir fâre ya da top düğmesinin ne denli basılı tutmanız gerektiÄŸini ayarlayınız:", -1, 37, 5, 200, 27 ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END @@ -56,9 +56,9 @@ BEGIN GROUPBOX "Düğme Yapılandırması", -1, 5, 5, 236, 70 CHECKBOX "&Birinci ve Ä°kinci Düğmeleri DeÄŸiÅŸtir", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE - LTEXT "Bu kutucuÄŸu imleyerek saÄŸ fâre düğmesini seçme ve sürükleme gibi birinci iÅŸlevlerde kullanılan bir düğmeye dönüştürebilirsiniz.", -1, 10, 36, 156, 30 + LTEXT "Seçme ve sürükleme gibi birinci iÅŸlevler için kullanılan bir saÄŸ fâre düğmesi yapmak için bu kutucuÄŸu seçiniz.", -1, 10, 36, 156, 30 GROUPBOX "Çift Tıklama Hızı", -1, 5, 78, 236, 70 - LTEXT "Dizine çift tıklayarak bu ayârı sınayınız. EÄŸer dizin açılmıyor ya da kapanmıyorsa daha yavaÅŸ bir ayar deneyiniz.", -1, 10, 90, 156, 28 + LTEXT "Ayarlarınızı sınamak için dizine çift tıklayınız. EÄŸer dizin açılmıyor ya da kapanmıyorsa daha yavaÅŸ bir ayar deneyiniz.", -1, 10, 90, 156, 28 LTEXT "&Hız: YavaÅŸ", -1, 10, 123, 50, 10 LTEXT "Hızlı", -1, 136, 123, 24, 10 CONTROL "", IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17 @@ -66,7 +66,7 @@ BEGIN GROUPBOX "Tıklama Kilidi", -1, 5, 150, 236, 70 CHECKBOX "&Tıklama Kilidi'ni Aç", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Ayarlar...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14 - LTEXT "Fâre düğmesine basılı tutmadan sürüklemeyi ve seçmeyi etkinleÅŸtirir. Kilitlemek için kısaca fâre düğmesine basınız. Bırakmak için fâre düğmesine yine basınız.", -1, 10, 180, 224, 30 + LTEXT "Size, fâre düğmesine basılı tutmadan sürüklemeye ve vurgulamaya olanak verir. Kilitlemek için fâre düğmesine kısaca basınız. Bırakmak için yine fâre düğmesine basınız.", -1, 10, 180, 224, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -91,7 +91,7 @@ STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU CAPTION "Düzeni Kaydet" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu imleç düzenini bu adla kaydet:", -1, 5, 5, 181, 10 + LTEXT "Bu imleç düzenini ayrı kaydet:", -1, 5, 5, 181, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "Tamam", IDOK, 63, 35, 60, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 126, 35, 60, 14 @@ -103,25 +103,25 @@ CAPTION "Ä°mleç Seçenekleri" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Devinim", -1, 5, 5, 236, 60 - LTEXT "&Ä°mleç Hızını Seçiniz:", -1, 52, 15, 110, 10 + LTEXT "&Bir Ä°mleç Hızı Seçiniz:", -1, 52, 15, 110, 10 LTEXT "YavaÅŸ", -1, 60, 30, 20, 10 CONTROL "", IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Hızlı", -1, 170, 30, 20, 10 ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 18, 20, 32, 32 CHECKBOX "Ä°&mleç Duyarlılığını Arttır", IDC_CHECK_POINTER_PRECISION, 52, 50, 140, 10 - GROUPBOX "Çabukluk", -1, 5, 70, 236, 40 - CHECKBOX "Ä°m&leci Ä°letiÅŸim Kutularında KendiliÄŸinden Ön Tanımlı Düğmenin Ãœzerine Getir", + GROUPBOX "Düğmeye Git", -1, 5, 70, 236, 40 + CHECKBOX "Ä°m&leci, Ä°letiÅŸim Penceresinde Ön Tanımlı Düğmeye KendiliÄŸinden Götür", IDC_CHECK_SNAP_TO, 52, 84, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 18, 83, 15, 15 GROUPBOX "Görünürlük", -1, 5, 115, 236, 95 - CHECKBOX "Ä°ml&eç Sürüklenmesini Göster:", IDC_CHECK_POINTER_TRAIL, 52, 128, 125, 10 + CHECKBOX "Ä°ml&eç Ä°zlerini Göster:", IDC_CHECK_POINTER_TRAIL, 52, 128, 125, 10 LTEXT "Kısa", IDC_TEXT_TRAIL_SHORT, 54, 143, 25, 10 LTEXT "Uzun", IDC_TEXT_TRAIL_LONG, 157, 143, 30, 10 ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Yazarken Ä°mleci Gizle", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 - CHECKBOX "&Denetim Düğmesine Basıldığı Zaman Ä°mlecin Yerini Göster", + CHECKBOX "&Denetim Düğmesine Bastığımda Ä°mlecin Konumunu Göster", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 END @@ -133,8 +133,8 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Kaydırma", -1, 5, 5, 236, 80 ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 - LTEXT "Tekerlek bir diÅŸli döndüğünde ÅŸu denli kaydır:", -1, 60, 15, 150, 10 - RADIOBUTTON "&Bir kezde ÅŸu denli yataç:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + LTEXT "Kaydırma için tekerleÄŸi bir çentik döndür:", -1, 60, 15, 150, 10 + RADIOBUTTON "&Bir kezde aÅŸağıdaki yataç sayısı:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "B&ir kezde bir görüntülük.", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 @@ -148,26 +148,26 @@ BEGIN IDS_CPLDESCRIPTION_2 "Düğme takımı ayarlarını deÄŸiÅŸtirir." IDS_ARROW "Düz Seçim" IDS_HELP "Yardım Seçimi" - IDS_APPSTARTING "Arkada Çalışma Varken" - IDS_WAIT "Kullanımdayken" + IDS_APPSTARTING "Arka Planda Çalışma" + IDS_WAIT "Dolu" IDS_CROSSHAIR "Duyarlı Seçim" IDS_IBEAM "Metin Seçimi" IDS_NWPEN "El Yazısı" IDS_NO "Kullanılamaz" - IDS_SIZENS "Dikey Olarak Yeniden Boyutlandırma" - IDS_SIZEWE "Yatay Olarak Yeniden Boyutlandırma" - IDS_SIZENWSE "Çapraz Olarak Yeniden Boyutlandırma 1" - IDS_SIZENESW "Çapraz Olarak Yeniden Boyutlandırma 2" - IDS_SIZEALL "Taşımadayken" - IDS_UPARROW "BaÅŸka Bir Seçim" + IDS_SIZENS "Dikey Yeniden Boyutlandırma" + IDS_SIZEWE "Yatay Yeniden Boyutlandırma" + IDS_SIZENWSE "Çapraz Yeniden Boyutlandırma 1" + IDS_SIZENESW "Çapraz Yeniden Boyutlandırma 2" + IDS_SIZEALL "Taşıma" + IDS_UPARROW "BaÅŸka Seçim" IDS_HAND "BaÄŸlantı Seçimi" IDS_NONE "(Yok)" IDS_SYSTEM_SCHEME "(Dizge Düzeni)" IDS_BROWSE_FILTER "Ä°mleçler (*.ani, *.cur)\0*.ani;*.cur\0Devingen Ä°mleçler (*.ani)\0*.ani\0Durgun Ä°mleçler (*.cur)\0*.cur\0Tüm Kütükler\0*.*\0\0" IDS_BROWSE_TITLE "Göz At" - IDS_REMOVE_TITLE "Ä°mleç Düzenini Silmeyi DoÄŸrulama" - IDS_REMOVE_TEXT """%s"" imleç düzenini silmeyi doÄŸruluyor musunuz?" - IDS_OVERWRITE_TITLE "Ä°mleç Düzeninin Ãœzerine Yazmayı DoÄŸrulama" - IDS_OVERWRITE_TEXT "Bu imleç düzeni adı kullanımda. Var olan imleç düzeninin üzerine yazmayı doÄŸruluyor musunuz?" + IDS_REMOVE_TITLE "Ä°mleç Düzeni Silmeyi DoÄŸrula" + IDS_REMOVE_TEXT """%s"" imleç düzenini silmek istediÄŸinizi doÄŸrula musunuz?" + IDS_OVERWRITE_TITLE "Ä°mleç Düzeninin Ãœzerine Yazmayı DoÄŸrula" + IDS_OVERWRITE_TEXT "SeçtiÄŸiniz imleç düzeni adı önceden kullanımda. Var olan imleç düzeninin üzerine yazmayı istiyor musunuz?" IDS_ANIMATE_CURSOR "Devingen Ä°mleç" END diff --git a/reactos/dll/cpl/mmsys/lang/tr-TR.rc b/reactos/dll/cpl/mmsys/lang/tr-TR.rc index 494f4f01191..993bcd9aeed 100644 --- a/reactos/dll/cpl/mmsys/lang/tr-TR.rc +++ b/reactos/dll/cpl/mmsys/lang/tr-TR.rc @@ -9,18 +9,18 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Aygıt Sesi", -1, 7, 30, 230, 100 + GROUPBOX "Aygıt Ses Düzeyi", -1, 7, 30, 230, 100 CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Düşük", -1, 62, 66, 30, 9 LTEXT "Yüksek", -1, 195, 66, 30, 9 - CHECKBOX "&Kısılmış", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "&Görev ÇubuÄŸuna Ses Simgesini YerleÅŸtir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + CHECKBOX "&Sessiz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 + CHECKBOX "&Görev ÇubuÄŸunda Ses Düzeyi Simgesini YerleÅŸtir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "G&eliÅŸmiÅŸ...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Hoparlör Ayarları", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 - LTEXT "Tek bir hoparlörün, sesini ve diÄŸer ayarlarını deÄŸiÅŸtirmek için aÅŸağıdaki ayarları kullanınız.", -1, 70, 155, 150, 36 - PUSHBUTTON "&Hoparlör Sesi...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 + LTEXT "Tek hoparlörün, ses düzeyini ve diÄŸer ayarlarını deÄŸiÅŸtirmek için aÅŸağıdaki ayarları kullanınız.", -1, 70, 155, 150, 36 + PUSHBUTTON "&Hoparlör Ses Düzeyi...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Ge&liÅŸmiÅŸ...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 END @@ -29,13 +29,13 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sesler" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ses düzenleri, ReactOS'un ve izlencelerin içindeki olaylara sesler atayan sesler takımıdır. Var olan bir düzeni seçebilir veyâ deÄŸiÅŸtirdiÄŸinizi kaydedebilirsiniz.", -1, 8, 7, 230, 30 + LTEXT "Bir ses düzeni, ReactOS'taki ve izlencelerdeki olaylara uygulayan bir ses kümesidir. Var olan bir düzeni seçebilir veyâ deÄŸiÅŸtirdiÄŸinizi kaydedebilirsiniz.", -1, 8, 7, 230, 30 LTEXT "&Ses Düzeni:", -1, 8, 42, 150, 9 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ayrı Kaydet...", IDC_SAVEAS_BTN, 134, 70, 50, 15 PUSHBUTTON "S&il", IDC_DELETE_BTN, 188, 70, 50, 15 - LTEXT "Sesleri deÄŸiÅŸtirmek için aÅŸağıdaki dizelgede bulunan bir olaya tıklayınız, sonra uygulamak için bir ses seçiniz. DeÄŸiÅŸiklikleri yeni bir ses düzeni olarak kaydedebilirsiniz.", -1, 8, 90, 230, 27 - LTEXT "&Olaylar:", -1, 8, 118, 150, 9 + LTEXT "Sesleri deÄŸiÅŸtirmek için aÅŸağıdaki dizelgede bir izlence olayına tıklayınız, sonra uygulamak için bir ses seçiniz. DeÄŸiÅŸiklikleri yeni bir ses düzeni olarak kaydedebilirsiniz.", -1, 8, 90, 230, 27 + LTEXT "Ä°&zlence Olayları:", -1, 8, 118, 150, 9 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE LTEXT "S&esler:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED @@ -48,19 +48,19 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ses" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Kayıttan Yürütme", -1, 7, 7, 230, 60 + GROUPBOX "Ses Çalma", -1, 7, 7, 230, 60 ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Ön Tanımlı Aygıt:", -1, 50, 20, 80, 9 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Ses Düzeyi...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&GeliÅŸmiÅŸ...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Ses Kaydı", -1, 7, 75, 230, 60 + GROUPBOX "Ses Kaydetme", -1, 7, 75, 230, 60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Ö&ntanımlı Aygıt:", -1, 50, 88, 80, 9 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "S&es Düzeyi...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Ge&liÅŸmiÅŸ...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI Sesi Yürütme", -1, 7, 145, 230, 60 + GROUPBOX "MIDI Mûsikisi Çalma", -1, 7, 145, 230, 60 ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Ön&tanımlı Aygıt:", -1, 50, 158, 80, 9 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST @@ -74,14 +74,14 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ä°nsan Sesi" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu ayarlar, seçili yürütme veyâ kaydetme aygıtının ses düzeyini ve geliÅŸmiÅŸ seçeneklerini denetler.", -1, 8, 7, 230, 40 - GROUPBOX "Yürütme", -1, 7, 37, 230, 60 + LTEXT "Bu ayarlar, seçtiÄŸiniz insan sesi çalma veyâ insan sesi kaydetme aygıtı için ses düzeyini ve geliÅŸmiÅŸ seçenekleri denetler.", -1, 8, 7, 230, 40 + GROUPBOX "Ä°nsan Sesi Çalma", -1, 7, 37, 230, 60 ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Ön Tanımlı Aygıt:", -1, 50, 50, 80, 9 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Ses Düzeyi...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&GeliÅŸmiÅŸ...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Kaydetme", -1, 7, 105, 230, 60 + GROUPBOX "Ä°nsan Sesi Kaydetme", -1, 7, 105, 230, 60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Ö&ntanımlı Aygıt:", -1, 50, 118, 80, 9 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST @@ -102,7 +102,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL CAPTION "Düzeni Kaydet" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Bu düzeni ÅŸu adla kaydet:", -1, 7, 7, 212, 9 + LTEXT "&Bu ses düzenini ayrı kaydet:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "Tamam", IDOK, 93, 36, 60, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 157, 36, 60, 14 @@ -114,9 +114,9 @@ CAPTION "Hoparlörler" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Bilgisayarın iye olduÄŸu düzene en çok benzeyen hoparlör düzenini seçiniz.", -1, 36, 8, 215, 27 + LTEXT "Bilgisayarınızda, iye olduÄŸunuz kuruluma en çok benzeyen hoparlör kurulumunu seçiniz.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "&Hoparlör Düzeni:", 8502, 53, 169, 55, 10 + LTEXT "&Hoparlör Kurulumu:", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END @@ -125,8 +125,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "BaÅŸarım" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu ayarlar, ReactOS'un sesleri nasıl yürüteceÄŸini denetler. Bu ayarlar, sesle ilgili sorunların çözümünde yardımcı olabilir.", 8492, 34, 7, 218, 23 - GROUPBOX "Ses Yürütme", 8494, 7, 32, 243, 152 + LTEXT "Bu ayarlar, ReactOS'un sesi nasıl çalacağını denetler. Sesle ilgili sorunları çözmenize yardımcı olabilir.", 8492, 34, 7, 218, 23 + GROUPBOX "Ses Çalma", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 LTEXT "&Donanım Ä°vmesi:", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 @@ -134,11 +134,11 @@ BEGIN CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 PUSHBUTTON "Ö&ntanımlılara Geri Dön", 5400, 7, 191, 110, 14 LTEXT "Yok", 8497, 128, 56, 21, 10 - LTEXT "Eksiksiz", 8498, 214, 56, 21, 9 + LTEXT "Tüm", 8498, 214, 56, 21, 9 LTEXT "Ä°yi", 8499, 128, 123, 21, 10 LTEXT "En Ä°yi", 8500, 214, 123, 23, 9 LTEXT "Bu dizgi, yakalama aygıtı için donanım ayârını tanımlar.", 5399, 13, 145, 227, 21 - LTEXT "Bu dizgi, render aygıtı için donanım ayârını tanımlar.", 5398, 13, 78, 227, 22 + LTEXT "Bu dizgi, iÅŸleyici aygıt için donanım ayârını tanımlar.", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 @@ -146,8 +146,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "BaÅŸarım" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu ayarlar, ReactOS'un sesleri nasıl yürüteceÄŸini denetler. Bu ayarlar, sesle ilgili sorunların çözümünde yardımcı olabilir.", 8492, 34, 7, 217, 20 - GROUPBOX "Ses Yürütme", 8494, 7, 29, 242, 122 + LTEXT "Bu ayarlar, ReactOS'un sesi nasıl çalacağını denetler. Sesle ilgili sorunları çözmenize yardımcı olabilir.", 8492, 34, 7, 217, 20 + GROUPBOX "Ses Çalma", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 LTEXT "&Donanım Ä°vmesi:", 8495, 13, 46, 103, 9 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 @@ -155,11 +155,11 @@ BEGIN CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 PUSHBUTTON "Ö&ntanımlılara Geri Dön", 5400, 9, 158, 110, 14 LTEXT "Yok", 8497, 125, 46, 24, 10 - LTEXT "Tam", 8498, 217, 46, 19, 9 + LTEXT "Tüm", 8498, 217, 46, 19, 9 LTEXT "Ä°yi", 8499, 125, 103, 24, 10 LTEXT "En Ä°yi", 8500, 217, 103, 19, 9 LTEXT "Bu dizgi, yakalama aygıtı için donanım ayârını tanımlar.", 5399, 13, 125, 222, 21 - LTEXT "Bu dizgi, render aygıtı için donanım ayârını tanımlar.", 5398, 13, 68, 218, 24 + LTEXT "Bu dizgi, iÅŸleyici aygıt için donanım ayârını tanımlar.", 5398, 13, 68, 218, 24 END IDD_SETUP1 DIALOG 0, 0, 227, 206 @@ -169,11 +169,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ReactOS Ses", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "ReactOS sesleri çalamıyor, çünkü ReactOS Ses hizmeti etkin deÄŸil.", 10245, 60, 25, 150, 40 + LTEXT "ReactOS Ses hizmeti etkin olmadığından dolayı bu bilgisayar ses çalamaz.", 10245, 60, 25, 150, 40 AUTOCHECKBOX "&ReactOS Ses'i EtkinleÅŸtir", 10253, 60, 68, 150, 9 - LTEXT "Önemli:", 10246, 58, 87, 150, 11 - LTEXT "1. Bu hizmeti etkinleÅŸtrmek için yönetici olmalısınız. Yönetici olarak oturum açmadıysanız biraz sonra yönetici adını ve ÅŸifresini gireceksiniz.", 10247, 60, 100, 150, 40 - LTEXT "2. ReactOS Ses'i etkinleÅŸtirdikten sonra bilgisayarı yeniden baÅŸlatmalısınız.", 10248, 60, 140, 150, 40 + LTEXT "Notlar:", 10246, 58, 87, 150, 11 + LTEXT "1. Bu hizmeti etkinleÅŸtrmek için bir yönetici olmalısınız. EÄŸer yönetici olarak oturum açmadıysanız sizden bir yönetici adı ve ÅŸifre istenecektir.", 10247, 60, 100, 150, 40 + LTEXT "2. ReactOS Ses'i etkinleÅŸtirdiÄŸinizden sonra bilgisayarı yeniden baÅŸlatmanız gerekecektir.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 @@ -225,45 +225,45 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ReactOS Ses", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "ReactOS Ses Hizmeti ÅŸimdi etkinleÅŸtirildi. Bununla birlikte ReactOS'u yeniden baÅŸlatana dek sesler düzgün bir ÅŸekilde çalınamayabilir. EÄŸer ÅŸimdi bilgisayarı yeniden baÅŸlatmak isterseniz ilk önce çalışmalarınızı kaydediniz, ardından tüm izlenceleri kapatınız.", 10261, 60, 25, 150, 50 - LTEXT "ReactOS'u yeniden baÅŸlatmak için ""Tamam"" düğmesine tıklayınız.", 10262, 60, 75, 150, 20 - LTEXT "EÄŸer iptal ederseniz ReactOS Ses'in uygun bir ÅŸekilde çalışması için bilgisayarı yeniden baÅŸlatmaya gereksinim duyacaksınız.", 10263, 60, 100, 150, 40 + LTEXT "ReactOS Ses hizmeti ÅŸimdi etkin. Bununla birlikte ReactOS'u yeniden baÅŸlatana dek ses düzgün çalışamayabilir. EÄŸer ÅŸimdi bilgisayarı yeniden baÅŸlatmak isterseniz ilk önce çalışmalarınızı kaydediniz ve tüm izlenceleri kapatınız.", 10261, 60, 25, 150, 50 + LTEXT "ReactOS'u yeniden baÅŸlatmak için Tamam'a tıklayınız.", 10262, 60, 75, 150, 20 + LTEXT "EÄŸer iptal ederseniz ReactOS Ses'in düzgün çalışması için bilgisayarı yeniden baÅŸlatmaya gereksinim duyacaksınız.", 10263, 60, 100, 150, 40 END STRINGTABLE BEGIN - IDS_CPLNAME "Ses" - IDS_CPLDESCRIPTION "Bilgisayarın ses düzenini deÄŸiÅŸtirir ve hoparlörlerle kayıt aygıtları için ayarları yapılandırır." + IDS_CPLNAME "Ses ve Ses Aygıtları" + IDS_CPLDESCRIPTION "Bilgisayarınız için ses düzenini deÄŸiÅŸtirir, hoparlörleriniz ve kaydetme aygıtlarınız için ayarları yapılandırır." IDS_NO_SOUND "(Yok)" IDS_NO_DEVICES "Aygıt Yok" 5825 "Ä°zlence Yanlışlığı" - 5826 "Ä°zlenceyi Kapatma" - 5827 "Çok Az Kalan Pil Uyarısı" + 5826 "Ä°zlenceyi Kapat" + 5827 "Çok Azalmış Pil Uyarısı" 5828 "Aygıt BaÄŸlandı" 5829 "Aygıt Çıkarıldı" 5830 "Aygıt BaÄŸlama BaÅŸarısız" - 5831 "Geri Dönüşüm Kutusunu BoÅŸaltma" - 5832 "Az Kalan Pil Uyarısı" - 5833 "Görüntülüğü Kaplatma" + 5831 "BoÅŸ Geri Dönüşüm Kutusu" + 5832 "Azalmış Pil Uyarısı" + 5833 "Büyüt" 5834 "Seçke Komutu" 5835 "Açılan Seçke" - 5836 "Simge Durumuna Küçültme" - 5837 "Yeni E-Posta Bildirimi" - 5838 "Gezinmeyi BaÅŸlatma" - 5839 "Ä°zlence Açma" + 5836 "Simge Durumuna Küçült" + 5837 "Yeni Posta Bildirimi" + 5838 "Gezinmeyi BaÅŸlat" + 5839 "Ä°zlence Aç" 5840 "Yazdırma Bitirildi" - 5841 "AÅŸağı Geri Getirme" - 5842 "Yukarı Geri Getirme" + 5841 "AÅŸağı Geri Getir" + 5842 "Yukarı Geri Getir" 5843 "Yıldız Ä°mi" 5844 "Ön Tanımlı Ses" 5845 "Ãœnlem" - 5846 "ReactOS'tan Çıkma" + 5846 "ReactOS'tan Çık" 5847 "Önemli Durma" 5848 "Dizge Bildirimi" 5849 "Soru" - 5850 "ReactOS'u BaÅŸlatma" + 5850 "ReactOS'u BaÅŸlat" 5851 "BaÅŸlat Seçkesi" - 5852 "Oturumu Kapatma" - 5853 "Oturum Açma" + 5852 "Oturumu Kapat" + 5853 "Oturum Aç" 5854 "ReactOS Gezgini" END diff --git a/reactos/dll/cpl/powercfg/lang/tr-TR.rc b/reactos/dll/cpl/powercfg/lang/tr-TR.rc index 40a1dd9847f..5118719cd65 100644 --- a/reactos/dll/cpl/powercfg/lang/tr-TR.rc +++ b/reactos/dll/cpl/powercfg/lang/tr-TR.rc @@ -8,27 +8,27 @@ CAPTION "Güç Düzenleri" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 - LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. AÅŸağıdaki ayarların deÄŸiÅŸtirilmesi seçili düzeni deÄŸiÅŸtirecektir.", -1, 37, 6, 209, 36 + LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. AÅŸağıdaki ayarların deÄŸiÅŸtirilmesi seçili düzeni deÄŸiÅŸtireceÄŸini göz önünde bulundurunuz.", -1, 37, 6, 209, 36 GROUPBOX "&Güç Düzenleri", -1, 6, 43, 240, 50 COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL PUSHBUTTON "&Ayrı Kaydet...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Sil", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Bilinmiyor", IDC_GRPDETAIL, 6, 95, 240, 136 LTEXT "Bilgisyar:", IDC_SAT, 12, 109, 60, 12 - LTEXT "FiÅŸte Takılı Ä°ken", IDC_SAC, 123, 110, 45, 15 + LTEXT "Prize Takılıyken", IDC_SAC, 123, 110, 45, 15 ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 LTEXT "Pilde Çalışıyorken", IDC_SDC, 195, 110, 45, 15 ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 LTEXT "G&östergeci Kapat:", IDC_MONITOR, 13, 148, 84, 10 COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Taşınamayan Diskleri Kapat:", IDC_DISK, 13, 171, 84, 10 + LTEXT "Sâ&bit Diskleri Kapat:", IDC_DISK, 13, 171, 84, 10 COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Uykuya Geç:", IDC_STANDBY, 13, 191, 84, 10 + LTEXT "&Dizgeyi Uykuya Geçir:", IDC_STANDBY, 13, 191, 84, 10 COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "A&nıkta Beklet:", IDC_HYBERNATE, 13, 212, 84, 10 + LTEXT "D&izgeyi Anıkta Beklet:", IDC_HYBERNATE, 13, 212, 84, 10 COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -38,8 +38,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Uyarılar" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Az Kalan Pil Uyarısı", -1, 6, 7, 239, 104 - CONTROL "&Güç düzeyi ÅŸuraya gelirse az kalan pil uyarısını etkinleÅŸtir:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + GROUPBOX "Azalmış Pil Uyarısı", -1, 6, 7, 239, 104 + CONTROL "&Güç düzeyi ÅŸuraya geldiÄŸinde azalmış pil uyarısını etkinleÅŸtir:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 LTEXT "Bilinmiyor", IDC_ALARMVALUE1, 209, 20, 33, 10 LTEXT "%0", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 @@ -51,8 +51,8 @@ BEGIN LTEXT "Bilinmiyor", IDC_ALARMAKTION1, 154, 83, 84, 10 LTEXT "Ä°zlence Çalıştır:", -1, 95, 95, 55, 10 LTEXT "Bilinmiyor", IDC_ALARMPROG1, 154, 95, 84, 10 - GROUPBOX "Çok Az Kalan Pil Uyarısı", -1, 6, 120, 239, 106 - CONTROL "G&üç düzeyi ÅŸuraya gelirse çok az kalan pil uyarısını etkinleÅŸtir:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + GROUPBOX "Çok Azalmış Pil Uyarısı", -1, 6, 120, 239, 106 + CONTROL "G&üç düzeyi ÅŸuraya geldiÄŸinde çok azalmış pil uyarısını etkinleÅŸtir:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 LTEXT "Bilinmiyor", IDC_ALARMVALUE2, 209, 133, 33, 10 LTEXT "%0", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 @@ -72,57 +72,57 @@ CAPTION "GeliÅŸmiÅŸ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20 - LTEXT "Kullanılacak güç kullanımı ayarlarını seçiniz.", -1, 37, 6, 207, 20 + LTEXT "Kullanmak istediÄŸiniz güç tutumu ayarlarını seçiniz.", -1, 37, 6, 207, 20 GROUPBOX "Seçenekler", -1, 6, 30, 240, 65 - CONTROL "&Görev ÇubuÄŸunda Simgeyi Sürekli Göster", IDC_SYSTRAYBATTERYMETER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 43, 220, 10 - CONTROL "&Bilgisayar Uykudan Döndüğünde Åžifre Sor", IDC_PASSWORDLOGON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 60, 220, 10 - CONTROL "&Pilde Çalışırken Görüntülüğün Parlaklığını Azalt", IDC_VIDEODIMDISPLAY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 78, 220, 10 + CONTROL "&Görev ÇubuÄŸunda Sürekli Simge Göster", IDC_SYSTRAYBATTERYMETER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 43, 220, 10 + CONTROL "&Bilgisayar Uykudan Döndüğünde Åžifre Ä°ste", IDC_PASSWORDLOGON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 60, 220, 10 + CONTROL "&Pilde Çalışıyorken Görüntü Parlaklığını Azalt", IDC_VIDEODIMDISPLAY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 78, 220, 10 GROUPBOX "Güç Düğmeleri", -1, 6, 101, 240, 127 - LTEXT "&Taşınabilir Bilgisayarın Kapağı Kapatıldığında:", IDC_SLIDCLOSE, 15, 115, 222, 10 + LTEXT "&Taşınabilir Bilgisayarımın Kapağını Kapattığımda:", IDC_SLIDCLOSE, 15, 115, 222, 10 COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "B&ilgisayarın Güç Düğmesine Basıldığında:", IDC_SPOWERBUTTON, 15, 153, 222, 10 + LTEXT "B&ilgisayarımdaki Güç Düğmesine Bastığımda:", IDC_SPOWERBUTTON, 15, 153, 222, 10 COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Bi&lgisayarın Uyku Düğmesine Basıldığında:", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + LTEXT "Bi&lgisayarımdaki Uyku Düğmesine Bastığımda:", IDC_SSLEEPBUTTON, 15, 191, 222, 10 COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Anıkta Bekletme" +CAPTION "Anıkta Bekleme" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20 - LTEXT "Bilgisayar anıkta bekletilirken bellekte ne varsa diske kaydedilir ve bilgisayar kapatılır. Bilgisayar anıkta bekletmeden çıktığında kaldığı yerden sürdürür.", -1, 37, 6, 210, 35 - GROUPBOX "Anıkta Bekletme", -1, 6, 41, 240, 32 - CONTROL "&Anıkta Bekletmeyi EtkinleÅŸtir", IDC_HIBERNATEFILE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 55, 210, 10 - GROUPBOX "Anıkta Bekletme İçin Gereken Disk Alanı", -1, 6, 80, 240, 76 + LTEXT "Bilgisayar anıkta bekletildiÄŸinde sâbit diskinize bellekte ne varsa kaydedilir ve sonra bilgisayar kapatılır. Bilgisayarınız anıkta beklemeden çıktığında bir önceki durumuna döner.", -1, 37, 6, 210, 35 + GROUPBOX "Anıkta Bekleme", -1, 6, 41, 240, 32 + CONTROL "&Anıkta Beklemeyi EtkinleÅŸtir", IDC_HIBERNATEFILE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "Anıkta Bekleme İçin Disk Alanı", -1, 6, 80, 240, 76 LTEXT "BoÅŸ Disk Alanı:", -1, 15, 95, 140, 10 LTEXT "Bilinmiyor", IDC_FREESPACE, 160, 95, 80, 10 - LTEXT "Anıkta Bekletmek İçin Gereken Disk Alanı:", -1, 15, 115, 140, 10 + LTEXT "Anıkta Bekleme İçin Gereken Disk Alanı:", -1, 15, 115, 140, 10 LTEXT "Bilinmiyor", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 - LTEXT "Bilgisayarın anıkta bekleyebilmesi için yeterli disk boÅŸluÄŸu oluÅŸturulması gerekir.", IDC_TOLESSFREESPACE, 15, 135, 224, 20 + LTEXT "Bilgisayarınız anıkta bekleyebilmeden önce biraz disk alanı oluÅŸturmalısınız.", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END STRINGTABLE BEGIN IDS_CPLNAME_1 "Güç Seçenekleri" - IDS_CPLDESCRIPTION_1 "Bilgisayarın güç kullanımı ayarlarını yapılandırır." + IDS_CPLDESCRIPTION_1 "Bilgisayarınız için erke tutumu ayarlarını yapılandırır." IDS_PROCENT "%%%i" IDS_SOUND "Ses" IDS_TEXT "Metin" IDS_CONFIG1 "%1 Güç Düzeni İçin Ayarlar" - IDS_CONFIG2 "%1 Güç Düzeni İçin GeliÅŸmiÅŸ Ayarlar" + IDS_CONFIG2 "%1 İçin GeliÅŸmiÅŸ Ayarlar" IDS_SIZEBYTS "%i Çoklu" IDS_SIZEMB "%i MB" IDS_NOACTION "Hiçbir Åžey Yapma" IDS_PowerActionNone1 "Eylem Yok" IDS_PowerActionUnknown "Bilinmiyor" - IDS_PowerActionSleep "Uykuya Al" + IDS_PowerActionSleep "Uykuya Geçir" IDS_PowerActionHibernate "Anıkta Beklet" IDS_PowerActionShutdown "Kapat" IDS_PowerActionRestart "Yeniden BaÅŸlat" IDS_PowerActionShutdownOff "Kapat ve Gücü Kes" - IDS_PowerActionWarmEject "Ne Yapılacağını Sor" + IDS_PowerActionWarmEject "Bana Ne Yapılacağını Sor" IDS_PowerActionNone2 "Yok" IDS_TIMEOUT1 "1 Dakîka Sonra" IDS_TIMEOUT2 "2 Dakîka Sonra" @@ -140,6 +140,6 @@ BEGIN IDS_TIMEOUT14 "4 Saat Sonra" IDS_TIMEOUT15 "5 Saat Sonra" IDS_TIMEOUT16 "Hiçbir Zaman" - IDS_DEL_SCHEME "Bu güç düzenini silmeyi doÄŸruluyor musunuz?" + IDS_DEL_SCHEME "Güç düzenini silmek istediÄŸinizi doÄŸruluyor musunuz?" IDS_DEL_SCHEME_TITLE "Düzeni Sil" END diff --git a/reactos/dll/cpl/sysdm/lang/tr-TR.rc b/reactos/dll/cpl/sysdm/lang/tr-TR.rc index 69726d81a5a..b97edc115ce 100644 --- a/reactos/dll/cpl/sysdm/lang/tr-TR.rc +++ b/reactos/dll/cpl/sysdm/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */ +/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -19,8 +19,8 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "ReactOS'un Ana Sayfası'na gidiniz.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 - PUSHBUTTON "&Ruhsatı Görüntüle...", IDC_LICENCE, 170, 199, 78, 13 + CONTROL "ReactOS Ana Sayfa", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 + PUSHBUTTON "&Ruhsatı Göster...", IDC_LICENCE, 170, 199, 78, 13 END IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 @@ -30,16 +30,16 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Aygıt Yöneticisi", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON - LTEXT "Aygıt Yöneticisi, bilgisayarınızdaki kurulu aygıtları dizelgeler. Aygıt Yöneticisi'ni kullanarak herhangi bir aygıtın husûiyetlerini deÄŸiÅŸtirebilirsiniz.", IDC_STATIC, 42, 18, 204, 24 + LTEXT "Aygıt Yöneticisi, bilgisayarınızdaki kurulu donanım aygıtlarının tümünü dizelgeler. Bir aygıtın husûiyetlerini deÄŸiÅŸtirmek için Aygıt Yöneticisi'ni kullanınız.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Aygıt Yöneticisi...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Donanım Yardımcısı", IDC_STATIC, 6, 79, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON - LTEXT "Donanım Yardımcısı; donanımları kurmaya, kaldırmaya, onarmaya, çıkarmaya ve ayarlamaya yardım eder.", IDC_STATIC, 42, 90, 204, 24 + LTEXT "Donanım Yardımcısı; donanımınızı kurmanıza, kaldırmanıza, onarmanıza, çıkarmanıza ve yapılandırmanıza yardım eder.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Donanım Yardımcısı...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 - GROUPBOX "Donanım Ayarlıkları", IDC_STATIC, 6, 149, 244, 61 + GROUPBOX "Donanım Profilleri", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON - LTEXT "Donanım ayarlıkları, ayrı donanım ayarlarını kurmak ve saklamak için bir yol sunar.", IDC_STATIC, 42, 160, 204, 24 - PUSHBUTTON "D&onanım Ayarlıkları...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 + LTEXT "Donanım profilleri, ayrı donanım yapılandırmalarını kurmanız ve saklamanız için bir yol sunar.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "D&onanım Profilleri...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 @@ -47,15 +47,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "GeliÅŸmiÅŸ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Bu ayarların pek çoÄŸu, yönetici ayrıcalıklarını gerektirir.", IDC_STATIC, 12, 5, 236, 8 + LTEXT "Bu ayarların çoÄŸu için yönetici ayrıcalıkları gereklidir.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "BaÅŸarım", IDC_STATIC, 6, 18, 244, 50 - LTEXT "BaÅŸarım ayarları, bilgisayarın hızını etkileyen uygulamaların belleÄŸi nasıl kullanacağını yönetir.", IDC_STATIC, 16, 29, 228, 17 + LTEXT "Bilgisayarınızın hızını etkileyen baÅŸarım seçenekleri, uygulamaların belleÄŸi nasıl kullanacağını denetler.", IDC_STATIC, 16, 29, 228, 17 PUSHBUTTON "&Ayarlar", IDC_PERFOR, 194, 48, 50, 15 - GROUPBOX "Kullanıcı Ayarlıkları", IDC_STATIC, 6, 75, 244, 48 + GROUPBOX "Kullanıcı Profilleri", IDC_STATIC, 6, 75, 244, 48 LTEXT "Oturum açmanızla ilgili masaüstü ayarları.", IDC_STATIC, 16, 88, 228, 20 PUSHBUTTON "A&yarlar", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "BaÅŸlangıç ve Kurtarma", IDC_STATIC, 6, 131, 244, 52 - LTEXT "BaÅŸlangıç ve kurtarma ayarları, bilgisayarın nasıl açılacağını ve bilgisayarı durduran bir yanlışlık oluÅŸtuÄŸunda bilgisayarın ne yapacağını belirler.", IDC_STATIC, 16, 144, 228, 19 + LTEXT "BaÅŸlangıç ve kurtarma seçenekleri, bilgisayarınıza, nasıl açılacağını ve bir yanlışlık bilgisayarınızın durmasına neden olduÄŸunda ne yapacağını bildirir.", IDC_STATIC, 16, 144, 228, 19 PUSHBUTTON "Aya&rlar", IDC_STAREC, 194, 162, 50, 15 PUSHBUTTON "&Dizge Ayarları", IDC_SYSSETTINGS, 2, 192, 80, 15 PUSHBUTTON "&Ortam DeÄŸiÅŸkenleri", IDC_ENVVAR, 85, 192, 80, 15 @@ -69,18 +69,18 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Sürüm Bilgisi",IDC_STATIC, 6, 3, 210, 73 CONTROL "Ä°ÅŸ Ä°stasyonu Olarak Bildir", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 - LTEXT "ReactOS, sunucu iÅŸletim dizgesi olarak yapılmıştır ve öyle bildirilir. Bunu, bu kutucuÄŸu imleyerek yalnızca uygulamalar için deÄŸiÅŸtirebilirsiniz.", IDC_STATIC, 15, 15, 183, 41 + LTEXT "ReactOS, bir sunucu iÅŸletim dizgesi olarak yapılmıştır ve öyle bildirilir. Yalnızca uygulamalar için, bunu deÄŸiÅŸtirmek için bu kutucuÄŸu imleyiniz", IDC_STATIC, 15, 15, 183, 41 PUSHBUTTON "Tamam", IDOK, 166, 83, 50, 14 END IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Donanım Ayarlıkları" +CAPTION "Donanım Profilleri" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON - LTEXT "Ayrı donanım ayarları için donanım ayarlıkları oluÅŸturabilirsiniz. BaÅŸlangıçta, kullanmak istediÄŸiniz bir ayarlık seçebilirsiniz.", IDC_STATIC, 46, 11, 188, 25 - LTEXT "Var Olan Donanım Ayarlıkları:", IDC_STATIC, 8, 41, 120, 8 + LTEXT "Ayrı donanım yapılandırmaları için donanım profilleri anıklayabilirsiniz. BaÅŸlangıçta, kullanmak istediÄŸiniz profili seçebilirsiniz.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "Var Olan Donanım Profilleri:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED @@ -88,10 +88,10 @@ BEGIN PUSHBUTTON "&ÇoÄŸalt", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED PUSHBUTTON "&Adını DeÄŸiÅŸtir", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED PUSHBUTTON "&Sil", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED - GROUPBOX "Donanım Ayarlıklarının Seçimi", IDC_STATIC, 7, 130, 240, 75 - LTEXT "ReactOS BaÅŸladığında:", IDC_STATIC, 14, 142, 210, 8 - AUTORADIOBUTTON "&Bir donanım ayarlığı seçilene dek beklenilsin.", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP - AUTORADIOBUTTON "B&ir ayarlık seçilmediÄŸinde dizelgedeki ilk ayarlık seçilsin:", IDC_HRDPROFSELECT, 14, 173, 190, 8 + GROUPBOX "Donanım Profilleri Seçimi", IDC_STATIC, 7, 130, 240, 75 + LTEXT "ReactOS baÅŸladığında:", IDC_STATIC, 14, 142, 210, 8 + AUTORADIOBUTTON "&bir donanım profili seçene dek bekle.", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP + AUTORADIOBUTTON "b&ir profil seçmezsem dizelgelenen ilk profili seç:", IDC_HRDPROFSELECT, 14, 173, 190, 8 LTEXT "Sâniye Sonra", IDC_STATIC, 65, 187, 35, 8 EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | @@ -102,7 +102,7 @@ END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ayarlığı ÇoÄŸalt" +CAPTION "Profili ÇoÄŸalt" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Åžuradan:", IDC_STATIC, 5, 10, 20, 8 @@ -115,7 +115,7 @@ END IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ayarlığın Adını DeÄŸiÅŸtir" +CAPTION "Profilin Adını DeÄŸiÅŸtir" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Åžundan:", IDC_STATIC, 5, 10, 20, 8 @@ -128,12 +128,12 @@ END IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kullanıcı Ayarlıkları" +CAPTION "Kullanıcı Profilleri" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Kullanıcı ayarlıkları, oturum açma ile ilgili masaüstü ayarlarını ve diÄŸer bilgileri içerir. Her bir bilgisayarda kullanmak için ayrı bir ayarlık oluÅŸturabilir ya da tüm bilgisayarlarda kullanmak için gezici bir ayarlık seçebilirsiniz.", IDC_STATIC, 40, 11, 211, 35 - LTEXT "Bu Bilgisayarda Saklanan Ayarlıklar:", IDC_STATIC, 16, 51, 204, 9 + LTEXT "Kullanıcı profilleri, oturum açmanızla ilgili masaüstü ayarlarını ve diÄŸer bilgileri içerir. Kullandığınız tüm bilgisayarlarda ayrı bir profil oluÅŸturulabilir ya da kullandığınız tüm bilgisayarlarda aynı olan gezici bir profil seçebilirsiniz.", IDC_STATIC, 40, 11, 211, 35 + LTEXT "Bu Bilgisayarda Saklanan Profiller:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE PUSHBUTTON "&Türü DeÄŸiÅŸtir", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 @@ -163,17 +163,17 @@ BEGIN CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "Sâniye", IDC_STATIC, 223, 70, 18, 8 - LTEXT "BaÅŸlangıç seçenekleri kütüğünü elle düzenlemek için ""Düzenle"" düğmesine tıklayınız.", IDC_STATIC, 14, 89, 187, 8 + LTEXT "BaÅŸlangıç seçenekleri kütüğünü elle düzenlemek için Düzenle'ye tıklayınız.", IDC_STATIC, 14, 89, 187, 8 PUSHBUTTON "&Düzenle", IDC_STRRECEDIT, 188, 87, 50, 14 GROUPBOX "Dizge BaÅŸarısızlığı", IDC_STATIC, 7, 111, 238, 140 - AUTOCHECKBOX "D&izge Kaydına Olay Olarak Yaz", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 + AUTOCHECKBOX "D&izge Kaydına Bir Olay Yaz", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 AUTOCHECKBOX "&Bir Yönetim Uyarısı Gönder", IDC_STRRECSENDALERT, 14, 138, 148, 10 - AUTOCHECKBOX "&Yeniden BaÅŸlat", IDC_STRRECRESTART, 14, 152, 145, 10 - GROUPBOX "Yanlışlık Ayıklama Bilgisini Yazma", IDC_STATIC, 12, 167, 227, 76 + AUTOCHECKBOX "K&endiliÄŸinden Yeniden BaÅŸlat", IDC_STRRECRESTART, 14, 152, 145, 10 + GROUPBOX "Yanlışlık Ayıklama Bilgisi Yazma", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST - LTEXT "Dö&küm Dosyası:", IDC_STATIC, 17, 202, 150, 8 + LTEXT "Dö&küm Kütüğü:", IDC_STATIC, 17, 202, 150, 8 EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 - AUTOCHECKBOX "&Var Olanın Ãœzerine Yaz", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + AUTOCHECKBOX "&Var Olan Bir Kütüğün Ãœzerine Yaz", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "Tamam", IDOK, 141, 259, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 195, 259, 50, 14 END @@ -186,25 +186,25 @@ BEGIN LTEXT "Sürücü [Birim Etiketi]", IDC_STATIC, 12, 5, 96, 9 LTEXT "Sayfalama Kütüğü Büyüklüğü (MB)", IDC_STATIC, 115, 5, 96, 9 LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS - GROUPBOX "Seçili Sürücüdeki Sayfalama Kütüğü Büyüklüğü", IDC_DRIVEGROUP, 10, 70, 204, 104 + GROUPBOX "Seçili Sürücü İçin Sayfalama Kütüğü Büyüklüğü", IDC_DRIVEGROUP, 10, 70, 204, 104 LTEXT "Sürücü:", IDC_STATIC, 20, 80, 20, 8 LTEXT "", IDC_DRIVE, 88, 81, 100, 9 LTEXT "Var Olan BoÅŸluk:", IDC_STATIC, 20, 92, 56, 9 LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 LTEXT "&BaÅŸlangıç Büyüklüğü (MB):", -1, 22, 118, 75, 9 - LTEXT "&Azamî Büyüklük (MB):", -1, 22, 131, 75, 9 + LTEXT "&En Çok Büyüklük (MB):", -1, 22, 131, 75, 9 AUTORADIOBUTTON "&Husûsî Büyüklük", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP AUTORADIOBUTTON "&Dizge Yönetimli Büyüklük", IDC_SYSMANSIZE, 20, 145, 88, 9 AUTORADIOBUTTON "&Sayfalama Kütüğü Yok", IDC_NOPAGEFILE, 20, 158, 78, 9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE - PUSHBUTTON "A&yarla", IDC_SET, 158, 155, 50, 13 + PUSHBUTTON "&Ayarla", IDC_SET, 158, 155, 50, 13 GROUPBOX "Tüm Sürücüler İçin Toplam Sayfalama Kütüğü Büyüklüğü", IDC_TOTALGROUP, 10, 177, 204, 46 LTEXT "En Az Ä°zin Verilen:", IDC_STATIC, 18, 188, 58, 9 LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 LTEXT "Önerilen:", IDC_STATIC, 18, 199, 52, 9 LTEXT "", IDC_RECOMMENDED, 88, 199, 100, 9 - LTEXT "Åžimdilik Ayrılmış:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "Åžimdiki Ayrılmış:", IDC_STATIC, 18, 210, 66, 9 LTEXT "", IDC_CURRENT, 88, 210, 100, 9 DEFPUSHBUTTON "Tamam", IDOK, 114, 232, 48, 13 PUSHBUTTON "Ä°ptal", IDCANCEL, 168, 232, 48, 13 @@ -233,12 +233,12 @@ END IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "DeÄŸiÅŸkeni Düzenle" +CAPTION "DeÄŸiÅŸken Düzenle" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&DeÄŸiÅŸkenin Adı:", IDC_STATIC, 7, 14, 50, 8 + LTEXT "&DeÄŸiÅŸken Adı:", IDC_STATIC, 7, 14, 50, 8 EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "D&eÄŸiÅŸkenin DeÄŸeri:", IDC_STATIC, 7, 32, 50, 8 + LTEXT "D&eÄŸiÅŸken DeÄŸeri:", IDC_STATIC, 7, 32, 50, 8 EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "Tamam", IDOK, 116, 50, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 170, 50, 50, 14 @@ -256,7 +256,7 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Dizge" - IDS_CPLSYSTEMDESCRIPTION "Bilgisayar üzerine ayrıntılı bilgi görüntüler ve dizge ve donanım ayarlarını deÄŸiÅŸtirir." + IDS_CPLSYSTEMDESCRIPTION "Bilgisayar üzerine bilgi görüntüler ve türlü dizge ve donanım ayarlarını deÄŸiÅŸtirir." IDS_MEGABYTE "MB Bellek" IDS_GIGABYTE "GB Bellek" IDS_TERABYTE "TB Bellek" @@ -266,19 +266,19 @@ BEGIN IDS_NO_DUMP "(Yok)" IDS_MINI_DUMP "Küçük Döküm (64 KB)" IDS_KERNEL_DUMP "Çekirdek Dökümü" - IDS_FULL_DUMP "Tam Döküm" + IDS_FULL_DUMP "Tüm Döküm" IDS_USERPROFILE_NAME "Ad" IDS_USERPROFILE_SIZE "Büyüklük" IDS_USERPROFILE_TYPE "Tür" IDS_USERPROFILE_STATUS "Durum" IDS_USERPROFILE_MODIFIED "DeÄŸiÅŸtirilmiÅŸ" - IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Öğesi" - IDS_WARNINITIALSIZE "Sayfalama kütüğünün baÅŸlangıç büyüklüğünü giriniz." - IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün azamî büyüklüğünü giriniz." - IDS_WARNINITIALRANGE "Sayfalama kütüğünün baÅŸlangıç büyüklüğü, 2 MB'tan küçük, seçili sürücüdeki boÅŸluÄŸun büyüklüğünden büyük olamaz." - IDS_WARNMAXIMUMRANGE "Sayfalama kütüğünün azamî büyüklüğü, baÅŸlangıç büyüklüğünden küçük, seçili sürücüdeki boÅŸluÄŸun büyüklüğünden büyük olamaz." - IDS_PAGEFILE_NONE "none" - IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." - IDS_DEVS "\nReactOS Takımı\n\nTasarı EÅŸ Güdümcüsü:\n\nAleksey Bragin\n\nGeliÅŸtirme Takımı:\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HorníÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nSürüm Tasarlayıcıları:\n\nColin Finck\nZ98\n\nUmûmî AÄŸ Sitesi Takımı:\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedya Takımı:\n\nMindflyer\nWierd_W\n\nAyrıca, diÄŸer tüm katkıda bulunanlara teÅŸekkürler:\nWine Takımı\n\n" + IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Uygulaması" + IDS_WARNINITIALSIZE "Sayfalama kütüğünün baÅŸlangıç büyüklüğü için bir sayılık deÄŸer giriniz." + IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün en çok büyüklüğü için bir sayılık deÄŸer giriniz." + IDS_WARNINITIALRANGE "Sayfalama kütüğünün baÅŸlangıç büyüklüğü, 2 MB'tan küçük olmamalıdır ve seçili sürücüde var olan boÅŸluÄŸu aÅŸmamalıdır." + IDS_WARNMAXIMUMRANGE "Sayfalama kütüğünün en çok büyüklüğü, kendisinin baÅŸlangıç büyüklüğünden küçük olmamalıdır ve seçili sürücüde var olan boÅŸluÄŸu aÅŸmamalıdır." + IDS_PAGEFILE_NONE "Yok" + IDS_PAGEFILE_SYSTEM "Dizge Yönetimli" + IDS_INFOREBOOT "DeÄŸiÅŸiklikleri uygulamak için bilgisayarı yeniden baÅŸlatmalısınız." + IDS_DEVS "\nReactOS Takımı\n\nTasarı EÅŸ Güdümcüsü:\n\nAleksey Bragin\n\nGeliÅŸtirme Takımı:\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HorníÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nSürüm Mühendisleri:\n\nColin Finck\nZ98\n\nUmûmî AÄŸ Sitesi Takımı:\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nOrtam Takımı:\n\nMindflyer\nWierd_W\n\nAyrıca, tüm katkıda bulunanlara teÅŸekkürler:\nWine Takımı\n\n" END diff --git a/reactos/dll/cpl/telephon/lang/tr-TR.rc b/reactos/dll/cpl/telephon/lang/tr-TR.rc index a9aaf87b778..6c7a5fecf57 100644 --- a/reactos/dll/cpl/telephon/lang/tr-TR.rc +++ b/reactos/dll/cpl/telephon/lang/tr-TR.rc @@ -5,5 +5,5 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Telefon ve Çevirge Seçenekleri" - IDS_CPLSYSTEMDESCRIPTION "Telefon Arama Kurallarını ve Çevirge Ayarlarını Yapılandırır." + IDS_CPLSYSTEMDESCRIPTION "Telefon Arama Kâidelerinizi ve Çevirge Ayarlarınızı Yapılandırır." END diff --git a/reactos/dll/cpl/timedate/lang/tr-TR.rc b/reactos/dll/cpl/timedate/lang/tr-TR.rc index 2c44dea872f..70843749209 100644 --- a/reactos/dll/cpl/timedate/lang/tr-TR.rc +++ b/reactos/dll/cpl/timedate/lang/tr-TR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "Saati, Yaz Saati Uygulamalarında KendiliÄŸinden Ayarla", + AUTOCHECKBOX "Gün ışığı tutum deÄŸiÅŸiklikleri için saati kendiliÄŸinden ayarla.", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END @@ -36,24 +36,24 @@ CAPTION "Umûmî AÄŸ Zamânı" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "Zamânı, Umûmî AÄŸ Zaman Sunucusuyla KendiliÄŸinden EÅŸleÅŸtir", + AUTOCHECKBOX "Bir Umûmî AÄŸ Zamânı Sunucusuyla KendiliÄŸinden EÅŸleÅŸtir", IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP LTEXT "Sunucu:", IDC_SERVERTEXT, 34, 22, 28, 13 - PUSHBUTTON "&EÅŸleÅŸtir", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "&Åžimdi ÅžimdkileÅŸtir", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "EÅŸleme, yalnızca bilgisayar Umûmî AÄŸ'a baÄŸlandığında olur.", -1, 12, 114, 225, 25 + LTEXT "EÅŸleÅŸtirme, yalnızca, bilgisayarınız Umûmî AÄŸ'a baÄŸlı olduÄŸunda olabilir.", -1, 12, 114, 225, 25 END STRINGTABLE BEGIN IDS_CPLNAME "Zaman" - IDS_CPLDESCRIPTION "Zamânı ve saat dilimini deÄŸiÅŸtirir." + IDS_CPLDESCRIPTION "Târihi, saati ve saat dilimi bilgisini deÄŸiÅŸtirir." IDS_TIMEZONETEXT "Åžimdiki Saat Dilimi: %s" IDS_TIMEZONEINVALID "Geçersiz" IDS_TIMEZONEUNKNOWN "Bilinmeyen" - IDS_INETTIMESUCSYNC "Zaman, %s.%s:%s ile baÅŸarıyla eÅŸlendi." - IDS_INETTIMENEXTSYNC "Bir Dahaki EÅŸleme: %s.%s" - IDS_INETTIMESYNCING "ReactOS, zamânı %s ile eÅŸlerken bekleyiniz." - IDS_INETTIMEERROR "ReactOS, zamânı %s ile eÅŸlerken bir yanlışlık oldu." + IDS_INETTIMESUCSYNC "Saat, %s ile baÅŸarıyla eÅŸleÅŸtirildi: %s.%s" + IDS_INETTIMENEXTSYNC "Bir Sonraki EÅŸleÅŸtirme: %s.%s" + IDS_INETTIMESYNCING "ReactOS, saati %s ile eÅŸleÅŸtirirken lütfen bekleyiniz." + IDS_INETTIMEERROR "ReactOS, %s ile eÅŸleÅŸtirirken bir yanlışlık oldu." END diff --git a/reactos/dll/cpl/usrmgr/lang/tr-TR.rc b/reactos/dll/cpl/usrmgr/lang/tr-TR.rc new file mode 100644 index 00000000000..f89fc280aab --- /dev/null +++ b/reactos/dll/cpl/usrmgr/lang/tr-TR.rc @@ -0,0 +1,215 @@ +/* TRANSLATOR: 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +/* Dialogs */ + +IDD_USERS DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Kullanıcılar" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ekle...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Sil", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "&Husûsiyetler", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "&Dizge baÅŸlatmada kullanıcı adı ve ÅŸifre gerektir.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "&Åžifreyi DeÄŸiÅŸtir", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED +END + +IDD_GROUPS DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Öbekler" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ekle...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Sil", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "&Husûsiyetler", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 +END + +IDD_EXTRA DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ek" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bu alan bilerek boÅŸ kaldı.", IDC_STATIC, 66, 90, 112, 8 +END + +IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Umûmî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "&Tüm Ad:", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME, 77, 43, 168, 13, ES_AUTOHSCROLL + LTEXT "T&anım:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION, 77, 61, 168, 13, ES_AUTOHSCROLL + AUTOCHECKBOX "&Kullanıcı ilk oturum açılışında ÅŸifreyi deÄŸiÅŸtirmeli.", IDC_USER_GENERAL_FORCE_CHANGE, 7, 82, 210, 10 + AUTOCHECKBOX "K&ullanıcı ÅŸifreyi deÄŸiÅŸtirmemeli.", IDC_USER_GENERAL_CANNOT_CHANGE, 7, 95, 210, 10 + AUTOCHECKBOX "&Åžifre hiçbir zaman geçerliliÄŸini yitirmesin.", IDC_USER_GENERAL_NEVER_EXPIRES, 7, 108, 210, 10 + AUTOCHECKBOX "&Hesap edilgin.", IDC_USER_GENERAL_DISABLED, 7, 121, 210, 10 + AUTOCHECKBOX "H&esap kapalı.", IDC_USER_GENERAL_LOCKED, 7, 134, 210, 10 +END + +IDD_USER_MEMBERSHIP DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ãœyelik" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ãœyesi Olunanlar:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ekle...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "&Sil", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + +IDD_USER_PROFILE DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Profil" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Kullanıcı Profili", -1, 7, 7, 238, 54 + LTEXT "&Profil Yolu:", -1, 16, 22, 55, 8 + EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL + LTEXT "&Otutrum Açma BetiÄŸi:", -1, 16, 40, 55, 8 + EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL + GROUPBOX "Ev Dizini", -1, 7, 68, 238, 54 + AUTORADIOBUTTON "&Yerli Yol:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 + AUTORADIOBUTTON "&BaÄŸlan:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 + EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL + COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | + WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Åžuraya:", -1, 112, 101, 12, 8 + EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL +END + +IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Umûmî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "&Tanım:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION, 65, 42, 180, 13, ES_AUTOHSCROLL + LTEXT "&Ãœyeler:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ekle...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14 + PUSHBUTTON "&Sil", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + +IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Åžifreyi DeÄŸiÅŸtir" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1, 107, 7, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Yeni Åžifre:", -1, 7, 10, 96, 8 + EDITTEXT IDC_EDIT_PASSWORD2, 107, 25, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Åžifreyi Yinele:", -1, 7, 28, 96, 8 + DEFPUSHBUTTON "Tamam", IDOK, 156, 53, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 210, 53, 50, 14 +END + +IDD_USER_NEW DIALOGEX 0, 0, 267, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Yeni Kullanıcı" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_USER_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL + RTEXT "&Kullanıcı Adı:", -1, 7, 10, 96, 8 + EDITTEXT IDC_USER_NEW_FULL_NAME, 107, 25, 153, 14, ES_AUTOHSCROLL + RTEXT "&Tüm Kullanıcı Adı:", -1, 7, 28, 96, 8 + EDITTEXT IDC_USER_NEW_DESCRIPTION, 107, 43, 153, 14, ES_AUTOHSCROLL + RTEXT "T&anım:", -1, 7, 46, 96, 8 + EDITTEXT IDC_USER_NEW_PASSWORD1, 107, 67, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "&Åžifre:", -1, 7, 70, 96, 8 + EDITTEXT IDC_USER_NEW_PASSWORD2, 107, 85, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Åžifreyi Yinele:", -1, 7, 88, 96, 8 + AUTOCHECKBOX "K&ullanıcı ilk oturum açılışında ÅŸifreyi deÄŸiÅŸtirmeli.", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 200, 10 + AUTOCHECKBOX "Ku&llanıcı ÅŸifreyi deÄŸiÅŸtirmemeli.", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED + AUTOCHECKBOX "Åž&ifre hiçbir zaman geçerliliÄŸini yitirmesin.", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED + AUTOCHECKBOX "&Hesap edilgin.", IDC_USER_NEW_DISABLED, 7, 151, 200, 10 + DEFPUSHBUTTON "Tamam", IDOK, 156, 179, 50, 14, WS_DISABLED + PUSHBUTTON "Ä°ptal", IDCANCEL, 210, 179, 50, 14 +END + +IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Yeni Öbek" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GROUP_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL + RTEXT "&Öbek Adı:", -1, 7, 10, 96, 8 + EDITTEXT IDC_GROUP_NEW_DESCRIPTION, 107, 25, 153, 14, ES_AUTOHSCROLL + RTEXT "&Tanım:", -1, 7, 28, 96, 8 + DEFPUSHBUTTON "Tamam", IDOK, 156, 53, 50, 14, WS_DISABLED + PUSHBUTTON "Ä°ptal", IDCANCEL, 210, 53, 50, 14 +END + +IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Öbek ÃœyeliÄŸi" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ãœyesi Olunanlar:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "Tamam", IDOK, 141, 197, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 195, 197, 50, 14 +END + +/* Menus */ + +IDM_POPUP_GROUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Yeni Öbek...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "&Ãœye Ekle", IDM_GROUP_ADD_MEMBER, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Sil", IDM_GROUP_DELETE + MENUITEM "&Yeniden Adlandır", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "&Husûsiyetler", IDM_GROUP_PROPERTIES + END +END + +IDM_POPUP_USER MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Yeni Kullanıcı...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "&Åžifreyi DeÄŸiÅŸtir", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "&Sil", IDM_USER_DELETE + MENUITEM "&Yeniden Adlandır", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "&Husûsiyetler", IDM_USER_PROPERTIES + END +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "Kullanıcı Hesapları" + IDS_CPLDESCRIPTION "Kullanıcıları ve öbekleri yönetir." +END + +STRINGTABLE +BEGIN + IDS_NAME "Ad" + IDS_FULLNAME "Tüm Ad" + IDS_DESCRIPTION "Tanım" +END diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rc b/reactos/dll/cpl/usrmgr/usrmgr.rc index 2cecdc45a77..7e87b900ddd 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.rc +++ b/reactos/dll/cpl/usrmgr/usrmgr.rc @@ -49,6 +49,9 @@ IDI_GROUP ICON "resources/group.ico" #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif diff --git a/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc b/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc index 4d4ac1c9af4..d6620c13566 100644 --- a/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc +++ b/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */ +/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -8,32 +8,32 @@ CAPTION "Umûmî" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 - GROUPBOX "Shaders", -1, 5, 25, 230, 80 - LTEXT "Enable GLSL:", -1, 15, 42, 80, 10 + GROUPBOX "Gölgelendiriciler", -1, 5, 25, 230, 80 + LTEXT "G&LSL'yi EtkinleÅŸtir:", -1, 15, 42, 80, 10 COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + LTEXT "&GS Düzeyi En Çok:", -1, 15, 57, 80, 10 COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum PS Level:", -1, 15, 72, 80, 10 + LTEXT "&PS Düzeyi En Çok:", -1, 15, 72, 80, 10 COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + LTEXT "&VS Düzeyi En Çok:", -1, 15, 87, 80, 10 COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - GROUPBOX "Rendering", -1, 5, 110, 230, 110 - LTEXT "Multisampling:", -1, 15, 127, 80, 10 + GROUPBOX "Ä°ÅŸleme", -1, 5, 110, 230, 110 + LTEXT "&Çoklu Örnekleme:", -1, 15, 127, 80, 10 COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + LTEXT "&Sıkı Çizim Düzenlemesi:", -1, 15, 142, 80, 10 COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + LTEXT "&Görüntülük Dışı Ä°ÅŸleme:", -1, 15, 157, 80, 10 COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + LTEXT "S&ürekli Görüntülük Dışı:", -1, 15, 172, 72, 10, SS_LEFT COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + LTEXT "V&idyo BelleÄŸi Boyutu:", -1, 15, 187, 72, 10, SS_LEFT COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + LTEXT "&DirectDraw Ä°ÅŸleyicisi:", -1, 15, 202, 72, 10, SS_LEFT COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE BEGIN - IDS_CPLNAME "WineD3D Ayarları" - IDS_CPLDESCRIPTION "WinD3D yürütücüsünün ayarlarını yapılandırır." + IDS_CPLNAME "WineD3D" + IDS_CPLDESCRIPTION "WinD3D yürütücüsü ayarlarını yapılandırır." END diff --git a/reactos/dll/shellext/deskadp/deskadp.rc b/reactos/dll/shellext/deskadp/deskadp.rc index c31c5adccf1..99a01912a68 100644 --- a/reactos/dll/shellext/deskadp/deskadp.rc +++ b/reactos/dll/shellext/deskadp/deskadp.rc @@ -60,12 +60,12 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif diff --git a/reactos/dll/shellext/deskadp/lang/tr-TR.rc b/reactos/dll/shellext/deskadp/lang/tr-TR.rc index 0ba5eb03e2f..18cac87dbfe 100644 --- a/reactos/dll/shellext/deskadp/lang/tr-TR.rc +++ b/reactos/dll/shellext/deskadp/lang/tr-TR.rc @@ -26,7 +26,7 @@ END IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Tüm Kipleri Dizelgeleme" +CAPTION "Tüm Kipleri Dizelgele" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "Tamam", IDOK, 112, 115, 50, 15 @@ -37,13 +37,13 @@ END STRINGTABLE BEGIN - IDS_MODEFMT "%d, %s, %s eliyle %d" + IDS_MODEFMT "%d ile %d, %s, %s" IDS_DEFREFRESHRATE "Ön Tanımlı Yenileme" IDES_REFRESHRATEFMT "%d Hertz" IDS_4BPP "16 Renk" IDS_8BPP "256 Renk" - IDS_15BPP "Yüksek Renk (15 Ä°killik)" - IDS_16BPP "Yüksek Renk (16 Ä°killik)" - IDS_24BPP "Gerçek Renk (24 Ä°killik)" - IDS_32BPP "Gerçek Renk (32 Ä°killik)" + IDS_15BPP "Yüksek Renk (15 Bit)" + IDS_16BPP "Yüksek Renk (16 Bit)" + IDS_24BPP "Gerçek Renk (24 Bit)" + IDS_32BPP "Gerçek Renk (32 Bit)" END diff --git a/reactos/dll/shellext/deskmon/deskmon.rc b/reactos/dll/shellext/deskmon/deskmon.rc index e68b0ae6c74..b035260c9e3 100644 --- a/reactos/dll/shellext/deskmon/deskmon.rc +++ b/reactos/dll/shellext/deskmon/deskmon.rc @@ -60,12 +60,12 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif diff --git a/reactos/dll/shellext/deskmon/lang/tr-TR.rc b/reactos/dll/shellext/deskmon/lang/tr-TR.rc index 21676d2bfca..0ceebe57658 100644 --- a/reactos/dll/shellext/deskmon/lang/tr-TR.rc +++ b/reactos/dll/shellext/deskmon/lang/tr-TR.rc @@ -14,7 +14,7 @@ BEGIN GROUPBOX "Göstergeç Ayarları", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Görüntülük Yenileme Sıklığı:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "G&örüntülüğün GörüntüleyemeyeceÄŸi Kipleri Gösterme", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Bu Görüntülüğün GörüntüleyemeyeceÄŸi Kipleri Gizle", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE diff --git a/reactos/dll/shellext/slayer/lang/tr-TR.rc b/reactos/dll/shellext/slayer/lang/tr-TR.rc index 0c0f5725cc6..ef63fc31e95 100644 --- a/reactos/dll/shellext/slayer/lang/tr-TR.rc +++ b/reactos/dll/shellext/slayer/lang/tr-TR.rc @@ -7,16 +7,16 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Uyumluluk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "EÄŸer ReactOS'ta bir izlenceyi çalıştırmada sorunlar varsa ReactOS'un izlenceye bildireceÄŸi bir iÅŸletim dizgesi seçiniz.", -1, 7, 7, 210, 31 - GROUPBOX "Uyumluluk Kipleri", IDC_COMPATGROUP, 7, 41, 210, 49 - CHECKBOX "B&u izlenceyi ÅŸu uyumluluk kipinde çalıştır:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "EÄŸer ReactOS'ta bu izlenceyi çalıştırmada sorunlarınız varsa ReactOS'un uygulamaya bildireceÄŸi bir iÅŸletim dizgesi seçiniz.", -1, 7, 7, 210, 31 + GROUPBOX "Uyumluluk Kipi", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "&Bu izlenceyi ÅŸu uyumluluk kipinde çalıştır:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Görüntü Ayarları", -1, 7, 99, 210, 61, BS_GROUPBOX | WS_DISABLED CHECKBOX "&256 Renkte Çalıştır", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - CHECKBOX "&640'a 480 Çözünürlüğünde Çalıştır", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - CHECKBOX "&Basarî Temaları EdilginleÅŸtir", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "&640'a 480 Görüntülük Çözünürlüğünde Çalıştır", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Görmelik Temaları EdilginleÅŸtir", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Uyumluluk Kiplerini Düzenle...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 - /* CONTROL "Uygulama UyumluluÄŸu Ãœzerine Daha Çok Bilgi Edin", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY */ + /* CONTROL "Ä°zlence UyumluluÄŸu Ãœzerine Daha Çok Bilgi Edin", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY */ END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 @@ -34,6 +34,6 @@ END STRINGTABLE BEGIN - IDS_SLAYER "Uygulama Katmanı" - IDS_DESCRIPTION "Uygulama Uyumluluk Katmanı Kabuk Eklentisi" + IDS_SLAYER "Uygulama UyumluluÄŸu Katmanı" + IDS_DESCRIPTION "Uygulama UyumluÄŸu Katmanı Kabuk Eklentisi" END diff --git a/reactos/dll/shellext/slayer/slayer.rc b/reactos/dll/shellext/slayer/slayer.rc index 94669e45239..dc244fced02 100644 --- a/reactos/dll/shellext/slayer/slayer.rc +++ b/reactos/dll/shellext/slayer/slayer.rc @@ -69,12 +69,12 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif diff --git a/reactos/dll/win32/aclui/lang/tr-TR.rc b/reactos/dll/win32/aclui/lang/tr-TR.rc index d8d48a272b8..4720a87ea99 100644 --- a/reactos/dll/win32/aclui/lang/tr-TR.rc +++ b/reactos/dll/win32/aclui/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* Turkish translation by Arda Tanrıkulu */ +/* Turkish translation by Arda Tanrıkulu */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/mpr/lang/mpr_Tr.rc b/reactos/dll/win32/mpr/lang/mpr_Tr.rc index e0011e5cdb1..2120d287057 100644 --- a/reactos/dll/win32/mpr/lang/mpr_Tr.rc +++ b/reactos/dll/win32/mpr/lang/mpr_Tr.rc @@ -1,7 +1,7 @@ /* * MPR dll resources for Turkish * - * Copyright (C) 2006 Fatih Aþýcý + * Copyright (C) 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,25 +22,25 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_ENTIRENETWORK "Tüm Að" + IDS_ENTIRENETWORK "Tüm AÄŸ" } IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Að Parolanýzý Girin" +CAPTION "AÄŸ Parolanızı Girin" FONT 8, "MS Shell Dlg" { - LTEXT "Lütfen kullanýcý adýnýzý ve parolanýzý girin:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Lütfen kullanıcı adınızı ve parolanızı girin:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Kullanýcý", -1, 40, 66, 50, 10 + LTEXT "Kullanıcı", -1, 40, 66, 50, 10 LTEXT "Parola", -1, 40, 86, 50, 10 LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "Bu parolayý &sakla (Güvensiz)", IDC_SAVEPASSWORD, + CHECKBOX "Bu parolayı &sakla (Güvensiz)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Tamam", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ýptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ä°ptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/mpr/mpr.rc b/reactos/dll/win32/mpr/mpr.rc index 159ee3d77ec..ad503faf125 100644 --- a/reactos/dll/win32/mpr/mpr.rc +++ b/reactos/dll/win32/mpr/mpr.rc @@ -60,9 +60,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/mpr_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/mpr_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -95,6 +92,9 @@ #ifdef LANGUAGE_SQ_AL #include "lang/mpr_Sq.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/mpr_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/mpr_Uk.rc" #endif diff --git a/reactos/dll/win32/msacm32/lang/msacm_Tr.rc b/reactos/dll/win32/msacm32/lang/msacm_Tr.rc index 06558331b5e..8f6fd760cc6 100644 --- a/reactos/dll/win32/msacm32/lang/msacm_Tr.rc +++ b/reactos/dll/win32/msacm32/lang/msacm_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resource file for MS ACM * - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ses Seçimi" +CAPTION "Ses Seçimi" FONT 8, "MS Shell Dlg" BEGIN @@ -31,21 +31,21 @@ BEGIN COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Farklý Kaydet...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Kaldýr", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Farklı Kaydet...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Kaldır", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "&Biçim:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Biçim:", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Öznitelikler:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Öznitelikler:", -1, 5, 59, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ýptal", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Yardým", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Yardım", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END diff --git a/reactos/dll/win32/msacm32/msacm.rc b/reactos/dll/win32/msacm32/msacm.rc index 7b9993d4f87..d0843efa669 100644 --- a/reactos/dll/win32/msacm32/msacm.rc +++ b/reactos/dll/win32/msacm32/msacm.rc @@ -62,9 +62,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/msacm_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/msacm_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -97,6 +94,9 @@ #ifdef LANGUAGE_SQ_AL #include "lang/msacm_Sq.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/msacm_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/msacm_Uk.rc" #endif diff --git a/reactos/dll/win32/msi/msi_Tr.rc b/reactos/dll/win32/msi/msi_Tr.rc index e81bf889386..8e91ebebac9 100644 --- a/reactos/dll/win32/msi/msi_Tr.rc +++ b/reactos/dll/win32/msi/msi_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resources for MSI * - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,12 +25,12 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "%s yolu bulunamadý" - 9 "%s nolu diski yerleþtirin" + 5 "%s yolu bulunamadı" + 9 "%s nolu diski yerleÅŸtirin" 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" - 11 "%s öðesini içeren dizini girin" - 12 "eksik özellik için kurulum kaynaðý" - 13 "eksik özellik için að sürücüsü" - 14 "özellik buradan:" - 15 "%s öðesini içeren dizini seçin" + 11 "%s öğesini içeren dizini girin" + 12 "eksik özellik için kurulum kaynağı" + 13 "eksik özellik için aÄŸ sürücüsü" + 14 "özellik buradan:" + 15 "%s öğesini içeren dizini seçin" } diff --git a/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc b/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc index 15e61975108..10f9031fd56 100644 --- a/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc +++ b/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resources for oleaut32 * - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,10 +22,10 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_TRUE "Doðru" - IDS_FALSE "Yanlýþ" + IDS_TRUE "DoÄŸru" + IDS_FALSE "Yanlış" IDS_YES "Evet" - IDS_NO "Hayýr" - IDS_ON "Açýk" - IDS_OFF "Kapalý" + IDS_NO "Hayır" + IDS_ON "Açık" + IDS_OFF "Kapalı" } diff --git a/reactos/dll/win32/oleaut32/oleaut32.rc b/reactos/dll/win32/oleaut32/oleaut32.rc index 4120e889bbb..62067192bad 100644 --- a/reactos/dll/win32/oleaut32/oleaut32.rc +++ b/reactos/dll/win32/oleaut32/oleaut32.rc @@ -73,9 +73,6 @@ #ifdef LANGUAGE_TH_TH #include "lang/oleaut32_Th.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/oleaut32_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -99,6 +96,9 @@ #ifdef LANGUAGE_SQ_AL #include "lang/oleaut32_Sq.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/oleaut32_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/oleaut32_Uk.rc" #endif diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc index f7269f8012e..8cb51eea5e1 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resources for shlwapi * - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,11 +27,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Bu iletiyi bir daha &gösterme", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Bu iletiyi bir daha &gösterme", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Tamam", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ýptal", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ä°ptal", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Evet", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hayýr", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hayır", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE diff --git a/reactos/dll/win32/shlwapi/shlwapi.rc b/reactos/dll/win32/shlwapi/shlwapi.rc index c07e477768a..242d1c82c23 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.rc +++ b/reactos/dll/win32/shlwapi/shlwapi.rc @@ -60,9 +60,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/shlwapi_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/shlwapi_Tr.rc" -#endif /* UTF-8 */ @@ -96,6 +93,9 @@ #ifdef LANGUAGE_SL_SI #include "lang/shlwapi_Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/shlwapi_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/shlwapi_Uk.rc" #endif diff --git a/reactos/dll/win32/wininet/lang/wininet_Tr.rc b/reactos/dll/win32/wininet/lang/wininet_Tr.rc index 5aa979a2c66..d52dfaf48e1 100644 --- a/reactos/dll/win32/wininet/lang/wininet_Tr.rc +++ b/reactos/dll/win32/wininet/lang/wininet_Tr.rc @@ -1,7 +1,7 @@ -/* +/* * Turkish Resources * - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,20 +22,20 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Að Parolasýný Girin" +CAPTION "AÄŸ Parolasını Girin" FONT 8, "MS Shell Dlg" { - LTEXT "Lütfen kullanýcý adýnýzý ve parolanýzý girin:", -1, 40, 6, 150, 15 + LTEXT "Lütfen kullanıcı adınızı ve parolanızı girin:", -1, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 LTEXT "Realm", -1, 40, 46, 50, 10 - LTEXT "Kullanýcý", -1, 40, 66, 50, 10 + LTEXT "Kullanıcı", -1, 40, 66, 50, 10 LTEXT "Parola", -1, 40, 86, 50, 10 LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "Bu parolayý &sakla (güvensiz)", IDC_SAVEPASSWORD, + CHECKBOX "Bu parolayı &sakla (güvensiz)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Tamam", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ãptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ä°ptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/wininet/rsrc.rc b/reactos/dll/win32/wininet/rsrc.rc index 9d380244c26..df6afad515c 100644 --- a/reactos/dll/win32/wininet/rsrc.rc +++ b/reactos/dll/win32/wininet/rsrc.rc @@ -83,9 +83,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/wininet_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/wininet_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -118,6 +115,9 @@ #ifdef LANGUAGE_SQ_AL #include "lang/wininet_Sq.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/wininet_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/wininet_Uk.rc" #endif diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc b/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc index 670ad45c19a..1b7fd1e01ad 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resources for WLDAP32 * - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih Aşıcı * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,28 +22,28 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { - 0 "Baþarýlý" - 1 "Ýþlem Hatasý" - 2 "Ýletiþim Kuralý Hatasý" - 3 "Zaman Sýnýrý Aþýldý" - 4 "Boyut Sýnýrý Aþýldý" - 5 "Karþýlaþtýrma Yanlýþ" - 6 "Karþýlaþtýrma Doðru" - 7 "Yetkilendirme Yöntemi Desteklenmiyor" - 8 "Güçlü Yerkilendirme Gerekli" - 9 "Baþvuru (v2)" - 10 "Baþvuru" - 11 "Yönetim Sýnýrý Aþýldý" - 12 "Kullanýlabilir Olmayan Kritik Uzantý" + 0 "BaÅŸarılı" + 1 "Ä°ÅŸlem Hatası" + 2 "Ä°letiÅŸim Kuralı Hatası" + 3 "Zaman Sınırı Aşıldı" + 4 "Boyut Sınırı Aşıldı" + 5 "KarşılaÅŸtırma Yanlış" + 6 "KarşılaÅŸtırma DoÄŸru" + 7 "Yetkilendirme Yöntemi Desteklenmiyor" + 8 "Güçlü Yerkilendirme Gerekli" + 9 "BaÅŸvuru (v2)" + 10 "BaÅŸvuru" + 11 "Yönetim Sınırı Aşıldı" + 12 "Kullanılabilir Olmayan Kritik Uzantı" 13 "Gizli Olarak Gerekli" 14 "" 15 "" - 16 "Böyle Bir Öznitelik Yok" - 17 "Tanýmlanmamýþ Tür" - 18 "Uygunsuz Eþleþme" - 19 "Kýsýtlama Ýhlali" - 20 "Varolan Öznitelik Veya Deðer" - 21 "Geçersiz Sözdizimi" + 16 "Böyle Bir Öznitelik Yok" + 17 "Tanımlanmamış Tür" + 18 "Uygunsuz EÅŸleÅŸme" + 19 "Kısıtlama Ä°hlali" + 20 "Varolan Öznitelik Veya DeÄŸer" + 21 "Geçersiz Sözdizimi" 22 "" 23 "" 24 "" @@ -54,11 +54,11 @@ STRINGTABLE 29 "" 30 "" 31 "" - 32 "Böyle Bir Nesne Yok" + 32 "Böyle Bir Nesne Yok" 33 "Takma Ad Sorunu" - 34 "Geçersiz DN Sözdizimi" + 34 "Geçersiz DN Sözdizimi" 35 "Yaprak Konumunda" - 36 "Takma Ad Baþvuru Sorunu" + 36 "Takma Ad BaÅŸvuru Sorunu" 37 "" 38 "" 39 "" @@ -71,28 +71,28 @@ STRINGTABLE 46 "" 47 "" 48 "Uygunsuz Yetkilendirme" - 49 "Geçersiz Belgeler" - 50 "Geçersiz Yetkiler" - 51 "Meþgul" - 52 "Kullanýlabilir Deðil" - 53 "Yürütmeye Ýsteksiz" - 54 "Döngü Algýlandý" + 49 "Geçersiz Belgeler" + 50 "Geçersiz Yetkiler" + 51 "MeÅŸgul" + 52 "Kullanılabilir DeÄŸil" + 53 "Yürütmeye Ä°steksiz" + 54 "Döngü Algılandı" 55 "" 56 "" 57 "" 58 "" 59 "" - 60 "Sýralama Denetimi Eksik" - 61 "Eksik Dizin Aralýðý Hatasý" + 60 "Sıralama Denetimi Eksik" + 61 "Eksik Dizin Aralığı Hatası" 62 "" 63 "" - 64 "Adlandýrma Ýhlali" - 65 "Nesne Sýnýfý Ýhlali" - 66 "Yaprak olmayan konumda izinli deðil" - 67 "RDN üzerinde izin verilmiyor" + 64 "Adlandırma Ä°hlali" + 65 "Nesne Sınıfı Ä°hlali" + 66 "Yaprak olmayan konumda izinli deÄŸil" + 67 "RDN üzerinde izin verilmiyor" 68 "Zaten Var" - 69 "Nesne Sýnýfý Modülleri Yok" - 70 "Sonuçlar Çok Büyük" + 69 "Nesne Sınıfı Modülleri Yok" + 70 "Sonuçlar Çok Büyük" 71 "Birden Fazla DSA Etkilenir" 72 "" 73 "" @@ -102,22 +102,22 @@ STRINGTABLE 77 "" 78 "" 79 "" - 80 "Diðer" - 81 "Sunucu Kapalý" + 80 "DiÄŸer" + 81 "Sunucu Kapalı" 82 "Yerel Hata" - 83 "Kodlama Hatasý" - 84 "Kod Çözme Hatasý" - 85 "Zaman Aþýmý" + 83 "Kodlama Hatası" + 84 "Kod Çözme Hatası" + 85 "Zaman Aşımı" 86 "Yazar Bilinmiyor" - 87 "Süzme Hatasý" - 88 "Kullanýcý Ýptal Etti" - 89 "Parametre Hatasý" + 87 "Süzme Hatası" + 88 "Kullanıcı Ä°ptal Etti" + 89 "Parametre Hatası" 90 "Bellek Yok" - 91 "LDAP sunucusuna baðlanamýyor" - 92 "Ýþlem LDAP iletiþim kuralýnýn bu sürümünce desteklenmiyor." - 93 "Ýletide belirtilen denetim bulunamadý" - 94 "Ýletide sonuç yok" - 95 "Dönen diðer sonuçlar" - 96 "Baþvurularý iþlerken dön" - 97 "Paketin gönderildiði yönlendirici sýnýrý aþýldý" + 91 "LDAP sunucusuna baÄŸlanamıyor" + 92 "Ä°ÅŸlem LDAP iletiÅŸim kuralının bu sürümünce desteklenmiyor." + 93 "Ä°letide belirtilen denetim bulunamadı" + 94 "Ä°letide sonuç yok" + 95 "Dönen diÄŸer sonuçlar" + 96 "BaÅŸvuruları iÅŸlerken dön" + 97 "Paketin gönderildiÄŸi yönlendirici sınırı aşıldı" } diff --git a/reactos/dll/win32/wldap32/wldap32.rc b/reactos/dll/win32/wldap32/wldap32.rc index 518777ffef3..2d223e10dfe 100644 --- a/reactos/dll/win32/wldap32/wldap32.rc +++ b/reactos/dll/win32/wldap32/wldap32.rc @@ -44,9 +44,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/wldap32_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/wldap32_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -79,6 +76,9 @@ #ifdef LANGUAGE_SQ_AL #include "lang/wldap32_Sq.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/wldap32_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/wldap32_Uk.rc" #endif From 0f7a53e9999586c3982437587de09a18bc9fef61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Mon, 30 Jun 2014 18:27:44 +0000 Subject: [PATCH 23/75] [WIN32K/NTGDI] - Better semi-implementation of CreateHalftonePalette svn path=/trunk/; revision=63677 --- reactos/win32ss/gdi/ntgdi/palette.c | 146 +++++++++++----------------- reactos/win32ss/gdi/ntgdi/palette.h | 4 +- 2 files changed, 61 insertions(+), 89 deletions(-) diff --git a/reactos/win32ss/gdi/ntgdi/palette.c b/reactos/win32ss/gdi/ntgdi/palette.c index 7fef04ea4f2..0977d8173b9 100644 --- a/reactos/win32ss/gdi/ntgdi/palette.c +++ b/reactos/win32ss/gdi/ntgdi/palette.c @@ -65,7 +65,7 @@ InitPaletteImpl() // Create default palette (20 system colors) gppalDefault = PALETTE_AllocPalWithHandle(PAL_INDEXED, 20, - (PULONG)g_sysPalTemplate, + g_sysPalTemplate, 0, 0, 0); GDIOBJ_vReferenceObjectByPointer(&gppalDefault->BaseObject); PALETTE_UnlockPalette(gppalDefault); @@ -132,7 +132,7 @@ NTAPI PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) @@ -174,12 +174,10 @@ PALETTE_AllocPalette( if (iMode & PAL_INDEXED) { /* Check if we got a color array */ - if (pulColors) + if (pEntries) { /* Copy the entries */ - RtlCopyMemory(ppal->IndexedColors, - pulColors, - cColors * sizeof(ULONG)); + RtlCopyMemory(ppal->IndexedColors, pEntries, cColors * sizeof(pEntries[0])); } } else if (iMode & PAL_BITFIELDS) @@ -208,7 +206,7 @@ NTAPI PALETTE_AllocPalWithHandle( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) @@ -216,7 +214,7 @@ PALETTE_AllocPalWithHandle( PPALETTE ppal; /* Allocate the palette without a handle */ - ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, pEntries, flRed, flGreen, flBlue); if (!ppal) return NULL; /* Insert the palette into the handle table */ @@ -382,7 +380,7 @@ EngCreatePalette( PPALETTE ppal; HPALETTE hpal; - ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, (PPALETTEENTRY)pulColors, flRed, flGreen, flBlue); if (!ppal) return NULL; hpal = GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_PUBLIC); @@ -454,7 +452,7 @@ GreCreatePaletteInternal( pLogPal->palNumEntries = cEntries; ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, cEntries, - (PULONG)pLogPal->palPalEntry, + pLogPal->palPalEntry, 0, 0, 0); if (ppal != NULL) @@ -512,107 +510,81 @@ NtGdiCreatePaletteInternal( return hpal; } -HPALETTE APIENTRY NtGdiCreateHalftonePalette(HDC hDC) +HPALETTE +APIENTRY +NtGdiCreateHalftonePalette(HDC hDC) { int i, r, g, b; - struct { - WORD Version; - WORD NumberOfEntries; - PALETTEENTRY aEntries[256]; - } Palette; + PALETTEENTRY PalEntries[256]; + PPALETTE ppal; + PDC pdc; + HPALETTE hpal = NULL; - Palette.Version = 0x300; - Palette.NumberOfEntries = 256; - if (IntGetSystemPaletteEntries(hDC, 0, 256, Palette.aEntries) == 0) + pdc = DC_LockDc(hDC); + if (!pdc) { - /* From WINE, more that 256 color math */ - Palette.NumberOfEntries = 20; - for (i = 0; i < Palette.NumberOfEntries; i++) - { - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xff; - Palette.aEntries[i].peBlue=0xff; - Palette.aEntries[i].peFlags=0x00; - } + EngSetLastError(ERROR_INVALID_HANDLE); + return NULL; + } - Palette.aEntries[0].peRed=0x00; - Palette.aEntries[0].peBlue=0x00; - Palette.aEntries[0].peGreen=0x00; + RtlZeroMemory(PalEntries, sizeof(PalEntries)); - /* The first 6 */ - for (i=1; i <= 6; i++) - { - Palette.aEntries[i].peRed=(i%2)?0x80:0; - Palette.aEntries[i].peGreen=(i==2)?0x80:(i==3)?0x80:(i==6)?0x80:0; - Palette.aEntries[i].peBlue=(i>3)?0x80:0; - } + /* First and last ten entries are default ones */ + for (i = 0; i < 10; i++) + { + PalEntries[i].peRed = g_sysPalTemplate[i].peRed; + PalEntries[i].peGreen = g_sysPalTemplate[i].peGreen; + PalEntries[i].peBlue = g_sysPalTemplate[i].peBlue; - for (i=7; i <= 12; i++) - { - switch(i) - { - case 7: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peBlue=0xc0; - Palette.aEntries[i].peGreen=0xc0; - break; - case 8: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peGreen=0xdc; - Palette.aEntries[i].peBlue=0xc0; - break; - case 9: - Palette.aEntries[i].peRed=0xa6; - Palette.aEntries[i].peGreen=0xca; - Palette.aEntries[i].peBlue=0xf0; - break; - case 10: - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xfb; - Palette.aEntries[i].peBlue=0xf0; - break; - case 11: - Palette.aEntries[i].peRed=0xa0; - Palette.aEntries[i].peGreen=0xa0; - Palette.aEntries[i].peBlue=0xa4; - break; - case 12: - Palette.aEntries[i].peRed=0x80; - Palette.aEntries[i].peGreen=0x80; - Palette.aEntries[i].peBlue=0x80; - } - } + PalEntries[246 + i].peRed = g_sysPalTemplate[10 + i].peRed; + PalEntries[246 + i].peGreen = g_sysPalTemplate[10 + i].peGreen; + PalEntries[246 + i].peBlue = g_sysPalTemplate[10 + i].peBlue; + } - for (i=13; i <= 18; i++) - { - Palette.aEntries[i].peRed=(i%2)?0xff:0; - Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0; - Palette.aEntries[i].peBlue=(i>15)?0xff:0x00; - } + ppal = PALETTE_ShareLockPalette(pdc->dclevel.hpal); + if (ppal && (ppal->flFlags & PAL_INDEXED)) + { + /* FIXME: optimize the palette for the current palette */ + UNIMPLEMENTED } else { - /* 256 color table */ for (r = 0; r < 6; r++) + { for (g = 0; g < 6; g++) + { for (b = 0; b < 6; b++) { i = r + g*6 + b*36 + 10; - Palette.aEntries[i].peRed = r * 51; - Palette.aEntries[i].peGreen = g * 51; - Palette.aEntries[i].peBlue = b * 51; + PalEntries[i].peRed = r * 51; + PalEntries[i].peGreen = g * 51; + PalEntries[i].peBlue = b * 51; } + } + } for (i = 216; i < 246; i++) { int v = (i - 216) << 3; - Palette.aEntries[i].peRed = v; - Palette.aEntries[i].peGreen = v; - Palette.aEntries[i].peBlue = v; + PalEntries[i].peRed = v; + PalEntries[i].peGreen = v; + PalEntries[i].peBlue = v; } } - return GreCreatePaletteInternal((LOGPALETTE *)&Palette, Palette.NumberOfEntries); + if (ppal) + PALETTE_ShareUnlockPalette(ppal); + + DC_UnlockDc(pdc); + + ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, 256, PalEntries, 0, 0, 0); + if (ppal) + { + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); + } + + return hpal; } BOOL diff --git a/reactos/win32ss/gdi/ntgdi/palette.h b/reactos/win32ss/gdi/ntgdi/palette.h index 4dd591d80db..6f500b66737 100644 --- a/reactos/win32ss/gdi/ntgdi/palette.h +++ b/reactos/win32ss/gdi/ntgdi/palette.h @@ -65,7 +65,7 @@ NTAPI PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue); @@ -75,7 +75,7 @@ NTAPI PALETTE_AllocPalWithHandle( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue); From 265497886ff7ff4302bd80ae75365cb6b4a94ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Mon, 30 Jun 2014 19:50:28 +0000 Subject: [PATCH 24/75] [NTDLL_APITEST] - Add a test showing that memory content is still available after changing protection to PAGE_NOACCESS svn path=/trunk/; revision=63678 --- .../apitests/ntdll/NtProtectVirtualMemory.c | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/rostests/apitests/ntdll/NtProtectVirtualMemory.c b/rostests/apitests/ntdll/NtProtectVirtualMemory.c index e1bbe04c57d..e492ecebbb4 100644 --- a/rostests/apitests/ntdll/NtProtectVirtualMemory.c +++ b/rostests/apitests/ntdll/NtProtectVirtualMemory.c @@ -89,6 +89,27 @@ START_TEST(NtProtectVirtualMemory) { ok(*allocationStart == 0, "Test should not go as far as this.\n"); } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Set it as readable again */ + status = NtProtectVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + &allocationSize, + PAGE_READONLY, + &oldProtection); + ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); + ok(oldProtection == PAGE_NOACCESS, "Expected PAGE_READONLY, got %08lx.\n", oldProtection); + + /* Try writing it */ + StartSeh() + { + *allocationStart = 0xAA; + } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Try reading it */ + StartSeh() + { + ok(*allocationStart == 0xFF, "Memory content was not preserved.\n"); + } EndSeh(STATUS_SUCCESS); /* Free memory */ status = NtFreeVirtualMemory(NtCurrentProcess(), @@ -96,4 +117,4 @@ START_TEST(NtProtectVirtualMemory) &allocationSize, MEM_RELEASE); ok(NT_SUCCESS(status), "Failed freeing memory.\n"); -} \ No newline at end of file +} From 291c34f5c725b1995b56917e39857d495df5ddd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 30 Jun 2014 20:26:03 +0000 Subject: [PATCH 25/75] [WINLOGON] Add a suitable icon, from the "Farm-Fresh Icon Set" pack of "FatCow Web Hosting" (http://www.fatcow.com/), under a Creative Commons Attribution 3.0 License. See the COPYING file for more details. svn path=/trunk/; revision=63679 --- reactos/base/system/winlogon/res/COPYING | 12 ++++++++++++ reactos/base/system/winlogon/res/winlogon.ico | Bin 0 -> 5430 bytes reactos/base/system/winlogon/winlogon.rc | 8 +++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 reactos/base/system/winlogon/res/COPYING create mode 100644 reactos/base/system/winlogon/res/winlogon.ico diff --git a/reactos/base/system/winlogon/res/COPYING b/reactos/base/system/winlogon/res/COPYING new file mode 100644 index 00000000000..36e2eddf68a --- /dev/null +++ b/reactos/base/system/winlogon/res/COPYING @@ -0,0 +1,12 @@ +Farm-Fresh Icon Set +FatCow Web Hosting - http://www.fatcow.com/ + +Terms of Use +============ +These icon sets are licensed under a Creative Commons Attribution 3.0 License. +This means you can freely use these icons for any purpose, private and commercial, +including online services, templates, themes and software. However, you should +include a link to this page (http://www.fatcow.com/free-icons) in your credits +(software or website). The icons may not be resold, sub-licensed, rented, transferred +or otherwise made available for use. Please link to this page on fatcow.com if you +would like to spread the word. diff --git a/reactos/base/system/winlogon/res/winlogon.ico b/reactos/base/system/winlogon/res/winlogon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c87caf4badb822709baee77de848b8ef6db8c26c GIT binary patch literal 5430 zcmb`L2~gEXn!sNssjb@DO4V$3V(rYNvIa7faXdg>Cyt3@;*oM!-IJ{#lqb0aaG=|Boc2(Y!4DNSLTYmB;0?%-&<{!&~zIM4OF2zbbNNJ7wGN zO0TS6wbVNJh!vO5M$`E4Hik|;J%Y+r`AT*yk%zYpF0&2ko8?)-f94OcEZ1P{$84Jn zWrL-{M4OF2E89&KR3E-8O$t5o1(jvzx&Ku@6@^KZ=EqW+CrGZ!H6p)%;{vhnTljFd zAG1Bn_+7zcR$d;!%qoRh;)fagFA(RlmeWof@pssapTcnqhi%sth+<`j?@F&kck3bU&{_7@~9QnR}--COyyV7hfl8$^I6d#t4l^?PGs~6zEK0Rx~%Sq;cy?GWTSB z+k7%u4NM=npc%S{G7Jo>#$YW zf{(poGbd%9d)sX!z;zd12Q2V9C`hi#O71OdVNA9`T0_&MQ+Rx?G$y7k5=e>~sE z?yrW}TRF_WJHyykj`G>%5$1cAFmrQ2i0C%%D}GLv+{g*$O0p+~Iu9=YnF7fR5|2L@ zmvzUvnsl7X3=iJ2&f$Nqjp9%}%Ava>g5>wW;XXJ&fKM*;@vitn^c(%{@4TIx=fk;k z<2-F`jkLBk)1qi?rnzN|Cdr$cg+G^#a`|7?Q}tE5yEo5KnRSwB`*PWS3l3C`uwU4E zrHl8yidg7f%#LCMJ1gN`yR2{Y2RK`D`(hk7uV?YV<4x+kUZ>gLgh#<9^hBA^A8*2N ziYcUUk|gu@k^y&&A&;f-F8w_md%yiL>~IiqCV_>T4EN{7X3DzG3N9n&ZIwOCWC3S z=}(=FK{reKHH)^$Su};rLho-T`hUjN3p#3xlCiM!W}&PBOR<4v%-%#t zjwP*`TLj6o_t27IO=he&%`%Q~H!GSYcC?me(ORBH$5%SqZzZBH)zQ;bN%)an-_jo@ z`n#JeNsaWN%5@6W-gBu9SU_FqA{wHW(iFFXmc*5`Cau5b=LCcwKG-vFh zDczdpc82>R%iJ#Dk;Z;zqr4)N}L&|Likn!=T|m1nZo0&F(G{gNa)o9+`T{#Jfh&X+VP(!-V^LnE=L z?5H^Sb8frM;*RI9x##m6Y66zzeJe@m5X>_*M5+<=-={0JXJj!D)47L+-+?tBL zleu+h3SYaLQ+<36_q^WWfuGnR@B^6>%h88_DE9aR`sh#5$E-ykD}B()eA8|hzwThT zw~_FpwiG5Dqagk$7vqlz?&Qb0QdyKqcblHDqu9O7iB+lz7$xomp?^(oCoHs^^(YS zhBnlEo1kA!gO{|v4k@|-CldV}pGm?gdz8%-TAxFLJ@LK@2hu}aDG=XZ)E*I^A2yN~ z=Wg_Y>d)iePNFkmeEt`|Pw;<~ z6L+s?Gt}QL`uBc6{W4#NANNsp{Vc;n17i#hF!T(nWd08g7{o{4OaH4eUi)QU^`qWb zbuHuhk@~8gYA*(V+WGrw{&-pIqt?p^Bl51{$Gy*us;}Cq_M+fv_m8LPe<{Y>E?p~g zuT<7bah{gq3(tYnQ}tCl)m{`l?f&&N{p!E5_2U10>t%dR>7>3|XA^ZZ`XZy67Z@<2 zd0{|47mV|)PRRc+JP-C#kIpABpm|Y!r;yJQ#xE4#e5Vl0JmWisx|h#>0wyARVhTO_ zg+>wRx}PjQ>T;UYQ-?OvU*y zeim5G2N`W_zB$U8OC8MczeT*mXGA-#C&Jl+P`T@Q?)yCNgx%)6AUS6S$XVadaT}-P zt`lItkqC(yrYCRlr%T;9%H3ei)w@oBJZ%2JI+V>23B2p%Cm5egI52^ z801_(GJdAl{u_k;h@ZG!XG_^2mN$ot_qSbN%lY-z2>%{*i?CyRxLuY@osSt!;cwFs zZAPDN8vRMr=#8DiQ1ENKcB}#i8G{;!@q5S@XK-tPxxu%HkQjfz>bjgSr^?y#J=&B0 zi>}labY*@_cjl*Zu3yDZPgJr?&Z>Lmo-}WNChr``Vvjt}4ZlmI?78*zl~g*vNv+?n z`?;qGLGIMef}PU58v$w97~q(GOyLEfv0mU!0R zEq$mi7D{NpSHdHCZmTMi?=?;G?mfo#>K%Vg{3!>GI{yq99vS0FmBi~Y&dUCNmVur& zi5L5x*k1KV>DT($Nj&UjsIU8PP;&MEU+bM%mbjl1?<;X!_QvtJZj9|xR&w=!?E;Oa ORudqN!m literal 0 HcmV?d00001 diff --git a/reactos/base/system/winlogon/winlogon.rc b/reactos/base/system/winlogon/winlogon.rc index d3c4747160c..23864028f19 100644 --- a/reactos/base/system/winlogon/winlogon.rc +++ b/reactos/base/system/winlogon/winlogon.rc @@ -3,16 +3,14 @@ #include "resource.h" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application" #define REACTOS_STR_INTERNAL_NAME "winlogon" #define REACTOS_STR_ORIGINAL_FILENAME "winlogon.exe" #include -/* -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -IDI_WINLOGON ICON "resources/winlogon.ico" -*/ +IDI_WINLOGON ICON "res/winlogon.ico" /* UTF-8 */ #pragma code_page(65001) From 73d7ba1daf7fff8eb03b21ac7e1707435342c5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 30 Jun 2014 21:08:32 +0000 Subject: [PATCH 26/75] [WINLOGON] - Do not shutdown the computer if winlogon cannot register itself to user32 (eg. the user double-clicks on winlogon.exe when ReactOS is already launched :P ). - Add a note about a possible improvement of the error dialog if msgina cannot be loaded correctly. - Fix french translation. svn path=/trunk/; revision=63680 --- reactos/base/system/winlogon/lang/fr-FR.rc | 2 +- reactos/base/system/winlogon/winlogon.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/reactos/base/system/winlogon/lang/fr-FR.rc b/reactos/base/system/winlogon/lang/fr-FR.rc index 50e451dcb66..e608ae0dca0 100644 --- a/reactos/base/system/winlogon/lang/fr-FR.rc +++ b/reactos/base/system/winlogon/lang/fr-FR.rc @@ -18,7 +18,7 @@ CAPTION "Échec de l'interface utilisateur" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Contactez votre administrateur système pour remplacer le DLL, ou restaurez le DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "Contactez votre administrateur système pour remplacer la DLL, ou restaurez la DLL originale.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 END diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c index 56646f7a963..76f0c394f6a 100644 --- a/reactos/base/system/winlogon/winlogon.c +++ b/reactos/base/system/winlogon/winlogon.c @@ -321,8 +321,8 @@ WinMain( if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { ERR("WL: Could not register logon process\n"); - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); + ExitProcess(1); } WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); @@ -366,7 +366,7 @@ WinMain( if (!StartLsass()) { ERR("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, OptionOk, &HardErrorResponse); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); ExitProcess(1); } @@ -377,7 +377,9 @@ WinMain( if (!GinaInit(WLSession)) { ERR("WL: Failed to initialize Gina\n"); - DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L""); + // FIXME: Retrieve the real name of the GINA DLL we were trying to load. + // It is known only inside the GinaInit function... + DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L"msgina.dll"); HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(1); } From 413950767e38fce3902bab9c23b47a6d992d2a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 1 Jul 2014 17:17:43 +0000 Subject: [PATCH 27/75] [CSRDLL]: Avoid a potential null pointer dereference. svn path=/trunk/; revision=63681 --- reactos/dll/ntdll/csr/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/dll/ntdll/csr/connect.c b/reactos/dll/ntdll/csr/connect.c index cef68d9a60c..3a4672e44ab 100644 --- a/reactos/dll/ntdll/csr/connect.c +++ b/reactos/dll/ntdll/csr/connect.c @@ -255,7 +255,7 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory, CsrPortHeap = RtlGetProcessHeap(); /* Tell the caller we're inside the server */ - *ServerToServerCall = InsideCsrProcess; + if (ServerToServerCall) *ServerToServerCall = InsideCsrProcess; return STATUS_SUCCESS; } From 3166e6a0663e04437b3bc6f3f04e566910bb9adf Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 2 Jul 2014 00:11:19 +0000 Subject: [PATCH 28/75] [URLMON] * Add HlinkGoBack stub. Needed by *cough* certain apps. CORE-8174 svn path=/trunk/; revision=63682 --- reactos/dll/win32/urlmon/urlmon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/dll/win32/urlmon/urlmon.spec b/reactos/dll/win32/urlmon/urlmon.spec index 7efa84ce321..27483ef41df 100644 --- a/reactos/dll/win32/urlmon/urlmon.spec +++ b/reactos/dll/win32/urlmon/urlmon.spec @@ -46,7 +46,7 @@ #145 stub GetComponentIDFromCLSSPEC #146 stub GetMarkOfTheWeb 147 stdcall GetSoftwareUpdateInfo(ptr ptr) -#148 stub HlinkGoBack +148 stdcall -stub HlinkGoBack(ptr) #149 stub HlinkGoForward #150 stub HlinkNavigateMoniker 151 stdcall HlinkNavigateString(ptr wstr) From a2e82498a2f6493758acb7699f229e03eb86bcc1 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 5 Jul 2014 15:30:22 +0000 Subject: [PATCH 29/75] [USBEHCI] - Initialize the new queue head before inserting it into the asynchronous schedule list, and add a memory barrier to ensure this order. The list can be read by the host controller at any time, so the new item must be valid when inserted. See EHCI spec section 4.8.1. svn path=/trunk/; revision=63686 --- reactos/drivers/usb/usbehci/usb_queue.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/reactos/drivers/usb/usbehci/usb_queue.cpp b/reactos/drivers/usb/usbehci/usb_queue.cpp index ae40c263adb..df473174e39 100644 --- a/reactos/drivers/usb/usbehci/usb_queue.cpp +++ b/reactos/drivers/usb/usbehci/usb_queue.cpp @@ -478,14 +478,6 @@ CUSBQueue::LinkQueueHead( //ASSERT(IsListEmpty(&HeadQueueHead->LinkedQueueHeads)); InsertTailList(&HeadQueueHead->LinkedQueueHeads, &NewQueueHead->LinkedQueueHeads); - // - // Update HLP for Previous QueueHead, which should be the last in list. - // - Entry = NewQueueHead->LinkedQueueHeads.Blink; - LastQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - //ASSERT(LastQueueHead == HeadQueueHead); - LastQueueHead->HorizontalLinkPointer = (NewQueueHead->PhysicalAddr | QH_TYPE_QH); - // // Update HLP for NewQueueHead to point to next, which should be the HeadQueueHead // @@ -494,6 +486,16 @@ CUSBQueue::LinkQueueHead( //ASSERT(NextQueueHead == HeadQueueHead); NewQueueHead->HorizontalLinkPointer = (NextQueueHead->PhysicalAddr | QH_TYPE_QH); + _ReadWriteBarrier(); + + // + // Update HLP for Previous QueueHead, which should be the last in list. + // + Entry = NewQueueHead->LinkedQueueHeads.Blink; + LastQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + //ASSERT(LastQueueHead == HeadQueueHead); + LastQueueHead->HorizontalLinkPointer = (NewQueueHead->PhysicalAddr | QH_TYPE_QH); + // // head queue head must be halted // From 9dc1dcc32b72a69004b8cdebd0068f3397cf90b8 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 5 Jul 2014 16:32:43 +0000 Subject: [PATCH 30/75] [USBEHCI] - Fix a type-limits warning - Remove unnecessary casts and asserts - Use NULL for pointer comparison - Fix IN vs OUT annotation svn path=/trunk/; revision=63687 --- reactos/drivers/usb/usbehci/interfaces.h | 4 ++-- reactos/drivers/usb/usbehci/usb_queue.cpp | 12 +++++------- reactos/drivers/usb/usbehci/usb_request.cpp | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/reactos/drivers/usb/usbehci/interfaces.h b/reactos/drivers/usb/usbehci/interfaces.h index 447839038d1..58160fa1475 100644 --- a/reactos/drivers/usb/usbehci/interfaces.h +++ b/reactos/drivers/usb/usbehci/interfaces.h @@ -23,7 +23,7 @@ IN struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; \ \ STDMETHOD_(VOID, GetCommandRegister)( THIS_ \ - IN struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; + OUT struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; #define IMP_IUSBEHCIHARDWARE \ STDMETHODIMP_(VOID) SetAsyncListRegister( \ @@ -39,7 +39,7 @@ STDMETHODIMP_(VOID) SetCommandRegister( \ IN struct _EHCI_USBCMD_CONTENT *UsbCmd); \ STDMETHODIMP_(VOID) GetCommandRegister( \ - IN struct _EHCI_USBCMD_CONTENT *UsbCmd); + OUT struct _EHCI_USBCMD_CONTENT *UsbCmd); DECLARE_INTERFACE_(IEHCIHardwareDevice, IUSBHardwareDevice) { diff --git a/reactos/drivers/usb/usbehci/usb_queue.cpp b/reactos/drivers/usb/usbehci/usb_queue.cpp index df473174e39..6787bb431d6 100644 --- a/reactos/drivers/usb/usbehci/usb_queue.cpp +++ b/reactos/drivers/usb/usbehci/usb_queue.cpp @@ -376,6 +376,7 @@ CUSBQueue::GetIntervalIndex( { UCHAR IntervalIndex; + ASSERT(Interval != 0); if (Interval == 1) IntervalIndex = 1; else if (Interval == 2) @@ -392,11 +393,10 @@ CUSBQueue::GetIntervalIndex( IntervalIndex = 7; else if (Interval <= 128) IntervalIndex = 8; - else if (Interval <= 256) - IntervalIndex = 9; else - IntervalIndex = 10; + IntervalIndex = 9; + ASSERT(IntervalIndex < EHCI_INTERRUPT_ENTRIES_COUNT); return IntervalIndex; } @@ -746,8 +746,7 @@ CUSBQueue::ProcessPeriodicSchedule( // // get queue head structure // - QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - ASSERT(QueueHead); + QueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); // // sanity check @@ -822,8 +821,7 @@ CUSBQueue::ProcessAsyncList( // // get queue head structure // - QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - ASSERT(QueueHead); + QueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); // // sanity check diff --git a/reactos/drivers/usb/usbehci/usb_request.cpp b/reactos/drivers/usb/usbehci/usb_request.cpp index c85272aad83..51f691226e2 100644 --- a/reactos/drivers/usb/usbehci/usb_request.cpp +++ b/reactos/drivers/usb/usbehci/usb_request.cpp @@ -894,7 +894,7 @@ CUSBRequest::BuildControlTransferQueueHead( // QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress(); - ASSERT(m_EndpointDescriptor == FALSE); + ASSERT(m_EndpointDescriptor == NULL); // // init setup descriptor From 867be3b13e31c3b8d0aaa4a505bb35db0a403740 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 5 Jul 2014 19:02:41 +0000 Subject: [PATCH 31/75] [FREELDR] Add ARM files to build, avoid a redefinition in osloader.h, use new autogenerated ksarm.h in arm/boot.s svn path=/trunk/; revision=63688 --- reactos/boot/armllb/inc/osloader.h | 4 +--- reactos/boot/freeldr/freeldr/CMakeLists.txt | 9 ++++++++- reactos/boot/freeldr/freeldr/arch/arm/boot.s | 14 ++++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/reactos/boot/armllb/inc/osloader.h b/reactos/boot/armllb/inc/osloader.h index 6251bb1fa56..771c7cbfe09 100644 --- a/reactos/boot/armllb/inc/osloader.h +++ b/reactos/boot/armllb/inc/osloader.h @@ -8,13 +8,12 @@ // // OS Loader Main Routine -// +// typedef VOID (*POSLOADER_INIT)( IN PVOID BoardInit ); -#ifndef __REGISTRY_H // // Type of memory detected by LLB // @@ -36,7 +35,6 @@ typedef struct ULONG Type; ULONG Reserved; } BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; -#endif // // Information sent from LLB to OS Loader diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt index 80e235b82db..4551eb95360 100644 --- a/reactos/boot/freeldr/freeldr/CMakeLists.txt +++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt @@ -53,7 +53,6 @@ list(APPEND FREELDR_COMMON_SOURCE fs/fs.c fs/iso.c fs/ntfs.c - fs/pxe.c inifile/ini_init.c inifile/inifile.c inifile/parse.c @@ -87,6 +86,7 @@ if(ARCH STREQUAL "i386") arch/i386/linux.S arch/i386/mb.S) list(APPEND FREELDR_COMMON_SOURCE + fs/pxe.c arch/i386/archmach.c arch/i386/custom.c arch/i386/drivemap.c @@ -130,6 +130,7 @@ elseif(ARCH STREQUAL "amd64") arch/amd64/int386.S arch/amd64/pnpbios.S) list(APPEND FREELDR_COMMON_SOURCE + fs/pxe.c arch/i386/custom.c arch/i386/drivemap.c arch/i386/hardware.c @@ -149,6 +150,12 @@ elseif(ARCH STREQUAL "amd64") arch/i386/pcrtc.c arch/i386/pcvideo.c arch/amd64/winldr.c) +elseif(ARCH STREQUAL "arm") + list(APPEND FREELDR_COMMON_ASM_SOURCE + arch/arm/boot.S) + list(APPEND FREELDR_COMMON_SOURCE + arch/arm/macharm.c + arch/arm/winldr.c) else() #TBD endif() diff --git a/reactos/boot/freeldr/freeldr/arch/arm/boot.s b/reactos/boot/freeldr/freeldr/arch/arm/boot.s index 0114bb7fdd7..8a116164f8e 100644 --- a/reactos/boot/freeldr/freeldr/arch/arm/boot.s +++ b/reactos/boot/freeldr/freeldr/arch/arm/boot.s @@ -6,16 +6,18 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ - .title "ARM FreeLDR Entry Point" - .include "ntoskrnl/include/internal/arm/kxarm.h" - .include "ntoskrnl/include/internal/arm/ksarm.h" - .section .init +#include "ksarm.h" + + //.title "ARM FreeLDR Entry Point" + //.include "ntoskrnl/include/internal/arm/kxarm.h" + //.include "ntoskrnl/include/internal/arm/ksarm.h" + //.section .init NESTED_ENTRY _start PROLOG_END _start - + b ArmInit - + ENTRY_END _start L_ArmInit: From ab9b6a42512d5d4848b69a1b52c2b3d1808603be Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 5 Jul 2014 19:17:16 +0000 Subject: [PATCH 32/75] [PSEH/RTL/CRT] Some ARM related compilation fixes, plus remove a useless define svn path=/trunk/; revision=63689 --- reactos/lib/pseh/CMakeLists.txt | 4 ++++ reactos/lib/rtl/exception.c | 8 +++++++- reactos/lib/sdk/crt/CMakeLists.txt | 5 +++++ reactos/lib/sdk/crt/string/winesup.c | 1 - 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/reactos/lib/pseh/CMakeLists.txt b/reactos/lib/pseh/CMakeLists.txt index 84ea2a2758f..e0e44f42709 100644 --- a/reactos/lib/pseh/CMakeLists.txt +++ b/reactos/lib/pseh/CMakeLists.txt @@ -33,6 +33,10 @@ else() list(APPEND ASM_SOURCE amd64/seh.s amd64/seh_prolog.s) + elseif(ARCH STREQUAL "arm") + list(APPEND ASM_SOURCE + arm/seh_prolog.s) + list(APPEND SOURCE dummy.c) endif() list(APPEND SOURCE dummy.c) diff --git a/reactos/lib/rtl/exception.c b/reactos/lib/rtl/exception.c index 000365d7815..cc82c16b45f 100644 --- a/reactos/lib/rtl/exception.c +++ b/reactos/lib/rtl/exception.c @@ -221,8 +221,14 @@ static VOID DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); DbgPrint("EFLAGS: %.8x\n", pc->EFlags); +#elif defined(_M_ARM) + DbgPrint("Pc: %lx Lr: %lx Sp: %lx Cpsr: %lx\n", pc->Pc, pc->Lr, pc->Sp, pc->Cpsr); + DbgPrint("R0: %lx R1: %lx R2: %lx R3: %lx\n", pc->R0, pc->R1, pc->R2, pc->R3); + DbgPrint("R4: %lx R5: %lx R6: %lx R7: %lx\n", pc->R4, pc->R5, pc->R6, pc->R7); + DbgPrint("R8: %lx R9: %lx R10: %lx R11: %lx\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %lx \n", pc->R12); #else -#warning Unknown architecture +#pragma message ("Unknown architecture") #endif } diff --git a/reactos/lib/sdk/crt/CMakeLists.txt b/reactos/lib/sdk/crt/CMakeLists.txt index 5df63e0ad96..53b496397e4 100644 --- a/reactos/lib/sdk/crt/CMakeLists.txt +++ b/reactos/lib/sdk/crt/CMakeLists.txt @@ -13,6 +13,11 @@ elseif(ARCH STREQUAL "amd64") if(NOT MSVC) list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s) endif() +elseif(ARCH STREQUAL "arm") + list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) + if(NOT MSVC) + list(APPEND CHKSTK_SOURCE except/arm/chkstk_ms.s) + endif() elseif(ARCH STREQUAL "powerpc") list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s) endif() diff --git a/reactos/lib/sdk/crt/string/winesup.c b/reactos/lib/sdk/crt/string/winesup.c index 860fe85cdb4..b20691d8ffe 100644 --- a/reactos/lib/sdk/crt/string/winesup.c +++ b/reactos/lib/sdk/crt/string/winesup.c @@ -99,4 +99,3 @@ _internal_handle_float( else _SET_NUMBER_(float); } } -#undef _SET_NUMBER_ From c5b0f1eb966b502e7940ade1709a7349e10b4075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 6 Jul 2014 00:00:07 +0000 Subject: [PATCH 33/75] [NTOS:PS] Remove that deprecated NtW32Call function that doesn't exist on windows since NT 4.0 SP3. Alex, do you want to keep its prototype in the NDK too? svn path=/trunk/; revision=63690 --- reactos/ntoskrnl/ps/win32.c | 54 ------------------------------------- 1 file changed, 54 deletions(-) diff --git a/reactos/ntoskrnl/ps/win32.c b/reactos/ntoskrnl/ps/win32.c index a0309b804b2..acb2b8b4f8b 100644 --- a/reactos/ntoskrnl/ps/win32.c +++ b/reactos/ntoskrnl/ps/win32.c @@ -125,58 +125,4 @@ PsEstablishWin32Callouts(IN PWIN32_CALLOUTS_FPNS CalloutData) KeGdiFlushUserBatch = CalloutData->BatchFlushRoutine; } -NTSTATUS -NTAPI -NtW32Call(IN ULONG RoutineIndex, - IN PVOID Argument, - IN ULONG ArgumentLength, - OUT PVOID* Result, - OUT PULONG ResultLength) -{ - PVOID RetResult; - ULONG RetResultLength; - NTSTATUS Status; - ASSERT(KeGetPreviousMode() != KernelMode); - - /* Enter SEH for probing */ - _SEH2_TRY - { - /* Probe arguments */ - ProbeForWritePointer(Result); - ProbeForWriteUlong(ResultLength); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - /* Call kernel function */ - Status = KeUserModeCallback(RoutineIndex, - Argument, - ArgumentLength, - &RetResult, - &RetResultLength); - if (NT_SUCCESS(Status)) - { - /* Enter SEH for write back */ - _SEH2_TRY - { - /* Return results to user mode */ - *Result = RetResult; - *ResultLength = RetResultLength; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Return the result */ - return Status; -} - /* EOF */ From 97cbf95b0d76c27e714f6e068b25919fbbbb489e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 6 Jul 2014 11:23:22 +0000 Subject: [PATCH 34/75] [SACDRV] ASSERT takes a condition, not a string. [NTOS] Use ASSERTMSG instead of a weird ASSERT construction. svn path=/trunk/; revision=63691 --- reactos/drivers/sac/driver/memory.c | 3 ++- reactos/ntoskrnl/po/power.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/drivers/sac/driver/memory.c b/reactos/drivers/sac/driver/memory.c index 86b2efe117f..4def83b812f 100644 --- a/reactos/drivers/sac/driver/memory.c +++ b/reactos/drivers/sac/driver/memory.c @@ -104,7 +104,8 @@ MyAllocatePool(IN SIZE_T PoolSize, PSAC_MEMORY_ENTRY LocalDescriptor, NextDescriptor; ULONG GlobalSize, ActualSize; PVOID Buffer; - ASSERT("Tag != FREE_POOL_TAG"); + + ASSERT(Tag != FREE_POOL_TAG); SAC_DBG(SAC_DBG_MM, "Entering.\n"); /* Acquire the memory allocation lock and align the size request */ diff --git a/reactos/ntoskrnl/po/power.c b/reactos/ntoskrnl/po/power.c index 598b60ad295..771ad0063dc 100644 --- a/reactos/ntoskrnl/po/power.c +++ b/reactos/ntoskrnl/po/power.c @@ -925,7 +925,7 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction, } /* You should not have made it this far */ - ASSERT(FALSE && "System is still up and running?!"); + ASSERTMSG("System is still up and running?!", FALSE); break; } From 8baf5990ef8e1fb2626c1f827ba5509094f8d5b6 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 6 Jul 2014 12:33:11 +0000 Subject: [PATCH 35/75] [USETUP] Swap quick and full format entries in the file system list, so that quick format will be the default. svn path=/trunk/; revision=63692 --- reactos/base/setup/usetup/fslist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/base/setup/usetup/fslist.c b/reactos/base/setup/usetup/fslist.c index 85045a83c1e..1b76cd773bf 100644 --- a/reactos/base/setup/usetup/fslist.c +++ b/reactos/base/setup/usetup/fslist.c @@ -48,7 +48,7 @@ FS_AddProvider( Item->FileSystem = FileSystem; Item->FormatFunc = FormatFunc; Item->ChkdskFunc = ChkdskFunc; - Item->QuickFormat = FALSE; + Item->QuickFormat = TRUE; InsertTailList(&List->ListHead, &Item->ListEntry); if (!FormatFunc) @@ -61,7 +61,7 @@ FS_AddProvider( Item->FileSystem = FileSystem; Item->FormatFunc = FormatFunc; Item->ChkdskFunc = ChkdskFunc; - Item->QuickFormat = TRUE; + Item->QuickFormat = FALSE; InsertTailList(&List->ListHead, &Item->ListEntry); } From e6a306946d9928233e18f3a80d1c8e484ce9c314 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 6 Jul 2014 13:12:28 +0000 Subject: [PATCH 36/75] [VFATLIB] Add full format (wipe) support to the fat32 code. svn path=/trunk/; revision=63693 --- reactos/lib/fslib/vfatlib/fat32.c | 102 ++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 6 deletions(-) diff --git a/reactos/lib/fslib/vfatlib/fat32.c b/reactos/lib/fslib/vfatlib/fat32.c index 17f13e27c5a..0c2389abf70 100644 --- a/reactos/lib/fslib/vfatlib/fat32.c +++ b/reactos/lib/fslib/vfatlib/fat32.c @@ -346,6 +346,87 @@ Fat32WriteRootDirectory(IN HANDLE FileHandle, } +static +NTSTATUS +Fat32WipeSectors( + IN HANDLE FileHandle, + IN PFAT32_BOOT_SECTOR BootSector, + IN OUT PFORMAT_CONTEXT Context) +{ + IO_STATUS_BLOCK IoStatusBlock; + PUCHAR Buffer; + LARGE_INTEGER FileOffset; + ULONGLONG Sector; + ULONG Length; + NTSTATUS Status; + + /* Allocate buffer for the cluster */ + Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + BootSector->SectorsPerCluster * BootSector->BytesPerSector); + if (Buffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Sector = 0; + Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; + + while (Sector + BootSector->SectorsPerCluster < BootSector->SectorsHuge) + { + FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + Length, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); + + Sector += BootSector->SectorsPerCluster; + } + + if (Sector + BootSector->SectorsPerCluster > BootSector->SectorsHuge) + { + DPRINT("Remaining sectors %lu\n", BootSector->SectorsHuge - Sector); + + FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + Length = (BootSector->SectorsHuge - Sector) * BootSector->BytesPerSector; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + Length, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, BootSector->SectorsHuge - Sector); + } + +done: + /* Free the buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + return Status; +} + + NTSTATUS Fat32Format(IN HANDLE FileHandle, IN PPARTITION_INFORMATION PartitionInfo, @@ -407,7 +488,7 @@ Fat32Format(IN HANDLE FileHandle, BootSector.RootCluster = 2; BootSector.FSInfoSector = 1; BootSector.BootBackup = 6; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber (); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -436,6 +517,20 @@ Fat32Format(IN HANDLE FileHandle, Context->TotalSectorCount = 2 + (BootSector.FATSectors32 * BootSector.FATCount) + BootSector.SectorsPerCluster; + if (!QuickFormat) + { + Context->TotalSectorCount += BootSector.SectorsHuge; + + Status = Fat32WipeSectors(FileHandle, + &BootSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("Fat32WipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat32WriteBootSector(FileHandle, &BootSector, Context); @@ -484,11 +579,6 @@ Fat32Format(IN HANDLE FileHandle, DPRINT("Fat32WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } From 6fe19b504869022d9a6ab28de07fed959163c53f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 6 Jul 2014 14:03:04 +0000 Subject: [PATCH 37/75] [FMIFS] Fix indentation and codig style. No code changes! svn path=/trunk/; revision=63694 --- reactos/dll/win32/fmifs/chkdsk.c | 32 ++-- reactos/dll/win32/fmifs/compress.c | 54 +++--- reactos/dll/win32/fmifs/diskcopy.c | 3 +- reactos/dll/win32/fmifs/format.c | 98 +++++------ reactos/dll/win32/fmifs/init.c | 258 +++++++++++++++-------------- reactos/dll/win32/fmifs/media.c | 13 +- reactos/dll/win32/fmifs/precomp.h | 12 +- reactos/dll/win32/fmifs/query.c | 53 +++--- 8 files changed, 264 insertions(+), 259 deletions(-) diff --git a/reactos/dll/win32/fmifs/chkdsk.c b/reactos/dll/win32/fmifs/chkdsk.c index 1d210fa7b55..60edaca659b 100644 --- a/reactos/dll/win32/fmifs/chkdsk.c +++ b/reactos/dll/win32/fmifs/chkdsk.c @@ -10,25 +10,25 @@ #include "precomp.h" /* FMIFS.1 */ -VOID NTAPI +VOID +NTAPI Chkdsk( - IN PWCHAR DriveRoot, - IN PWCHAR Format, - IN BOOLEAN CorrectErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PVOID Unused2, - IN PVOID Unused3, - IN PFMIFSCALLBACK Callback) + IN PWCHAR DriveRoot, + IN PWCHAR Format, + IN BOOLEAN CorrectErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID Unused2, + IN PVOID Unused3, + IN PFMIFSCALLBACK Callback) { - BOOLEAN Argument = FALSE; + BOOLEAN Argument = FALSE; - /* FAIL immediately */ - Callback( - DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument);/* Argument */ + /* FAIL immediately */ + Callback(DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument);/* Argument */ } /* EOF */ diff --git a/reactos/dll/win32/fmifs/compress.c b/reactos/dll/win32/fmifs/compress.c index 8b13b423f0d..5db5ed4ebe8 100644 --- a/reactos/dll/win32/fmifs/compress.c +++ b/reactos/dll/win32/fmifs/compress.c @@ -12,40 +12,38 @@ /* * @implemented */ -BOOLEAN NTAPI +BOOLEAN +NTAPI EnableVolumeCompression( - IN PWCHAR DriveRoot, - IN USHORT Compression) + IN PWCHAR DriveRoot, + IN USHORT Compression) { - HANDLE hFile; - DWORD RetBytes; - BOOL Ret; + HANDLE hFile; + DWORD RetBytes; + BOOL Ret; - hFile = CreateFileW( - DriveRoot, - FILE_READ_DATA | FILE_WRITE_DATA, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS, - NULL); + hFile = CreateFileW(DriveRoot, + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; - if (hFile == INVALID_HANDLE_VALUE) - return FALSE; + Ret = DeviceIoControl(hFile, + FSCTL_SET_COMPRESSION, + &Compression, + sizeof(USHORT), + NULL, + 0, + &RetBytes, + NULL); - Ret = DeviceIoControl( - hFile, - FSCTL_SET_COMPRESSION, - &Compression, - sizeof(USHORT), - NULL, - 0, - &RetBytes, - NULL); + CloseHandle(hFile); - CloseHandle(hFile); - - return (Ret != 0); + return (Ret != 0); } /* EOF */ diff --git a/reactos/dll/win32/fmifs/diskcopy.c b/reactos/dll/win32/fmifs/diskcopy.c index 6a87b6f510c..52314b31930 100644 --- a/reactos/dll/win32/fmifs/diskcopy.c +++ b/reactos/dll/win32/fmifs/diskcopy.c @@ -10,7 +10,8 @@ #include "precomp.h" /* FMIFS.3 */ -VOID NTAPI +VOID +NTAPI DiskCopy(void) { } diff --git a/reactos/dll/win32/fmifs/format.c b/reactos/dll/win32/fmifs/format.c index 39a676d5c10..7f10962dfd9 100644 --- a/reactos/dll/win32/fmifs/format.c +++ b/reactos/dll/win32/fmifs/format.c @@ -14,69 +14,69 @@ #include /* FMIFS.6 */ -VOID NTAPI +VOID +NTAPI Format(VOID) { } /* FMIFS.7 */ -VOID NTAPI +VOID +NTAPI FormatEx( - IN PWCHAR DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PWCHAR Format, - IN PWCHAR Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) + IN PWCHAR DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PWCHAR Format, + IN PWCHAR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) { - PIFS_PROVIDER Provider; - UNICODE_STRING usDriveRoot; - UNICODE_STRING usLabel; - BOOLEAN Argument = FALSE; - WCHAR VolumeName[MAX_PATH]; - //CURDIR CurDir; + PIFS_PROVIDER Provider; + UNICODE_STRING usDriveRoot; + UNICODE_STRING usLabel; + BOOLEAN Argument = FALSE; + WCHAR VolumeName[MAX_PATH]; + //CURDIR CurDir; - Provider = GetProvider(Format); - if (!Provider) - { - /* Unknown file system */ - Callback( - DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument); /* Argument */ - return; - } + Provider = GetProvider(Format); + if (!Provider) + { + /* Unknown file system */ + Callback(DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument); /* Argument */ + return; + } #if 1 - DPRINT1("Warning: use GetVolumeNameForVolumeMountPointW() instead!\n"); - swprintf(VolumeName, L"\\??\\%c:", towupper(DriveRoot[0])); - RtlCreateUnicodeString(&usDriveRoot, VolumeName); - /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ + DPRINT1("Warning: use GetVolumeNameForVolumeMountPointW() instead!\n"); + swprintf(VolumeName, L"\\??\\%c:", towupper(DriveRoot[0])); + RtlCreateUnicodeString(&usDriveRoot, VolumeName); + /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ #else - if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) - || !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) - { - /* Report an error. */ - Callback( - DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument); /* Argument */ - return; - } + if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) || + !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) + { + /* Report an error. */ + Callback(DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument); /* Argument */ + return; + } #endif - RtlInitUnicodeString(&usLabel, Label); + RtlInitUnicodeString(&usLabel, Label); - DPRINT("FormatEx - %S\n", Format); - Provider->FormatEx( - &usDriveRoot, - MediaFlag, - &usLabel, - QuickFormat, - ClusterSize, - Callback); - RtlFreeUnicodeString(&usDriveRoot); + DPRINT("FormatEx - %S\n", Format); + Provider->FormatEx(&usDriveRoot, + MediaFlag, + &usLabel, + QuickFormat, + ClusterSize, + Callback); + + RtlFreeUnicodeString(&usDriveRoot); } /* EOF */ diff --git a/reactos/dll/win32/fmifs/init.c b/reactos/dll/win32/fmifs/init.c index f37f6e6df43..b23497e6e62 100644 --- a/reactos/dll/win32/fmifs/init.c +++ b/reactos/dll/win32/fmifs/init.c @@ -19,167 +19,171 @@ LIST_ENTRY ProviderListHead; PIFS_PROVIDER GetProvider( - IN PWCHAR FileSystem) + IN PWCHAR FileSystem) { - PLIST_ENTRY ListEntry; - PIFS_PROVIDER Provider; + PLIST_ENTRY ListEntry; + PIFS_PROVIDER Provider; - ListEntry = ProviderListHead.Flink; - while (ListEntry != &ProviderListHead) - { - Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); - if (_wcsicmp(Provider->Name, FileSystem) == 0) - return Provider; - ListEntry = ListEntry->Flink; - } + ListEntry = ProviderListHead.Flink; + while (ListEntry != &ProviderListHead) + { + Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); + if (_wcsicmp(Provider->Name, FileSystem) == 0) + return Provider; + ListEntry = ListEntry->Flink; + } - /* Provider not found */ - return NULL; + /* Provider not found */ + return NULL; } -static BOOLEAN + +static +BOOLEAN AddProvider( - IN PCUNICODE_STRING FileSystem, - IN PWCHAR DllFile) + IN PCUNICODE_STRING FileSystem, + IN PWCHAR DllFile) { - PIFS_PROVIDER Provider = NULL; - ULONG RequiredSize; - HMODULE hMod = NULL; - BOOLEAN ret = FALSE; + PIFS_PROVIDER Provider = NULL; + ULONG RequiredSize; + HMODULE hMod = NULL; + BOOLEAN ret = FALSE; - hMod = LoadLibraryW(DllFile); - if (!hMod) - goto cleanup; + hMod = LoadLibraryW(DllFile); + if (!hMod) + goto cleanup; - RequiredSize = FIELD_OFFSET(IFS_PROVIDER, Name) - + FileSystem->Length + sizeof(UNICODE_NULL); - Provider = (PIFS_PROVIDER)RtlAllocateHeap( - RtlGetProcessHeap(), - 0, - RequiredSize); - if (!Provider) - goto cleanup; - RtlZeroMemory(Provider, RequiredSize); + RequiredSize = FIELD_OFFSET(IFS_PROVIDER, Name) + + FileSystem->Length + sizeof(UNICODE_NULL); + Provider = (PIFS_PROVIDER)RtlAllocateHeap( + RtlGetProcessHeap(), + 0, + RequiredSize); + if (!Provider) + goto cleanup; + RtlZeroMemory(Provider, RequiredSize); - /* Get function pointers */ - Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx"); - //Provider->Extend = (EXTEND)GetProcAddress(hMod, "Extend"); - Provider->FormatEx = (FORMATEX)GetProcAddress(hMod, "FormatEx"); + /* Get function pointers */ + Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx"); + //Provider->Extend = (EXTEND)GetProcAddress(hMod, "Extend"); + Provider->FormatEx = (FORMATEX)GetProcAddress(hMod, "FormatEx"); - RtlCopyMemory(Provider->Name, FileSystem->Buffer, FileSystem->Length); + RtlCopyMemory(Provider->Name, FileSystem->Buffer, FileSystem->Length); - InsertTailList(&ProviderListHead, &Provider->ListEntry); - ret = TRUE; + InsertTailList(&ProviderListHead, &Provider->ListEntry); + ret = TRUE; cleanup: - if (!ret) - { - if (hMod) - FreeLibrary(hMod); - if (Provider) - RtlFreeHeap(RtlGetProcessHeap(), 0, Provider); - } - return ret; + if (!ret) + { + if (hMod) + FreeLibrary(hMod); + if (Provider) + RtlFreeHeap(RtlGetProcessHeap(), 0, Provider); + } + return ret; } -static BOOLEAN -InitializeFmIfsOnce(void) +static +BOOLEAN +InitializeFmIfsOnce(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RegistryPath - = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\SOFTWARE\\ReactOS\\ReactOS\\CurrentVersion\\IFS"); - HANDLE hKey = NULL; - PKEY_VALUE_FULL_INFORMATION Buffer; - ULONG BufferSize = sizeof(KEY_VALUE_FULL_INFORMATION) + MAX_PATH; - ULONG RequiredSize; - ULONG i = 0; - UNICODE_STRING Name; - UNICODE_STRING Data; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING RegistryPath + = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\SOFTWARE\\ReactOS\\ReactOS\\CurrentVersion\\IFS"); + HANDLE hKey = NULL; + PKEY_VALUE_FULL_INFORMATION Buffer; + ULONG BufferSize = sizeof(KEY_VALUE_FULL_INFORMATION) + MAX_PATH; + ULONG RequiredSize; + ULONG i = 0; + UNICODE_STRING Name; + UNICODE_STRING Data; + NTSTATUS Status; - InitializeListHead(&ProviderListHead); + InitializeListHead(&ProviderListHead); - /* Read IFS providers from HKLM\SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS */ - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, 0, NULL, NULL); - Status = NtOpenKey(&hKey, KEY_QUERY_VALUE, &ObjectAttributes); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - return TRUE; - else if (!NT_SUCCESS(Status)) - return FALSE; + /* Read IFS providers from HKLM\SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS */ + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, 0, NULL, NULL); + Status = NtOpenKey(&hKey, KEY_QUERY_VALUE, &ObjectAttributes); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return TRUE; + else if (!NT_SUCCESS(Status)) + return FALSE; - Buffer = (PKEY_VALUE_FULL_INFORMATION)RtlAllocateHeap( - RtlGetProcessHeap(), - 0, - BufferSize); - if (!Buffer) - { - NtClose(hKey); - return FALSE; - } + Buffer = (PKEY_VALUE_FULL_INFORMATION)RtlAllocateHeap( + RtlGetProcessHeap(), + 0, + BufferSize); + if (!Buffer) + { + NtClose(hKey); + return FALSE; + } - while (TRUE) - { - Status = NtEnumerateValueKey( - hKey, - i++, - KeyValueFullInformation, - Buffer, - BufferSize, - &RequiredSize); - if (Status == STATUS_BUFFER_OVERFLOW) - continue; - else if (!NT_SUCCESS(Status)) - break; - else if (Buffer->Type != REG_SZ) - continue; + while (TRUE) + { + Status = NtEnumerateValueKey( + hKey, + i++, + KeyValueFullInformation, + Buffer, + BufferSize, + &RequiredSize); + if (Status == STATUS_BUFFER_OVERFLOW) + continue; + else if (!NT_SUCCESS(Status)) + break; + else if (Buffer->Type != REG_SZ) + continue; - Name.Length = Name.MaximumLength = Buffer->NameLength; - Name.Buffer = Buffer->Name; - Data.Length = Data.MaximumLength = Buffer->DataLength; - Data.Buffer = (PWCHAR)((ULONG_PTR)Buffer + Buffer->DataOffset); - if (Data.Length > sizeof(WCHAR) && Data.Buffer[Data.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) - Data.Length -= sizeof(WCHAR); + Name.Length = Name.MaximumLength = Buffer->NameLength; + Name.Buffer = Buffer->Name; + Data.Length = Data.MaximumLength = Buffer->DataLength; + Data.Buffer = (PWCHAR)((ULONG_PTR)Buffer + Buffer->DataOffset); + if (Data.Length > sizeof(WCHAR) && Data.Buffer[Data.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) + Data.Length -= sizeof(WCHAR); - AddProvider(&Name, Data.Buffer); - } + AddProvider(&Name, Data.Buffer); + } - NtClose(hKey); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return TRUE; + NtClose(hKey); + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + return TRUE; } /* FMIFS.8 */ -BOOLEAN NTAPI +BOOLEAN +NTAPI InitializeFmIfs( - IN PVOID hinstDll, - IN DWORD dwReason, - IN PVOID reserved) + IN PVOID hinstDll, + IN DWORD dwReason, + IN PVOID reserved) { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - if (FALSE == FmIfsInitialized) - { - if (FALSE == InitializeFmIfsOnce()) - { - return FALSE; - } + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + if (FmIfsInitialized == FALSE) + { + if (InitializeFmIfsOnce() == FALSE) + { + return FALSE; + } - FmIfsInitialized = TRUE; - } - break; + FmIfsInitialized = TRUE; + } + break; - case DLL_THREAD_ATTACH: - break; + case DLL_THREAD_ATTACH: + break; - case DLL_THREAD_DETACH: - break; + case DLL_THREAD_DETACH: + break; - case DLL_PROCESS_DETACH: - break; - } + case DLL_PROCESS_DETACH: + break; + } - return TRUE; + return TRUE; } /* EOF */ diff --git a/reactos/dll/win32/fmifs/media.c b/reactos/dll/win32/fmifs/media.c index 0cdb32da7ba..ffbe04fbb39 100644 --- a/reactos/dll/win32/fmifs/media.c +++ b/reactos/dll/win32/fmifs/media.c @@ -10,14 +10,15 @@ #include "precomp.h" /* FMIFS.9 */ -BOOL NTAPI +BOOL +NTAPI QuerySupportedMedia( - IN PWCHAR DriveRoot, - OUT FMIFS_MEDIA_FLAG *CurrentMedia OPTIONAL, - IN ULONG Unknown3, - OUT PULONG Unknown4) + IN PWCHAR DriveRoot, + OUT FMIFS_MEDIA_FLAG *CurrentMedia OPTIONAL, + IN ULONG Unknown3, + OUT PULONG Unknown4) { - return FALSE; + return FALSE; } /* EOF */ diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h index e03812b2658..d76fb772846 100644 --- a/reactos/dll/win32/fmifs/precomp.h +++ b/reactos/dll/win32/fmifs/precomp.h @@ -32,18 +32,18 @@ extern LIST_ENTRY ProviderListHead; typedef struct _IFS_PROVIDER { - LIST_ENTRY ListEntry; + LIST_ENTRY ListEntry; - CHKDSKEX ChkdskEx; - PVOID Extend; - FORMATEX FormatEx; + CHKDSKEX ChkdskEx; + PVOID Extend; + FORMATEX FormatEx; - WCHAR Name[1]; + WCHAR Name[1]; } IFS_PROVIDER, *PIFS_PROVIDER; /* init.c */ PIFS_PROVIDER GetProvider( - IN PWCHAR FileSytem); + IN PWCHAR FileSytem); #endif /* _FMIFS_PCH_ */ diff --git a/reactos/dll/win32/fmifs/query.c b/reactos/dll/win32/fmifs/query.c index da3f1d96702..9903275fcac 100644 --- a/reactos/dll/win32/fmifs/query.c +++ b/reactos/dll/win32/fmifs/query.c @@ -9,36 +9,37 @@ #include "precomp.h" -BOOLEAN NTAPI +BOOLEAN +NTAPI QueryAvailableFileSystemFormat( - IN DWORD Index, - IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ - OUT UCHAR* Major, - OUT UCHAR* Minor, - OUT BOOLEAN* LatestVersion) + IN DWORD Index, + IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ + OUT UCHAR *Major, + OUT UCHAR *Minor, + OUT BOOLEAN *LatestVersion) { - PLIST_ENTRY ListEntry; - PIFS_PROVIDER Provider; + PLIST_ENTRY ListEntry; + PIFS_PROVIDER Provider; - if (!FileSystem || !Major ||!Minor ||!LatestVersion) - return FALSE; + if (!FileSystem || !Major ||!Minor ||!LatestVersion) + return FALSE; - ListEntry = ProviderListHead.Flink; - while (TRUE) - { - if (ListEntry == &ProviderListHead) - return FALSE; - if (Index == 0) - break; - ListEntry = ListEntry->Flink; - Index--; - } + ListEntry = ProviderListHead.Flink; + while (TRUE) + { + if (ListEntry == &ProviderListHead) + return FALSE; + if (Index == 0) + break; + ListEntry = ListEntry->Flink; + Index--; + } - Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); - wcscpy(FileSystem, Provider->Name); - *Major = 0; /* FIXME */ - *Minor = 0; /* FIXME */ - *LatestVersion = TRUE; /* FIXME */ + Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); + wcscpy(FileSystem, Provider->Name); + *Major = 0; /* FIXME */ + *Minor = 0; /* FIXME */ + *LatestVersion = TRUE; /* FIXME */ - return TRUE; + return TRUE; } From 03119a10c1afb3f0135ff865ec206f7850ab14ba Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 6 Jul 2014 15:57:16 +0000 Subject: [PATCH 38/75] [FORMAT] Rename variables in order to avoid conflicts with the FMIFS.Format function. svn path=/trunk/; revision=63695 --- reactos/base/system/format/format.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/base/system/format/format.c b/reactos/base/system/format/format.c index 3a298d9d42b..73d3b0711ec 100644 --- a/reactos/base/system/format/format.c +++ b/reactos/base/system/format/format.c @@ -24,7 +24,7 @@ BOOL CompressDrive = FALSE; BOOL GotALabel = FALSE; LPTSTR Label = _T(""); LPTSTR Drive = NULL; -LPTSTR Format = _T("FAT"); +LPTSTR FileSystem = _T("FAT"); TCHAR RootDirectory[MAX_PATH]; TCHAR LabelString[12]; @@ -113,7 +113,7 @@ static int ParseCommandLine( int argc, TCHAR *argv[] ) if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) { if( gotFormat) return -1; - Format = &argv[i][4]; + FileSystem = &argv[i][4]; gotFormat = TRUE; @@ -332,7 +332,7 @@ _tmain(int argc, TCHAR *argv[]) DWORD flags, maxComponent; ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; #ifndef UNICODE - WCHAR RootDirectoryW[MAX_PATH], FormatW[MAX_PATH], LabelW[MAX_PATH]; + WCHAR RootDirectoryW[MAX_PATH], FileSystemW[MAX_PATH], LabelW[MAX_PATH]; #endif TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -526,12 +526,12 @@ _tmain(int argc, TCHAR *argv[]) // #ifndef UNICODE MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, Format, -1, FormatW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, FileSystem, -1, FileSystemW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH); - FormatEx( RootDirectoryW, media, FormatW, LabelW, QuickFormat, + FormatEx( RootDirectoryW, media, FileSystemW, LabelW, QuickFormat, ClusterSize, FormatExCallback ); #else - FormatEx( RootDirectory, media, Format, Label, QuickFormat, + FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat, ClusterSize, FormatExCallback ); #endif if( Error ) return -1; From d3be6e62e8abe84800ce1d8a7e8a530c2783339f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 6 Jul 2014 16:13:49 +0000 Subject: [PATCH 39/75] [FMIFS] Add Format prototype. svn path=/trunk/; revision=63696 --- reactos/dll/win32/fmifs/fmifs.spec | 2 +- reactos/dll/win32/fmifs/format.c | 11 ++++++++--- reactos/include/reactos/libs/fmifs/fmifs.h | 10 ++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/fmifs/fmifs.spec b/reactos/dll/win32/fmifs/fmifs.spec index 25f98a1d678..c27f3974a88 100644 --- a/reactos/dll/win32/fmifs/fmifs.spec +++ b/reactos/dll/win32/fmifs/fmifs.spec @@ -4,7 +4,7 @@ @ stdcall DiskCopy() @ stdcall EnableVolumeCompression(wstr long) @ stdcall Extend() -@ stdcall Format() +@ stdcall Format(wstr ptr wstr wstr long ptr) @ stdcall FormatEx(wstr ptr wstr wstr long long ptr) @ stub FormatEx2 @ stdcall InitializeFmIfs(ptr long ptr) diff --git a/reactos/dll/win32/fmifs/format.c b/reactos/dll/win32/fmifs/format.c index 7f10962dfd9..5aab0242374 100644 --- a/reactos/dll/win32/fmifs/format.c +++ b/reactos/dll/win32/fmifs/format.c @@ -14,9 +14,14 @@ #include /* FMIFS.6 */ -VOID -NTAPI -Format(VOID) +VOID NTAPI +Format( + IN PWCHAR DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PWCHAR Format, + IN PWCHAR Label, + IN BOOLEAN QuickFormat, + IN PFMIFSCALLBACK Callback) { } diff --git a/reactos/include/reactos/libs/fmifs/fmifs.h b/reactos/include/reactos/libs/fmifs/fmifs.h index cdf87f504af..14bf5310f2f 100644 --- a/reactos/include/reactos/libs/fmifs/fmifs.h +++ b/reactos/include/reactos/libs/fmifs/fmifs.h @@ -133,6 +133,16 @@ EnableVolumeCompression( /* Format command in FMIFS */ VOID NTAPI +Format( + IN PWCHAR DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PWCHAR Format, + IN PWCHAR Label, + IN BOOLEAN QuickFormat, + IN PFMIFSCALLBACK Callback); + +/* FormatEx command in FMIFS */ +VOID NTAPI FormatEx( IN PWCHAR DriveRoot, IN FMIFS_MEDIA_FLAG MediaFlag, From e3f91f127cb09e16bdbb0348176833a662209f2b Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 6 Jul 2014 17:36:56 +0000 Subject: [PATCH 40/75] [DBGPRINT] Convert TABs to spaces. svn path=/trunk/; revision=63697 --- .../applications/cmdutils/dbgprint/dbgprint.c | 198 +++++++++--------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c index e18088ce09b..75ab212e85e 100644 --- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c +++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c @@ -16,109 +16,109 @@ int _tmain(int argc, TCHAR ** argv) { - TCHAR * buf; - int bufsize; - int i; - int offset; + TCHAR * buf; + int bufsize; + int i; + int offset; - bufsize = 0; - for(i = 1; i < argc; i++) - { - bufsize += _tcslen(argv[i]) + 1; - } + bufsize = 0; + for(i = 1; i < argc; i++) + { + bufsize += _tcslen(argv[i]) + 1; + } - if (!bufsize) - { - return -1; - } + if (!bufsize) + { + return -1; + } - if (_tcsstr(argv[1], "--winetest") && (argc == 3)) - { - char psBuffer[128]; - char psBuffer2[128]; - char *nlptr2; - char cmd[255]; - char test[300]; - FILE *pPipe; - FILE *pPipe2; + if (_tcsstr(argv[1], "--winetest") && (argc == 3)) + { + char psBuffer[128]; + char psBuffer2[128]; + char *nlptr2; + char cmd[255]; + char test[300]; + FILE *pPipe; + FILE *pPipe2; - /* get available tests */ - pPipe = _tpopen(argv[2], "r"); - if (pPipe != NULL) - { - while(fgets(psBuffer, 128, pPipe)) - { - if (psBuffer[0] == ' ') - { - strcpy(cmd, argv[2]); - strcat(cmd, " "); - strcat(cmd, psBuffer+4); - /* run the current test */ - strcpy(test, "\n\nRunning "); - strcat(test, cmd); - OutputDebugStringA(test); - pPipe2 = _popen(cmd, "r"); - if (pPipe2 != NULL) - { - while(fgets(psBuffer2, 128, pPipe2)) - { - nlptr2 = strchr(psBuffer2, '\n'); - if (nlptr2) - *nlptr2 = '\0'; - puts(psBuffer2); - OutputDebugStringA(psBuffer2); - } - _pclose(pPipe2); - } - } - } - _pclose(pPipe); - } - } - else if (_tcsstr(argv[1], "--process") && (argc == 3)) - { - char psBuffer[128]; - FILE *pPipe; + /* get available tests */ + pPipe = _tpopen(argv[2], "r"); + if (pPipe != NULL) + { + while(fgets(psBuffer, 128, pPipe)) + { + if (psBuffer[0] == ' ') + { + strcpy(cmd, argv[2]); + strcat(cmd, " "); + strcat(cmd, psBuffer+4); + /* run the current test */ + strcpy(test, "\n\nRunning "); + strcat(test, cmd); + OutputDebugStringA(test); + pPipe2 = _popen(cmd, "r"); + if (pPipe2 != NULL) + { + while(fgets(psBuffer2, 128, pPipe2)) + { + nlptr2 = strchr(psBuffer2, '\n'); + if (nlptr2) + *nlptr2 = '\0'; + puts(psBuffer2); + OutputDebugStringA(psBuffer2); + } + _pclose(pPipe2); + } + } + } + _pclose(pPipe); + } + } + else if (_tcsstr(argv[1], "--process") && (argc == 3)) + { + char psBuffer[128]; + FILE *pPipe; - pPipe = _tpopen(argv[2], "r"); - if (pPipe != NULL) - { - while(fgets(psBuffer, 128, pPipe)) - { - puts(psBuffer); - OutputDebugStringA(psBuffer); - } - _pclose(pPipe); - } - } - else - { - buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); - if (!buf) - { - return -1; - } + pPipe = _tpopen(argv[2], "r"); + if (pPipe != NULL) + { + while(fgets(psBuffer, 128, pPipe)) + { + puts(psBuffer); + OutputDebugStringA(psBuffer); + } + _pclose(pPipe); + } + } + else + { + buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); + if (!buf) + { + return -1; + } - offset = 0; - for(i = 1; i < argc; i++) - { - int length = _tcslen(argv[i]); - _tcsncpy(&buf[offset], argv[i], length); - offset += length; - if (i + 1 < argc) - { - buf[offset] = _T(' '); - } - else - { - buf[offset] = _T('\n'); - buf[offset+1] = _T('\0'); - } - offset++; - } - _putts(buf); - OutputDebugString(buf); - HeapFree(GetProcessHeap(), 0, buf); - } - return 0; + offset = 0; + for(i = 1; i < argc; i++) + { + int length = _tcslen(argv[i]); + _tcsncpy(&buf[offset], argv[i], length); + offset += length; + if (i + 1 < argc) + { + buf[offset] = _T(' '); + } + else + { + buf[offset] = _T('\n'); + buf[offset+1] = _T('\0'); + } + offset++; + } + _putts(buf); + OutputDebugString(buf); + HeapFree(GetProcessHeap(), 0, buf); + } + return 0; } From d21dde849eb4c8c2861ffc1d3a5bf61bbcfc28af Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 6 Jul 2014 18:09:58 +0000 Subject: [PATCH 41/75] [DBGPRINT] --winetest mode: Use --list to get the tests list. Dedicated to Christoph :) svn path=/trunk/; revision=63698 --- reactos/base/applications/cmdutils/dbgprint/dbgprint.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c index 75ab212e85e..1e381b9780f 100644 --- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c +++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c @@ -43,7 +43,9 @@ int _tmain(int argc, TCHAR ** argv) FILE *pPipe2; /* get available tests */ - pPipe = _tpopen(argv[2], "r"); + strcpy(cmd, argv[2]); + strcat(cmd, " --list"); + pPipe = _tpopen(cmd, "r"); if (pPipe != NULL) { while(fgets(psBuffer, 128, pPipe)) From d331e1725bed312464ae9142dacecff61c8c9912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Mon, 7 Jul 2014 14:46:04 +0000 Subject: [PATCH 42/75] [NTDLL_APITEST] - Add tests for NtDeleteKey svn path=/trunk/; revision=63699 --- rostests/apitests/ntdll/CMakeLists.txt | 1 + rostests/apitests/ntdll/NtDeleteKey.c | 96 ++++++++++++++++++++++++++ rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 99 insertions(+) create mode 100644 rostests/apitests/ntdll/NtDeleteKey.c diff --git a/rostests/apitests/ntdll/CMakeLists.txt b/rostests/apitests/ntdll/CMakeLists.txt index 8891df5f712..03309b83c16 100644 --- a/rostests/apitests/ntdll/CMakeLists.txt +++ b/rostests/apitests/ntdll/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE NtContinue.c NtCreateFile.c NtCreateThread.c + NtDeleteKey.c NtFreeVirtualMemory.c NtMapViewOfSection.c NtMutant.c diff --git a/rostests/apitests/ntdll/NtDeleteKey.c b/rostests/apitests/ntdll/NtDeleteKey.c new file mode 100644 index 00000000000..2e2a327783c --- /dev/null +++ b/rostests/apitests/ntdll/NtDeleteKey.c @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for NtDeleteKey + */ + +#include + +#define WIN32_NO_STATUS +#include +#include +#include +#include + +static +NTSTATUS +CreateRegistryKeyHandle(PHANDLE KeyHandle, + ACCESS_MASK AccessMask, + PWCHAR RegistryPath) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES Attributes; + + RtlInitUnicodeString(&KeyName, RegistryPath); + InitializeObjectAttributes(&Attributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + return NtCreateKey(KeyHandle, AccessMask, &Attributes, 0, NULL, REG_OPTION_VOLATILE, 0); +} + +START_TEST(NtDeleteKey) +{ + NTSTATUS Status; + HANDLE ParentKey, ChildKey; + + /* Create a registry key */ + Status = CreateRegistryKeyHandle(&ParentKey, KEY_READ | DELETE, L"\\Registry\\Machine\\Software\\RosTests"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Create a children registry key */ + Status = CreateRegistryKeyHandle(&ChildKey, KEY_READ | DELETE, L"\\Registry\\Machine\\Software\\RosTests\\Child"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try deleting the parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_CANNOT_DELETE); + + /* See what happens with Child one */ + Status = NtDeleteKey(ChildKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Retry with parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* re-retry */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close everything */ + NtClose(ChildKey); + NtClose(ParentKey); + + /* Same, but this time close the child handle before trying to delete the parent */ + /* Create a registry key */ + Status = CreateRegistryKeyHandle(&ParentKey, KEY_READ | DELETE, L"\\Registry\\Machine\\Software\\RosTests"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Create a children registry key */ + Status = CreateRegistryKeyHandle(&ChildKey, KEY_READ, L"\\Registry\\Machine\\Software\\RosTests\\Child"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close the Child */ + NtClose(ChildKey); + + /* Try deleting the parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_CANNOT_DELETE); + + /* See what happens with Child one */ + Status = CreateRegistryKeyHandle(&ChildKey, DELETE, L"\\Registry\\Machine\\Software\\RosTests\\Child"); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtDeleteKey(ChildKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Retry with parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close everything */ + NtClose(ChildKey); + NtClose(ParentKey); +} diff --git a/rostests/apitests/ntdll/testlist.c b/rostests/apitests/ntdll/testlist.c index 0a4a8466089..69fc3db2920 100644 --- a/rostests/apitests/ntdll/testlist.c +++ b/rostests/apitests/ntdll/testlist.c @@ -8,6 +8,7 @@ extern void func_NtAllocateVirtualMemory(void); extern void func_NtContinue(void); extern void func_NtCreateFile(void); extern void func_NtCreateThread(void); +extern void func_NtDeleteKey(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); extern void func_NtMutant(void); @@ -38,6 +39,7 @@ const struct test winetest_testlist[] = { "NtContinue", func_NtContinue }, { "NtCreateFile", func_NtCreateFile }, { "NtCreateThread", func_NtCreateThread }, + { "NtDeleteKey", func_NtDeleteKey }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtMutant", func_NtMutant }, From 3eaff9c2bcf0c8d0d079904a9d3a7ed9a2da1fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Tue, 8 Jul 2014 18:42:20 +0000 Subject: [PATCH 43/75] [NTOSKRNL] - Use ZwSetValueKey instead of NtSetValueKey - Properly probe and copy parameters when NtSetValueKey is called from UMode CORE-7738 #resolve #comment fixed in r63700 svn path=/trunk/; revision=63700 --- reactos/ntoskrnl/config/cmconfig.c | 6 +- reactos/ntoskrnl/config/cmsysini.c | 23 +++--- reactos/ntoskrnl/config/i386/cmhardwr.c | 22 +++--- reactos/ntoskrnl/config/ntapi.c | 82 ++++++++++++++++++---- reactos/ntoskrnl/config/powerpc/cmhardwr.c | 22 +++--- reactos/ntoskrnl/ex/init.c | 4 +- reactos/ntoskrnl/io/iomgr/bootlog.c | 2 +- 7 files changed, 108 insertions(+), 53 deletions(-) diff --git a/reactos/ntoskrnl/config/cmconfig.c b/reactos/ntoskrnl/config/cmconfig.c index a0f66ac9a7a..95ddcbe6802 100644 --- a/reactos/ntoskrnl/config/cmconfig.c +++ b/reactos/ntoskrnl/config/cmconfig.c @@ -97,7 +97,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, /* Setup the component information key */ RtlInitUnicodeString(&ValueName, L"Component Information"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -124,7 +124,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, if (NT_SUCCESS(Status)) { /* Save the identifier in the registry */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -178,7 +178,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, CmpConfigurationData->BusNumber = BusNumber; /* Save the actual data */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_FULL_RESOURCE_DESCRIPTOR, diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c index f41d27b042c..954e3488715 100644 --- a/reactos/ntoskrnl/config/cmsysini.c +++ b/reactos/ntoskrnl/config/cmsysini.c @@ -416,7 +416,7 @@ CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Key opened, now write to the key */ RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -427,7 +427,7 @@ CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Setup value name for system boot device in ARC format */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -474,7 +474,7 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ @@ -488,16 +488,17 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, &Disposition); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; - /* Don't need the handle */ + /* We don't need the handle */ ZwClose(KeyHandle); /* Use hard-coded setting */ @@ -533,7 +534,7 @@ UseSet: OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -557,7 +558,7 @@ UseSet: Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); /* Set the value */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -572,7 +573,7 @@ UseSet: KeyHandle, NULL); Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); - NtClose(KeyHandle); + ZwClose(KeyHandle); /* Check if we don't have one */ if (!NT_SUCCESS(Status)) @@ -689,7 +690,7 @@ UseSet: ASSERT(STATUS_SUCCESS == Status); /* Set it */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -2180,7 +2181,7 @@ CmpSetVersionData(VOID) RtlInitUnicodeString(&ValueData, Buffer); - NtSetValueKey(CurrentVersionKeyHandle, + ZwSetValueKey(CurrentVersionKeyHandle, &ValueName, 0, REG_SZ, diff --git a/reactos/ntoskrnl/config/i386/cmhardwr.c b/reactos/ntoskrnl/config/i386/cmhardwr.c index cb8d7e8938d..1da455763af 100644 --- a/reactos/ntoskrnl/config/i386/cmhardwr.c +++ b/reactos/ntoskrnl/config/i386/cmhardwr.c @@ -268,7 +268,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - NtSetValueKey(KeyHandle, + ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -463,7 +463,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -486,7 +486,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -502,7 +502,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -515,7 +515,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -528,7 +528,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -621,7 +621,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -643,7 +643,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, + Status = ZwSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -703,7 +703,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -746,7 +746,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -801,7 +801,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, diff --git a/reactos/ntoskrnl/config/ntapi.c b/reactos/ntoskrnl/config/ntapi.c index b3bf0ece98d..bc89d22c4d7 100644 --- a/reactos/ntoskrnl/config/ntapi.c +++ b/reactos/ntoskrnl/config/ntapi.c @@ -33,7 +33,10 @@ NtCreateKey(OUT PHANDLE KeyHandle, CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; PAGED_CODE(); - DPRINT("NtCreateKey(OB name %wZ)\n", ObjectAttributes->ObjectName); + + DPRINT("NtCreateKey(Path: %wZ, Root %x, Access: %x, CreateOptions %x)\n", + ObjectAttributes->ObjectName, ObjectAttributes->RootDirectory, + DesiredAccess, CreateOptions); /* Check for user-mode caller */ if (PreviousMode != KernelMode) @@ -60,7 +63,8 @@ NtCreateKey(OUT PHANDLE KeyHandle, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); - if (Disposition) ProbeForWriteUlong(Disposition); + if (Disposition) + ProbeForWriteUlong(Disposition); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -101,6 +105,8 @@ NtCreateKey(OUT PHANDLE KeyHandle, } _SEH2_END; + DPRINT("Returning handle %x, Status %x.\n", Handle, Status); + /* Return status */ return Status; } @@ -116,7 +122,8 @@ NtOpenKey(OUT PHANDLE KeyHandle, NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE(); - DPRINT("NtOpenKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); + DPRINT("NtOpenKey(Path: %wZ, Root %x, Access: %x)\n", + ObjectAttributes->ObjectName, ObjectAttributes->RootDirectory, DesiredAccess); /* Check for user-mode caller */ if (PreviousMode != KernelMode) @@ -166,6 +173,8 @@ NtOpenKey(OUT PHANDLE KeyHandle, _SEH2_END; } + DPRINT("Returning handle %x, Status %x.\n", Handle, Status); + /* Return status */ return Status; } @@ -301,6 +310,7 @@ NtEnumerateKey(IN HANDLE KeyHandle, /* Dereference and return status */ ObDereferenceObject(KeyObject); + DPRINT("Returning status %x.\n", Status); return Status; } @@ -604,14 +614,52 @@ NtSetValueKey(IN HANDLE KeyHandle, IN PVOID Data, IN ULONG DataSize) { - NTSTATUS Status; - PCM_KEY_BODY KeyObject; + NTSTATUS Status = STATUS_SUCCESS; + PCM_KEY_BODY KeyObject = NULL; REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; - UNICODE_STRING ValueNameCopy = *ValueName; + UNICODE_STRING ValueNameCopy; + KPROCESSOR_MODE PreviousMode; + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + if (Data && !DataSize) + return STATUS_INVALID_PARAMETER; + + /* Probe and copy the data */ + if ((PreviousMode != KernelMode) && Data) + { + PVOID DataCopy = ExAllocatePoolWithTag(PagedPool, DataSize, TAG_CM); + if (!DataCopy) + return STATUS_NO_MEMORY; + _SEH2_TRY + { + ProbeForRead(Data, DataSize, 1); + RtlCopyMemory(DataCopy, Data, DataSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(DataCopy, TAG_CM); + return Status; + } + Data = DataCopy; + } + + /* Capture the string */ + Status = ProbeAndCaptureUnicodeString(&ValueNameCopy, PreviousMode, ValueName); + if (!NT_SUCCESS(Status)) + goto end; + DPRINT("NtSetValueKey() KH 0x%p, VN '%wZ', TI %x, T %lu, DS %lu\n", - KeyHandle, ValueName, TitleIndex, Type, DataSize); + KeyHandle, &ValueNameCopy, TitleIndex, Type, DataSize); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -620,7 +668,8 @@ NtSetValueKey(IN HANDLE KeyHandle, ExGetPreviousMode(), (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + goto end; /* Make sure the name is aligned, not too long, and the data under 4GB */ if ( (ValueNameCopy.Length > 32767) || @@ -628,8 +677,8 @@ NtSetValueKey(IN HANDLE KeyHandle, (DataSize > 0x80000000)) { /* Fail */ - ObDereferenceObject(KeyObject); - return STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto end; } /* Ignore any null characters at the end */ @@ -644,14 +693,14 @@ NtSetValueKey(IN HANDLE KeyHandle, if (KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) { /* Fail */ - ObDereferenceObject(KeyObject); - return STATUS_ACCESS_DENIED; + Status = STATUS_ACCESS_DENIED; + goto end; } /* Setup callback */ PostOperationInfo.Object = (PVOID)KeyObject; SetValueKeyInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.ValueName = ValueName; + SetValueKeyInfo.ValueName = &ValueNameCopy; SetValueKeyInfo.TitleIndex = TitleIndex; SetValueKeyInfo.Type = Type; SetValueKeyInfo.Data = Data; @@ -673,8 +722,13 @@ NtSetValueKey(IN HANDLE KeyHandle, PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); +end: /* Dereference and return status */ - ObDereferenceObject(KeyObject); + if (KeyObject) + ObDereferenceObject(KeyObject); + ReleaseCapturedUnicodeString(&ValueNameCopy, PreviousMode); + if ((PreviousMode != KernelMode) && Data) + ExFreePoolWithTag(Data, TAG_CM); return Status; } diff --git a/reactos/ntoskrnl/config/powerpc/cmhardwr.c b/reactos/ntoskrnl/config/powerpc/cmhardwr.c index f034f537433..84b7d912630 100644 --- a/reactos/ntoskrnl/config/powerpc/cmhardwr.c +++ b/reactos/ntoskrnl/config/powerpc/cmhardwr.c @@ -267,7 +267,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - NtSetValueKey(KeyHandle, + ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -465,7 +465,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -488,7 +488,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -504,7 +504,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -517,7 +517,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -530,7 +530,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -623,7 +623,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -645,7 +645,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, + Status = ZwSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -705,7 +705,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -749,7 +749,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -804,7 +804,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c index 04f8e785d10..519f8400bf1 100644 --- a/reactos/ntoskrnl/ex/init.c +++ b/reactos/ntoskrnl/ex/init.c @@ -1853,7 +1853,7 @@ Phase1InitializationDiscard(IN PVOID Context) { /* Write the safe boot type */ RtlInitUnicodeString(&KeyName, L"OptionValue"); - NtSetValueKey(OptionHandle, + ZwSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, @@ -1866,7 +1866,7 @@ Phase1InitializationDiscard(IN PVOID Context) /* Remember this for later */ Disposition = TRUE; RtlInitUnicodeString(&KeyName, L"UseAlternateShell"); - NtSetValueKey(OptionHandle, + ZwSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, diff --git a/reactos/ntoskrnl/io/iomgr/bootlog.c b/reactos/ntoskrnl/io/iomgr/bootlog.c index bb2d8adfbd1..8fb20b81c5d 100644 --- a/reactos/ntoskrnl/io/iomgr/bootlog.c +++ b/reactos/ntoskrnl/io/iomgr/bootlog.c @@ -135,7 +135,7 @@ IopBootLog(PUNICODE_STRING DriverName, if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } else { From 92e130d1cc204e322fec41d325ed4c38d10e6572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Tue, 8 Jul 2014 22:44:44 +0000 Subject: [PATCH 44/75] [SETUPAPI_APITEST] - Try restoring UTF8 character which got lost in translation. svn path=/trunk/; revision=63701 --- rostests/apitests/setupapi/devclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rostests/apitests/setupapi/devclass.c b/rostests/apitests/setupapi/devclass.c index 17491f6c3ed..35ef17a81e2 100644 --- a/rostests/apitests/setupapi/devclass.c +++ b/rostests/apitests/setupapi/devclass.c @@ -1,7 +1,7 @@ /* * SetupAPI device class-related functions tests * - * Copyright 2006 Herv� Poussineau + * Copyright 2006 Hervé Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public Licence as From 62ae426e15fddadc0fdded71dccac55cdd5da0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Thu, 10 Jul 2014 09:05:37 +0000 Subject: [PATCH 45/75] [NTOSKRNL] - Partial revert of r63700 on Alex's request - This cancels the "Use ZwSetValueKey" instead of NtSetValueKey" part Oddly enough, it doesn't cause a problem anymore. I must have messed up in my initial testings svn path=/trunk/; revision=63705 --- reactos/ntoskrnl/config/cmconfig.c | 6 +++--- reactos/ntoskrnl/config/cmsysini.c | 23 +++++++++++----------- reactos/ntoskrnl/config/i386/cmhardwr.c | 22 ++++++++++----------- reactos/ntoskrnl/config/powerpc/cmhardwr.c | 22 ++++++++++----------- reactos/ntoskrnl/ex/init.c | 4 ++-- reactos/ntoskrnl/io/iomgr/bootlog.c | 2 +- 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/reactos/ntoskrnl/config/cmconfig.c b/reactos/ntoskrnl/config/cmconfig.c index 95ddcbe6802..a0f66ac9a7a 100644 --- a/reactos/ntoskrnl/config/cmconfig.c +++ b/reactos/ntoskrnl/config/cmconfig.c @@ -97,7 +97,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, /* Setup the component information key */ RtlInitUnicodeString(&ValueName, L"Component Information"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -124,7 +124,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, if (NT_SUCCESS(Status)) { /* Save the identifier in the registry */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -178,7 +178,7 @@ CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, CmpConfigurationData->BusNumber = BusNumber; /* Save the actual data */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_FULL_RESOURCE_DESCRIPTOR, diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c index 954e3488715..f41d27b042c 100644 --- a/reactos/ntoskrnl/config/cmsysini.c +++ b/reactos/ntoskrnl/config/cmsysini.c @@ -416,7 +416,7 @@ CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Key opened, now write to the key */ RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -427,7 +427,7 @@ CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Setup value name for system boot device in ARC format */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -474,7 +474,7 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ @@ -488,17 +488,16 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateKey(&KeyHandle, + Status = NtCreateKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, &Disposition); - if (!NT_SUCCESS(Status)) - return Status; + if (!NT_SUCCESS(Status)) return Status; - /* We don't need the handle */ + /* Don't need the handle */ ZwClose(KeyHandle); /* Use hard-coded setting */ @@ -534,7 +533,7 @@ UseSet: OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateKey(&KeyHandle, + Status = NtCreateKey(&KeyHandle, KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -558,7 +557,7 @@ UseSet: Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); /* Set the value */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -573,7 +572,7 @@ UseSet: KeyHandle, NULL); Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); - ZwClose(KeyHandle); + NtClose(KeyHandle); /* Check if we don't have one */ if (!NT_SUCCESS(Status)) @@ -690,7 +689,7 @@ UseSet: ASSERT(STATUS_SUCCESS == Status); /* Set it */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -2181,7 +2180,7 @@ CmpSetVersionData(VOID) RtlInitUnicodeString(&ValueData, Buffer); - ZwSetValueKey(CurrentVersionKeyHandle, + NtSetValueKey(CurrentVersionKeyHandle, &ValueName, 0, REG_SZ, diff --git a/reactos/ntoskrnl/config/i386/cmhardwr.c b/reactos/ntoskrnl/config/i386/cmhardwr.c index 1da455763af..cb8d7e8938d 100644 --- a/reactos/ntoskrnl/config/i386/cmhardwr.c +++ b/reactos/ntoskrnl/config/i386/cmhardwr.c @@ -268,7 +268,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - ZwSetValueKey(KeyHandle, + NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -463,7 +463,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -486,7 +486,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -502,7 +502,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -515,7 +515,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -528,7 +528,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -621,7 +621,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -643,7 +643,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = ZwSetValueKey(BiosHandle, + Status = NtSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -703,7 +703,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -746,7 +746,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -801,7 +801,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, diff --git a/reactos/ntoskrnl/config/powerpc/cmhardwr.c b/reactos/ntoskrnl/config/powerpc/cmhardwr.c index 84b7d912630..f034f537433 100644 --- a/reactos/ntoskrnl/config/powerpc/cmhardwr.c +++ b/reactos/ntoskrnl/config/powerpc/cmhardwr.c @@ -267,7 +267,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - ZwSetValueKey(KeyHandle, + NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -465,7 +465,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -488,7 +488,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -504,7 +504,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -517,7 +517,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -530,7 +530,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -623,7 +623,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -645,7 +645,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = ZwSetValueKey(BiosHandle, + Status = NtSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -705,7 +705,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -749,7 +749,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -804,7 +804,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c index 519f8400bf1..04f8e785d10 100644 --- a/reactos/ntoskrnl/ex/init.c +++ b/reactos/ntoskrnl/ex/init.c @@ -1853,7 +1853,7 @@ Phase1InitializationDiscard(IN PVOID Context) { /* Write the safe boot type */ RtlInitUnicodeString(&KeyName, L"OptionValue"); - ZwSetValueKey(OptionHandle, + NtSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, @@ -1866,7 +1866,7 @@ Phase1InitializationDiscard(IN PVOID Context) /* Remember this for later */ Disposition = TRUE; RtlInitUnicodeString(&KeyName, L"UseAlternateShell"); - ZwSetValueKey(OptionHandle, + NtSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, diff --git a/reactos/ntoskrnl/io/iomgr/bootlog.c b/reactos/ntoskrnl/io/iomgr/bootlog.c index 8fb20b81c5d..bb2d8adfbd1 100644 --- a/reactos/ntoskrnl/io/iomgr/bootlog.c +++ b/reactos/ntoskrnl/io/iomgr/bootlog.c @@ -135,7 +135,7 @@ IopBootLog(PUNICODE_STRING DriverName, if (!NT_SUCCESS(Status)) { - DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); } else { From 642d03e08b41f37545d637fb4436f4a342eec966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Thu, 10 Jul 2014 09:05:43 +0000 Subject: [PATCH 46/75] [APPWIZ] - Expand the registry entry when installing gecko package from disk. Now unattended setup can really be unattended. svn path=/trunk/; revision=63706 --- reactos/dll/cpl/appwiz/addons.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/reactos/dll/cpl/appwiz/addons.c b/reactos/dll/cpl/appwiz/addons.c index e103bc5e7df..fa728cd72c9 100644 --- a/reactos/dll/cpl/appwiz/addons.c +++ b/reactos/dll/cpl/appwiz/addons.c @@ -214,6 +214,18 @@ static enum install_res install_from_registered_dir(void) return INSTALL_FAILED; } + if (type == REG_EXPAND_SZ) + { + size = ExpandEnvironmentStringsA(package_dir, NULL, 0); + if (size) + { + char* buf = heap_alloc(size + sizeof(addon->file_name)); + ExpandEnvironmentStringsA(package_dir, buf, size); + heap_free(package_dir); + package_dir = buf; + } + } + TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); ret = install_from_unix_file(package_dir, "", addon->file_name); From 970a537191d4b6534bd6922b0972a4c16a4d41a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Thu, 10 Jul 2014 09:43:30 +0000 Subject: [PATCH 47/75] [NTOS/CM] - Fix overzealous check svn path=/trunk/; revision=63707 --- reactos/ntoskrnl/config/ntapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/ntoskrnl/config/ntapi.c b/reactos/ntoskrnl/config/ntapi.c index bc89d22c4d7..d70eec131e4 100644 --- a/reactos/ntoskrnl/config/ntapi.c +++ b/reactos/ntoskrnl/config/ntapi.c @@ -625,8 +625,8 @@ NtSetValueKey(IN HANDLE KeyHandle, PreviousMode = ExGetPreviousMode(); - if (Data && !DataSize) - return STATUS_INVALID_PARAMETER; + if (!DataSize) + Data = NULL; /* Probe and copy the data */ if ((PreviousMode != KernelMode) && Data) From f6cabeaa54a0defe78ff2bbe587209c1de862119 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 13 Jul 2014 07:38:49 +0000 Subject: [PATCH 48/75] [NETSHELL] Add code to rename network conections. svn path=/trunk/; revision=63712 --- reactos/dll/win32/netshell/connectmanager.cpp | 40 ++++++++++++++++++- .../dll/win32/netshell/shfldr_netconnect.cpp | 11 ++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/netshell/connectmanager.cpp b/reactos/dll/win32/netshell/connectmanager.cpp index c43624e6337..7d94c38707a 100644 --- a/reactos/dll/win32/netshell/connectmanager.cpp +++ b/reactos/dll/win32/netshell/connectmanager.cpp @@ -329,7 +329,45 @@ HRESULT WINAPI CNetConnection::Rename(LPCWSTR pszwDuplicateName) { - return E_NOTIMPL; + WCHAR szName[140]; + LPOLESTR pStr; + DWORD dwSize; + HKEY hKey; + HRESULT hr; + + if (pszwDuplicateName == NULL || wcslen(pszwDuplicateName) == 0) + return S_OK; + + if (Props.pszwName) + { + CoTaskMemFree(Props.pszwName); + Props.pszwName = NULL; + } + + dwSize = (wcslen(pszwDuplicateName) + 1) * sizeof(WCHAR); + Props.pszwName = (LPWSTR)CoTaskMemAlloc(dwSize); + if (Props.pszwName == NULL) + return E_OUTOFMEMORY; + + wcscpy(Props.pszwName, pszwDuplicateName); + + hr = StringFromCLSID((CLSID)Props.guidId, &pStr); + if (SUCCEEDED(hr)) + { + wcscpy(szName, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"); + wcscat(szName, pStr); + wcscat(szName, L"\\Connection"); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, L"Name", NULL, REG_SZ, (LPBYTE)Props.pszwName, dwSize); + RegCloseKey(hKey); + } + + CoTaskMemFree(pStr); + } + + return hr; } HRESULT WINAPI IConnection_Constructor(INetConnection **ppv, PINetConnectionItem pItem) diff --git a/reactos/dll/win32/netshell/shfldr_netconnect.cpp b/reactos/dll/win32/netshell/shfldr_netconnect.cpp index c7630ee73be..2b2ef65ae4c 100644 --- a/reactos/dll/win32/netshell/shfldr_netconnect.cpp +++ b/reactos/dll/win32/netshell/shfldr_netconnect.cpp @@ -522,7 +522,16 @@ HRESULT WINAPI CNetworkConnections::SetNameOf ( HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { - return E_NOTIMPL; + VALUEStruct * val; + + val = _ILGetValueStruct(pidl); + if (!val) + return E_FAIL; + + if (!val->pItem) + return E_FAIL; + + return val->pItem->Rename(lpName); } HRESULT WINAPI CNetworkConnections::GetDefaultSearchGUID(GUID * pguid) From 3a88ebcae311fa4427978b433d348fdb24f82035 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 13 Jul 2014 16:40:44 +0000 Subject: [PATCH 49/75] [BOOTDATA] Add / enable NLS settings for Arabic, Azeri, Kyrgyz, Latvian, Tatar and Uzbek. CORE-8348 #resolve svn path=/trunk/; revision=63713 --- reactos/boot/bootdata/hivesys.inf | 58 ++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf index eb5b08dfc60..eb6190c3fa9 100644 --- a/reactos/boot/bootdata/hivesys.inf +++ b/reactos/boot/bootdata/hivesys.inf @@ -882,6 +882,23 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","950",2,"FA40 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","Unicode",2,"E000-F8FF" ; NLS Language settings +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","4001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0401",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0402",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0404",0x00000000,"l_intl.nls" @@ -971,8 +988,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0427",0x00000000,"l_intl.n ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0429",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042a",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042b",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042c",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","082c",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042c",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","082c",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042d",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042f",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0436",0x00000000,"l_intl.nls" @@ -982,10 +999,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0439",0x00000000,"l_intl.n HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","083e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0441",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0843",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0444",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0445",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0455",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0456",0x00000000,"l_intl.nls" @@ -998,6 +1016,22 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","InstallLanguage",0x0000000 ; If you add/uncomment an entry here, please also add the appropriate Language ; in the previous section. HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00004001",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000403",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000404",0x00000000,"9" @@ -1083,8 +1117,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042a",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042b",0x00000000,"11" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042c",0x00000000,"6" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000082c",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042c",0x00000000,"6" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042f",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000436",0x00000000,"1" @@ -1094,10 +1128,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000083e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000441",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000843",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000444",0x00000000,"5" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000445",0x00000000,"f" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000455",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000456",0x00000000,"1" @@ -1287,6 +1322,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\Software",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\System",,0x00000012 + ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" @@ -1963,7 +2003,7 @@ HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Partition1" HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+sam,+netapi32,+msports,+devmgr" ; Winsrv configuration HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl",,0x00000012 From 404855f50af15b6d03de36201242a9b99d7fc869 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 13 Jul 2014 18:33:40 +0000 Subject: [PATCH 50/75] [BOOTDATA] Revert accidentially committed changes from r63713. svn path=/trunk/; revision=63714 --- reactos/boot/bootdata/hivesys.inf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf index eb6190c3fa9..527c077e2ec 100644 --- a/reactos/boot/bootdata/hivesys.inf +++ b/reactos/boot/bootdata/hivesys.inf @@ -1322,11 +1322,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\Software",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\System",,0x00000012 - ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" @@ -2003,7 +1998,7 @@ HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Partition1" HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+sam,+netapi32,+msports,+devmgr" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" ; Winsrv configuration HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl",,0x00000012 From 32e6eed760777dcc1023ea4240d3c72101433aca Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 15 Jul 2014 21:34:12 +0000 Subject: [PATCH 51/75] [USETUP] Reimplement SetupCreateDirectory in such a way, that a full directory path will be created, if needed. This enables us to install ReactOS in a sub-directory like for example '\OS\Test\Alpha\ReactOS'. svn path=/trunk/; revision=63715 --- reactos/base/setup/usetup/filesup.c | 108 +++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/reactos/base/setup/usetup/filesup.c b/reactos/base/setup/usetup/filesup.c index eaabc3d479f..2fe323a5497 100644 --- a/reactos/base/setup/usetup/filesup.c +++ b/reactos/base/setup/usetup/filesup.c @@ -37,8 +37,9 @@ static BOOLEAN HasCurrentCabinet = FALSE; static WCHAR CurrentCabinetName[MAX_PATH]; static CAB_SEARCH Search; +static NTSTATUS -SetupCreateDirectory( +SetupCreateSingleDirectory( PWCHAR DirectoryName) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -92,6 +93,111 @@ SetupCreateDirectory( } +static +BOOLEAN +DoesPathExist( + PWSTR PathName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + PathName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + NtClose(FileHandle); + + return TRUE; +} + + +NTSTATUS +SetupCreateDirectory( + PWCHAR PathName) +{ + PWCHAR PathBuffer = NULL; + PWCHAR Ptr, EndPtr; + ULONG BackslashCount; + ULONG Size; + NTSTATUS Status = STATUS_SUCCESS; + + Size = (wcslen(PathName) + 1) * sizeof(WCHAR); + PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Size); + if (PathBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + wcscpy(PathBuffer, PathName); + EndPtr = PathBuffer + wcslen(PathName); + + Ptr = PathBuffer; + + /* Skip the '\Device\HarddiskX\PartitionY\ part */ + BackslashCount = 0; + while (Ptr < EndPtr && BackslashCount < 4) + { + if (*Ptr == L'\\') + BackslashCount++; + + Ptr++; + } + + while (Ptr < EndPtr) + { + if (*Ptr == L'\\') + { + *Ptr = 0; + + DPRINT("PathBuffer: %S\n", PathBuffer); + if (!DoesPathExist(PathBuffer)) + { + DPRINT("Create: %S\n", PathBuffer); + Status = SetupCreateSingleDirectory(PathBuffer); + if (!NT_SUCCESS(Status)) + goto done; + } + + *Ptr = L'\\'; + } + + Ptr++; + } + + if (!DoesPathExist(PathBuffer)) + { + DPRINT("Create: %S\n", PathBuffer); + Status = SetupCreateSingleDirectory(PathBuffer); + if (!NT_SUCCESS(Status)) + goto done; + } + +done: + DPRINT("Done.\n"); + if (PathBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + + return Status; +} + + NTSTATUS SetupCopyFile( PWCHAR SourceFileName, From 7a9eb48cd8d9a1105d3c70a8ced2b0851dedfb4b Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Wed, 16 Jul 2014 19:43:23 +0000 Subject: [PATCH 52/75] [USETUP] Create additional install directories. Patch by Lee Schroeder. Thanks a lot! CORE-7987 #resolve #comment Fixed in r63716. svn path=/trunk/; revision=63716 --- reactos/boot/bootdata/packages/reactos.dff.in | 22 ++++++++++ reactos/cmake/CMakeMacros.cmake | 44 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/reactos/boot/bootdata/packages/reactos.dff.in b/reactos/boot/bootdata/packages/reactos.dff.in index 78e13f332b8..a92440080f7 100644 --- a/reactos/boot/bootdata/packages/reactos.dff.in +++ b/reactos/boot/bootdata/packages/reactos.dff.in @@ -32,6 +32,28 @@ Signature = "$ReactOS$" 16 = Resources\Themes 17 = system32\wbem 18 = Resources\Themes\Lautus +19 = Help +20 = Config +21 = Cursors +22 = system32\ShellExt +23 = Temp +24 = system32\spool +25 = system32\spool\drivers +26 = system32\spool\drivers\color +27 = system32\spool\drivers\w32x86 +28 = system32\spool\drivers\w32x86\3 +29 = system32\spool\prtprocs +30 = system32\spool\prtprocs\w32x86 +31 = system32\wbem\Repository +32 = system32\wbem\Repository\FS +33 = system32\wbem\mof\good +34 = system32\wbem\mof\bad +35 = system32\wbem\AdStatus +36 = system32\wbem\xml +37 = system32\wbem\Logs +38 = system32\wbem\AutoRecover +39 = twain_32 +40 = repair .InfEnd diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake index 8fa75941c83..0f34c2212ed 100644 --- a/reactos/cmake/CMakeMacros.cmake +++ b/reactos/cmake/CMakeMacros.cmake @@ -191,6 +191,50 @@ macro(dir_to_num dir var) set(${var} 17) elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus) set(${var} 18) + elseif(${dir} STREQUAL reactos/Help) + set(${var} 19) + elseif(${dir} STREQUAL reactos/Config) + set(${var} 20) + elseif(${dir} STREQUAL reactos/Cursors) + set(${var} 21) + elseif(${dir} STREQUAL reactos/system32/ShellExt) + set(${var} 22) + elseif(${dir} STREQUAL reactos/Temp) + set(${var} 23) + elseif(${dir} STREQUAL reactos/system32/spool) + set(${var} 24) + elseif(${dir} STREQUAL reactos/system32/spool/drivers) + set(${var} 25) + elseif(${dir} STREQUAL reactos/system32/spool/drivers/color) + set(${var} 26) + elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86) + set(${var} 27) + elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86/3) + set(${var} 28) + elseif(${dir} STREQUAL reactos/system32/spool/prtprocs) + set(${var} 29) + elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86) + set(${var} 30) + elseif(${dir} STREQUAL reactos/system32/wbem/Repository) + set(${var} 31) + elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS) + set(${var} 32) + elseif(${dir} STREQUAL reactos/system32/wbem/mof/good) + set(${var} 33) + elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad) + set(${var} 34) + elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus) + set(${var} 35) + elseif(${dir} STREQUAL reactos/system32/wbem/xml) + set(${var} 36) + elseif(${dir} STREQUAL reactos/system32/wbem/Logs) + set(${var} 37) + elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover) + set(${var} 38) + elseif(${dir} STREQUAL reactos/twain_32) + set(${var} 39) + elseif(${dir} STREQUAL reactos/repair) + set(${var} 40) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif() From 80c4c0200f41660bfe21ab48c426e6611d264902 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Fri, 18 Jul 2014 04:09:24 +0000 Subject: [PATCH 53/75] [BOOTDATA] Create additional install directories. Patch by Lee Schroeder. Thank you for updating the directory list! CORE-8365 #resolve svn path=/trunk/; revision=63717 --- reactos/boot/bootdata/packages/reactos.dff.in | 32 +++++++++----- reactos/cmake/CMakeMacros.cmake | 44 ++++++++++++++----- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/reactos/boot/bootdata/packages/reactos.dff.in b/reactos/boot/bootdata/packages/reactos.dff.in index a92440080f7..5a7ff4898b1 100644 --- a/reactos/boot/bootdata/packages/reactos.dff.in +++ b/reactos/boot/bootdata/packages/reactos.dff.in @@ -44,16 +44,28 @@ Signature = "$ReactOS$" 28 = system32\spool\drivers\w32x86\3 29 = system32\spool\prtprocs 30 = system32\spool\prtprocs\w32x86 -31 = system32\wbem\Repository -32 = system32\wbem\Repository\FS -33 = system32\wbem\mof\good -34 = system32\wbem\mof\bad -35 = system32\wbem\AdStatus -36 = system32\wbem\xml -37 = system32\wbem\Logs -38 = system32\wbem\AutoRecover -39 = twain_32 -40 = repair +31 = system32\spool\PRINTERS +32 = system32\wbem\Repository +33 = system32\wbem\Repository\FS +34 = system32\wbem\mof\good +35 = system32\wbem\mof\bad +36 = system32\wbem\AdStatus +37 = system32\wbem\xml +38 = system32\wbem\Logs +39 = system32\wbem\AutoRecover +40 = system32\wbem\snmp +41 = system32\wbem\Performance +42 = twain_32 +43 = repair +44 = Web +45 = Web\Wallpaper +46 = Prefetch +47 = security +48 = security\Database +49 = security\logs +50 = security\templates +51 = system32\CatRoot +52 = system32\CatRoot2 .InfEnd diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake index 0f34c2212ed..54e918bdc08 100644 --- a/reactos/cmake/CMakeMacros.cmake +++ b/reactos/cmake/CMakeMacros.cmake @@ -215,26 +215,50 @@ macro(dir_to_num dir var) set(${var} 29) elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86) set(${var} 30) - elseif(${dir} STREQUAL reactos/system32/wbem/Repository) + elseif(${dir} STREQUAL reactos/system32/spool/PRINTERS) set(${var} 31) - elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS) + elseif(${dir} STREQUAL reactos/system32/wbem/Repository) set(${var} 32) - elseif(${dir} STREQUAL reactos/system32/wbem/mof/good) + elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS) set(${var} 33) - elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad) + elseif(${dir} STREQUAL reactos/system32/wbem/mof/good) set(${var} 34) - elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus) + elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad) set(${var} 35) - elseif(${dir} STREQUAL reactos/system32/wbem/xml) + elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus) set(${var} 36) - elseif(${dir} STREQUAL reactos/system32/wbem/Logs) + elseif(${dir} STREQUAL reactos/system32/wbem/xml) set(${var} 37) - elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover) + elseif(${dir} STREQUAL reactos/system32/wbem/Logs) set(${var} 38) - elseif(${dir} STREQUAL reactos/twain_32) + elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover) set(${var} 39) - elseif(${dir} STREQUAL reactos/repair) + elseif(${dir} STREQUAL reactos/system32/wbem/snmp) set(${var} 40) + elseif(${dir} STREQUAL reactos/system32/wbem/Performance) + set(${var} 41) + elseif(${dir} STREQUAL reactos/twain_32) + set(${var} 42) + elseif(${dir} STREQUAL reactos/repair) + set(${var} 43) + elseif(${dir} STREQUAL reactos/Web) + set(${var} 44) + elseif(${dir} STREQUAL reactos/Web/Wallpaper) + set(${var} 45) + elseif(${dir} STREQUAL reactos/Prefetch) + set(${var} 46) + elseif(${dir} STREQUAL reactos/security) + set(${var} 47) + elseif(${dir} STREQUAL reactos/security/Database) + set(${var} 48) + elseif(${dir} STREQUAL reactos/security/logs) + set(${var} 49) + elseif(${dir} STREQUAL reactos/security/templates) + set(${var} 50) + elseif(${dir} STREQUAL reactos/system32/CatRoot) + set(${var} 51) + elseif(${dir} STREQUAL reactos/system32/CatRoot2) + set(${var} 52) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif() From 2fd11216b035191e6d31ab9c0a9b93cdcb933b68 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 18 Jul 2014 10:59:32 +0000 Subject: [PATCH 54/75] [MSHTML_WINETEST] - Enable htmllocation test again ROSTESTS-81 svn path=/trunk/; revision=63718 --- rostests/winetests/mshtml/htmllocation.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rostests/winetests/mshtml/htmllocation.c b/rostests/winetests/mshtml/htmllocation.c index 88da3d35ef8..8bf5517dd5b 100644 --- a/rostests/winetests/mshtml/htmllocation.c +++ b/rostests/winetests/mshtml/htmllocation.c @@ -21,8 +21,6 @@ #include -#if ROSTESTS_81_IS_FIXED - #include "mshtml.h" #include "wininet.h" @@ -370,11 +368,9 @@ static void perform_test(const struct location_test* test) IMoniker_Release(url_mon); IBindCtx_Release(bc); } -#endif /* ROSTESTS_81_IS_FIXED */ START_TEST(htmllocation) { -#if ROSTESTS_81_IS_FIXED int i; CoInitialize(NULL); @@ -383,5 +379,4 @@ START_TEST(htmllocation) perform_test(location_tests+i); CoUninitialize(); -#endif /* ROSTESTS_81_IS_FIXED */ } From 16e23a8b752d7c610f1dee77259116e765bf01d8 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 18 Jul 2014 16:44:16 +0000 Subject: [PATCH 55/75] [SERVICES] - Use asynchronous I/O to correctly catch timeouts -- we have a reliable NPFS now. This makes the timeout test in advapi32_winetest:service succeed, however I'm leaving it disabled because it takes two minutes to run (due to... timeouts). ROSTESTS-56 svn path=/trunk/; revision=63719 --- reactos/base/system/services/database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/base/system/services/database.c b/reactos/base/system/services/database.c index 39563d82db9..5f3749694ab 100644 --- a/reactos/base/system/services/database.c +++ b/reactos/base/system/services/database.c @@ -29,7 +29,7 @@ * Uncomment the line below to use asynchronous IO operations * on the service control pipes. */ -// #define USE_ASYNCHRONOUS_IO +#define USE_ASYNCHRONOUS_IO /* GLOBALS *******************************************************************/ From 6be6b3b4d41810140438c2b4bea96654fe0bdc26 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 18 Jul 2014 17:47:43 +0000 Subject: [PATCH 56/75] [SERVICES] - Silence some debug prints svn path=/trunk/; revision=63720 --- reactos/base/system/services/database.c | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/reactos/base/system/services/database.c b/reactos/base/system/services/database.c index 5f3749694ab..e4202a7c856 100644 --- a/reactos/base/system/services/database.c +++ b/reactos/base/system/services/database.c @@ -936,16 +936,16 @@ ScmControlService(PSERVICE Service, &Overlapped); if (bResult == FALSE) { - DPRINT1("WriteFile() returned FALSE\n"); + DPRINT("WriteFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -990,16 +990,16 @@ ScmControlService(PSERVICE Service, &Overlapped); if (bResult == FALSE) { - DPRINT1("ReadFile() returned FALSE\n"); + DPRINT("ReadFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -1187,16 +1187,16 @@ ScmSendStartCommand(PSERVICE Service, &Overlapped); if (bResult == FALSE) { - DPRINT1("WriteFile() returned FALSE\n"); + DPRINT("WriteFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -1241,16 +1241,16 @@ ScmSendStartCommand(PSERVICE Service, &Overlapped); if (bResult == FALSE) { - DPRINT1("ReadFile() returned FALSE\n"); + DPRINT("ReadFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -1457,7 +1457,7 @@ ScmWaitForServiceConnect(PSERVICE Service) } } - DPRINT1("ScmWaitForServiceConnect() done\n"); + DPRINT("ScmWaitForServiceConnect() done\n"); return ERROR_SUCCESS; #else From 5884949d3203dc09f6f301e547331b65c38bde88 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 19 Jul 2014 17:48:46 +0000 Subject: [PATCH 57/75] [DISK] - Fix memory leak in CreatePartitionDeviceObjects svn path=/trunk/; revision=63721 --- reactos/drivers/storage/class/disk/disk.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/reactos/drivers/storage/class/disk/disk.c b/reactos/drivers/storage/class/disk/disk.c index fd3a47594b6..57428524f67 100644 --- a/reactos/drivers/storage/class/disk/disk.c +++ b/reactos/drivers/storage/class/disk/disk.c @@ -1183,7 +1183,7 @@ CreatePartitionDeviceObjects( // Allocate and zero a partition list. // - partitionList = ExAllocatePool(NonPagedPool, sizeof(*partitionList )); + partitionList = ExAllocatePool(NonPagedPool, sizeof(*partitionList)); if (partitionList != NULL) { @@ -1446,6 +1446,10 @@ CreatePartitionDeviceObjects( ExFreePool(partitionList); + if (dmSkew) { + ExFreePool(dmSkew); + } + } else { CreatePartitionDeviceObjectsExit: @@ -1457,6 +1461,10 @@ CreatePartitionDeviceObjectsExit: ExFreePool(initData); } + if (dmSkew) { + ExFreePool(dmSkew); + } + return status; } // end if...else @@ -1909,7 +1917,7 @@ Return Value: case EXECUTE_OFFLINE_DIAGS: controlCode = IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS; break; - + default: status = STATUS_INVALID_PARAMETER; break; @@ -2090,13 +2098,13 @@ Return Value: RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, deviceExtension->DiskGeometry, (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? - sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY) : sizeof(DISK_GEOMETRY_EX)); status = STATUS_SUCCESS; Irp->IoStatus.Information = (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? - sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY) : sizeof(DISK_GEOMETRY_EX); } From 5a8c0d9fc18a40bfca2991136805e08f0f10b5e8 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 19 Jul 2014 17:50:56 +0000 Subject: [PATCH 58/75] [NTOS:FSTUB] - Make sure to NULL the return pointer in the failure case of xHalIoReadPartitionTable. CORE-8359 svn path=/trunk/; revision=63722 --- reactos/ntoskrnl/fstub/disksup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/reactos/ntoskrnl/fstub/disksup.c b/reactos/ntoskrnl/fstub/disksup.c index 86a7e0ad6b0..f5aeb4192f1 100644 --- a/reactos/ntoskrnl/fstub/disksup.c +++ b/reactos/ntoskrnl/fstub/disksup.c @@ -1787,7 +1787,11 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, /* Free the buffer and check for success */ if (Buffer) ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); - if (!NT_SUCCESS(Status)) ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); + *PartitionBuffer = NULL; + } /* Return status */ return Status; From 737295142c9e335af801259610e504330a4fa2ba Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 20 Jul 2014 07:19:42 +0000 Subject: [PATCH 59/75] [SCSIPORT] ScsiPortLogError: Print the information that is to be logged. svn path=/trunk/; revision=63723 --- reactos/drivers/storage/scsiport/scsiport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c index 5c696620930..1671fc7c9a9 100644 --- a/reactos/drivers/storage/scsiport/scsiport.c +++ b/reactos/drivers/storage/scsiport/scsiport.c @@ -1840,6 +1840,8 @@ ScsiPortLogError(IN PVOID HwDeviceExtension, //PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; DPRINT1("ScsiPortLogError() called\n"); + DPRINT1("PathId: 0x%02x TargetId: 0x%02x Lun: 0x%02x ErrorCode: 0x%08lx UniqueId: 0x%08lx\n", + PathId, TargetId, Lun, ErrorCode, UniqueId); //DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, SCSI_PORT_DEVICE_EXTENSION, MiniPortDeviceExtension); From 18ad0bd56594abfb9d2dd2fbc33aa7aa3216cf56 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 20 Jul 2014 08:30:21 +0000 Subject: [PATCH 60/75] [WININET] - Apply Wine commit 8fd44a3d (wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind).) by Sebastian Lackner. Fixes crash in wininet:http InternetReadFile_test svn path=/trunk/; revision=63724 --- reactos/dll/win32/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/wininet/http.c b/reactos/dll/win32/wininet/http.c index 7e7bd33efab..e287abda03b 100644 --- a/reactos/dll/win32/wininet/http.c +++ b/reactos/dll/win32/wininet/http.c @@ -3568,12 +3568,12 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); - for (i=0; i Date: Sun, 20 Jul 2014 11:19:44 +0000 Subject: [PATCH 61/75] [WININET_WINETEST] - Add back work-around for testbot hang lost in winesync. ROSTESTS-73 svn path=/trunk/; revision=63725 --- rostests/winetests/wininet/http.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rostests/winetests/wininet/http.c b/rostests/winetests/wininet/http.c index b0481c799d6..bbffe27dac8 100644 --- a/rostests/winetests/wininet/http.c +++ b/rostests/winetests/wininet/http.c @@ -3143,7 +3143,11 @@ static void test_conn_close(int port) SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); +#ifdef ROSTESTS_73_FIXED WaitForSingleObject(hCompleteEvent, INFINITE); +#else /* ROSTESTS_73_FIXED */ + ok(WaitForSingleObject(hCompleteEvent, 5000) == WAIT_OBJECT_0, "Wait timed out\n"); +#endif /* ROSTESTS_73_FIXED */ ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); From 73304fbcaa7f9149592eadc250413a88d212cefc Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 23 Jul 2014 12:23:31 +0000 Subject: [PATCH 62/75] [PSDK] - Fix a typo in ntstatus.h svn path=/trunk/; revision=63726 --- reactos/include/psdk/ntstatus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/include/psdk/ntstatus.h b/reactos/include/psdk/ntstatus.h index bdbec1e6b38..6056374adaf 100644 --- a/reactos/include/psdk/ntstatus.h +++ b/reactos/include/psdk/ntstatus.h @@ -1181,7 +1181,7 @@ extern "C" { #define STATUS_SXS_MANIFEST_TOO_BIG ((NTSTATUS) 0xC0150022) #define STATUS_SXS_SETTING_NOT_REGISTERED ((NTSTATUS) 0xC0150023) #define STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE ((NTSTATUS) 0xC0150024) -#define STATUS_SXS_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) +#define STATUS_SMI_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027) From 022f198f1e9ab1534af6664ce25322ac112725b1 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 23 Jul 2014 12:46:47 +0000 Subject: [PATCH 63/75] [FORREALTHISTIME] - Apparently we got that typo from Wine. Fix build. Will send upstream. svn path=/trunk/; revision=63730 --- reactos/lib/rtl/error.c | 2 +- rostests/winetests/ntdll/error.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/lib/rtl/error.c b/reactos/lib/rtl/error.c index 1c5b5f21b9b..d2ba263eb3d 100644 --- a/reactos/lib/rtl/error.c +++ b/reactos/lib/rtl/error.c @@ -1523,7 +1523,7 @@ static const DWORD table_c0150001[39] = ERROR_SXS_MANIFEST_TOO_BIG, /* c0150022 (STATUS_SXS_MANIFEST_TOO_BIG) */ ERROR_SXS_SETTING_NOT_REGISTERED, /* c0150023 (STATUS_SXS_SETTING_NOT_REGISTERED) */ ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE, /* c0150024 (STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE) */ - ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SXS_PRIMITIVE_INSTALLER_FAILED) */ + ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SMI_PRIMITIVE_INSTALLER_FAILED) */ ERROR_GENERIC_COMMAND_FAILED, /* c0150026 (STATUS_GENERIC_COMMAND_FAILED) */ ERROR_SXS_FILE_HASH_MISSING /* c0150027 (STATUS_SXS_FILE_HASH_MISSING) */ }; diff --git a/rostests/winetests/ntdll/error.c b/rostests/winetests/ntdll/error.c index 862f0a96ff6..718b8c54c56 100755 --- a/rostests/winetests/ntdll/error.c +++ b/rostests/winetests/ntdll/error.c @@ -963,7 +963,7 @@ static void run_error_tests(void) cmp2(STATUS_SXS_MANIFEST_TOO_BIG, ERROR_SXS_MANIFEST_TOO_BIG); cmp2(STATUS_SXS_SETTING_NOT_REGISTERED, ERROR_SXS_SETTING_NOT_REGISTERED); cmp2(STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE, ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE); - cmp2(STATUS_SXS_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); + cmp2(STATUS_SMI_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); cmp2(STATUS_GENERIC_COMMAND_FAILED, ERROR_GENERIC_COMMAND_FAILED); cmp2(STATUS_SXS_FILE_HASH_MISSING, ERROR_SXS_FILE_HASH_MISSING); cmp2(STATUS_REDIRECTOR_STARTED, ERROR_SERVICE_ALREADY_RUNNING); From df7f9319c20c262b4ca2e7cadb11490f3b14cac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 23 Jul 2014 16:05:47 +0000 Subject: [PATCH 64/75] [WIN32K] - Correctly use the Clip, Meta, Rao, API and Vis Regions in DCs - Update the DC clipping object on demand each time a blt is performed - Reduce the number of region allocated with handles when it's not needed This commit fixes numerous bugs regarding clipping, most notably SetDIBitsToDevice overlapping foreground windows CORE-8353 #resolve #comment There are still a few quirks in winetests which will get fixed in a next commit CORE-7628 #comment should be fixed in rev 63731, please confirm. svn path=/trunk/; revision=63731 --- reactos/win32ss/gdi/ntgdi/arc.c | 6 +- reactos/win32ss/gdi/ntgdi/bitblt.c | 10 +- reactos/win32ss/gdi/ntgdi/cliprgn.c | 724 +++++++++---------- reactos/win32ss/gdi/ntgdi/cliprgn.h | 6 +- reactos/win32ss/gdi/ntgdi/dc.h | 7 +- reactos/win32ss/gdi/ntgdi/dclife.c | 159 ++-- reactos/win32ss/gdi/ntgdi/dcobjs.c | 41 +- reactos/win32ss/gdi/ntgdi/dcstate.c | 35 +- reactos/win32ss/gdi/ntgdi/dcutil.c | 2 +- reactos/win32ss/gdi/ntgdi/dibobj.c | 4 +- reactos/win32ss/gdi/ntgdi/fillshap.c | 45 +- reactos/win32ss/gdi/ntgdi/freetype.c | 6 +- reactos/win32ss/gdi/ntgdi/line.c | 5 +- reactos/win32ss/gdi/ntgdi/path.c | 9 +- reactos/win32ss/gdi/ntgdi/region.c | 68 +- reactos/win32ss/gdi/ntgdi/region.h | 1 + reactos/win32ss/user/ntuser/cursoricon.c | 4 +- reactos/win32ss/user/ntuser/cursoricon_new.c | 2 +- reactos/win32ss/user/ntuser/dce.h | 2 + reactos/win32ss/user/ntuser/windc.c | 88 ++- 20 files changed, 610 insertions(+), 614 deletions(-) diff --git a/reactos/win32ss/gdi/ntgdi/arc.c b/reactos/win32ss/gdi/ntgdi/arc.c index 0b6f421fbf8..5d65235fc45 100644 --- a/reactos/win32ss/gdi/ntgdi/arc.c +++ b/reactos/win32ss/gdi/ntgdi/arc.c @@ -335,8 +335,7 @@ NtGdiAngleArc( worker.l = dwStartAngle; worker1.l = dwSweepAngle; - DC_vPrepareDCsForBlit(pDC, pDC->rosdc.CombinedClip->rclBounds, - NULL, pDC->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(pDC, NULL, NULL, NULL); if (pDC->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(pDC); if (pDC->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) @@ -381,8 +380,7 @@ NtGdiArcInternal( return TRUE; } - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, - NULL, dc->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); diff --git a/reactos/win32ss/gdi/ntgdi/bitblt.c b/reactos/win32ss/gdi/ntgdi/bitblt.c index e27c5e239b3..7193d7723e0 100644 --- a/reactos/win32ss/gdi/ntgdi/bitblt.c +++ b/reactos/win32ss/gdi/ntgdi/bitblt.c @@ -107,7 +107,7 @@ NtGdiAlphaBlend( /* Prepare DCs for blit */ TRACE("Preparing DCs for blit\n"); - DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); + DC_vPrepareDCsForBlit(DCDest, &DestRect, DCSrc, &SourceRect); /* Determine surfaces to be used in the bitblt */ BitmapDest = DCDest->dclevel.pSurface; @@ -268,7 +268,7 @@ NtGdiTransparentBlt( rcSrc.bottom += DCSrc->ptlDCOrig.y; /* Prepare for blit */ - DC_vPrepareDCsForBlit(DCDest, rcDest, DCSrc, rcSrc); + DC_vPrepareDCsForBlit(DCDest, &rcDest, DCSrc, &rcSrc); BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) @@ -456,7 +456,7 @@ NtGdiMaskBlt( } /* Prepare blit */ - DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); + DC_vPrepareDCsForBlit(DCDest, &DestRect, DCSrc, &SourceRect); if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(DCDest); @@ -647,7 +647,7 @@ GreStretchBltMask( BrushOrigin.y = 0; /* Only prepare Source and Dest, hdcMask represents a DIB */ - DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); + DC_vPrepareDCsForBlit(DCDest, &DestRect, DCSrc, &SourceRect); if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(DCDest); @@ -826,7 +826,7 @@ IntPatBlt( BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y; #endif - DC_vPrepareDCsForBlit(pdc, DestRect, NULL, DestRect); + DC_vPrepareDCsForBlit(pdc, &DestRect, NULL, NULL); psurf = pdc->dclevel.pSurface; diff --git a/reactos/win32ss/gdi/ntgdi/cliprgn.c b/reactos/win32ss/gdi/ntgdi/cliprgn.c index a6dd20ee482..a5699ab19eb 100644 --- a/reactos/win32ss/gdi/ntgdi/cliprgn.c +++ b/reactos/win32ss/gdi/ntgdi/cliprgn.c @@ -11,164 +11,102 @@ #define NDEBUG #include -int FASTCALL -CLIPPING_UpdateGCRegion(DC* Dc) +VOID +FASTCALL +GdiSelectVisRgn( + HDC hdc, + PREGION prgn) { - PROSRGNDATA CombinedRegion; - //HRGN hRgnVis; - PREGION prgnClip, prgnGCClip; + DC *dc; - /* Would prefer this, but the rest of the code sucks... */ - //ASSERT(Dc->rosdc.hGCClipRgn); - //ASSERT(Dc->rosdc.hClipRgn); - ASSERT(Dc->prgnVis); - //hRgnVis = Dc->prgnVis->BaseObject.hHmgr; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return; + } - if (Dc->rosdc.hGCClipRgn == NULL) - Dc->rosdc.hGCClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); + dc->fs |= DC_FLAG_DIRTY_RAO; - prgnGCClip = REGION_LockRgn(Dc->rosdc.hGCClipRgn); - ASSERT(prgnGCClip); + ASSERT(dc->prgnVis != NULL); + ASSERT(prgn != NULL); - if (Dc->rosdc.hClipRgn == NULL) - IntGdiCombineRgn(prgnGCClip, Dc->prgnVis, NULL, RGN_COPY); - else - { - prgnClip = REGION_LockRgn(Dc->rosdc.hClipRgn); // FIXME: Locking order, ugh! - IntGdiCombineRgn(prgnGCClip, Dc->prgnVis, prgnClip, RGN_AND); - REGION_UnlockRgn(prgnClip); - } - REGION_UnlockRgn(prgnGCClip); - - NtGdiOffsetRgn(Dc->rosdc.hGCClipRgn, Dc->ptlDCOrig.x, Dc->ptlDCOrig.y); - - if((CombinedRegion = RGNOBJAPI_Lock(Dc->rosdc.hGCClipRgn, NULL))) - { - CLIPOBJ *CombinedClip; - - CombinedClip = IntEngCreateClipRegion(CombinedRegion->rdh.nCount, - CombinedRegion->Buffer, - &CombinedRegion->rdh.rcBound); - - RGNOBJAPI_Unlock(CombinedRegion); - - if ( !CombinedClip ) - { - DPRINT1("IntEngCreateClipRegion() failed\n"); - return ERROR; - } - - if(Dc->rosdc.CombinedClip != NULL) - IntEngDeleteClipRegion(Dc->rosdc.CombinedClip); - - Dc->rosdc.CombinedClip = CombinedClip ; - } - - return NtGdiOffsetRgn(Dc->rosdc.hGCClipRgn, -Dc->ptlDCOrig.x, -Dc->ptlDCOrig.y); -} - -INT FASTCALL -GdiSelectVisRgn(HDC hdc, HRGN hrgn) -{ - int retval; - DC *dc; - PREGION prgn; - - if (!hrgn) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return ERROR; - } - if (!(dc = DC_LockDc(hdc))) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; - } - - dc->fs &= ~DC_FLAG_DIRTY_RAO; - - ASSERT (dc->prgnVis != NULL); - - prgn = RGNOBJAPI_Lock(hrgn, NULL); - retval = prgn ? IntGdiCombineRgn(dc->prgnVis, prgn, NULL, RGN_COPY) : ERROR; - RGNOBJAPI_Unlock(prgn); - if ( retval != ERROR ) - { + IntGdiCombineRgn(dc->prgnVis, prgn, NULL, RGN_COPY); IntGdiOffsetRgn(dc->prgnVis, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y); - CLIPPING_UpdateGCRegion(dc); - } - DC_UnlockDc(dc); - return retval; + DC_UnlockDc(dc); } -int FASTCALL GdiExtSelectClipRgn(PDC dc, - HRGN hrgn, - int fnMode) +int +FASTCALL +IntGdiExtSelectClipRgn( + PDC dc, + PREGION prgn, + int fnMode) { - // dc->fs &= ~DC_FLAG_DIRTY_RAO; + if (!prgn) + { + if (fnMode == RGN_COPY) + { + if (dc->dclevel.prgnClip != NULL) + { + REGION_Delete(dc->dclevel.prgnClip); + dc->dclevel.prgnClip = NULL; + dc->fs |= DC_FLAG_DIRTY_RAO; + } + return SIMPLEREGION; + } + else + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return ERROR; + } + } - if (!hrgn) - { - if (fnMode == RGN_COPY) + if (!dc->dclevel.prgnClip) { - if (dc->rosdc.hClipRgn != NULL) - { - GreDeleteObject(dc->rosdc.hClipRgn); - dc->rosdc.hClipRgn = NULL; - } - } - else - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return ERROR; - } - } - else - { - if (!dc->rosdc.hClipRgn) - { - RECTL rect; - if(dc->prgnVis) - { + RECTL rect; + REGION_GetRgnBox(dc->prgnVis, &rect); - dc->rosdc.hClipRgn = IntSysCreateRectRgnIndirect(&rect); - } - else - { - dc->rosdc.hClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); - } + dc->dclevel.prgnClip = IntSysCreateRectpRgnIndirect(&rect); } - if(fnMode == RGN_COPY) - { - NtGdiCombineRgn(dc->rosdc.hClipRgn, hrgn, 0, fnMode); - } - else - NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, hrgn, fnMode); - } - return CLIPPING_UpdateGCRegion(dc); + dc->fs |= DC_FLAG_DIRTY_RAO; + + if(fnMode == RGN_COPY) + return IntGdiCombineRgn(dc->dclevel.prgnClip, prgn, 0, fnMode); + + return IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, prgn, fnMode); } -int APIENTRY NtGdiExtSelectClipRgn(HDC hDC, - HRGN hrgn, - int fnMode) +int +APIENTRY +NtGdiExtSelectClipRgn( + HDC hDC, + HRGN hrgn, + int fnMode) { - int retval; - DC *dc; + int retval; + DC *dc; + PREGION prgn; - if (!(dc = DC_LockDc(hDC))) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; - } + if (!(dc = DC_LockDc(hDC))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } - retval = GdiExtSelectClipRgn ( dc, hrgn, fnMode ); + prgn = REGION_LockRgn(hrgn); - DC_UnlockDc(dc); - return retval; + /* IntGdiExtSelectClipRgn takes care of checking for NULL region */ + retval = IntGdiExtSelectClipRgn(dc, prgn, fnMode); + + if (prgn) + REGION_UnlockRgn(prgn); + + DC_UnlockDc(dc); + return retval; } INT FASTCALL @@ -177,7 +115,6 @@ GdiGetClipBox(HDC hDC, PRECTL rc) INT retval; PDC dc; PROSRGNDATA pRgnNew, pRgn = NULL; - BOOL Unlock = FALSE; // Small HACK if (!(dc = DC_LockDc(hDC))) { @@ -193,10 +130,9 @@ GdiGetClipBox(HDC hDC, PRECTL rc) { pRgn = dc->dclevel.prgnMeta; } - else if (dc->rosdc.hClipRgn) + else if (dc->dclevel.prgnClip) // CLIPRGN { - Unlock = TRUE ; - pRgn = REGION_LockRgn(dc->rosdc.hClipRgn); // CLIPRGN + pRgn = dc->dclevel.prgnClip; } if (pRgn) @@ -206,7 +142,6 @@ GdiGetClipBox(HDC hDC, PRECTL rc) if (!pRgnNew) { DC_UnlockDc(dc); - if(Unlock) REGION_UnlockRgn(pRgn); return ERROR; } @@ -217,12 +152,11 @@ GdiGetClipBox(HDC hDC, PRECTL rc) REGION_Delete(pRgnNew); DC_UnlockDc(dc); - if(Unlock) REGION_UnlockRgn(pRgn); return retval; } retval = REGION_GetRgnBox(dc->prgnVis, rc); - IntDPtoLP(dc, (LPPOINT)rc, 2); + DC_UnlockDc(dc); return retval; @@ -265,53 +199,49 @@ int APIENTRY NtGdiExcludeClipRect(HDC hDC, int RightRect, int BottomRect) { - INT Result; - RECTL Rect; - PREGION prgnNew, prgnClip; - PDC dc = DC_LockDc(hDC); + INT Result; + RECTL Rect; + PREGION prgnNew; + PDC dc = DC_LockDc(hDC); - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; - } + if (!dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } - Rect.left = LeftRect; - Rect.top = TopRect; - Rect.right = RightRect; - Rect.bottom = BottomRect; + Rect.left = LeftRect; + Rect.top = TopRect; + Rect.right = RightRect; + Rect.bottom = BottomRect; - IntLPtoDP(dc, (LPPOINT)&Rect, 2); + IntLPtoDP(dc, (LPPOINT)&Rect, 2); - prgnNew = IntSysCreateRectpRgnIndirect(&Rect); - if (!prgnNew) - { - Result = ERROR; - } - else - { - if (!dc->rosdc.hClipRgn) - { - dc->rosdc.hClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); - prgnClip = REGION_LockRgn(dc->rosdc.hClipRgn); - IntGdiCombineRgn(prgnClip, dc->prgnVis, prgnNew, RGN_DIFF); - REGION_UnlockRgn(prgnClip); - Result = SIMPLEREGION; - } - else - { - prgnClip = REGION_LockRgn(dc->rosdc.hClipRgn); - Result = IntGdiCombineRgn(prgnClip, prgnClip, prgnNew, RGN_DIFF); - REGION_UnlockRgn(prgnClip); - } - REGION_Delete(prgnNew); - } - if (Result != ERROR) - CLIPPING_UpdateGCRegion(dc); + prgnNew = IntSysCreateRectpRgnIndirect(&Rect); + if (!prgnNew) + { + Result = ERROR; + } + else + { + if (!dc->dclevel.prgnClip) + { + dc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + IntGdiCombineRgn(dc->dclevel.prgnClip, dc->prgnVis, prgnNew, RGN_DIFF); + Result = SIMPLEREGION; + } + else + { + Result = IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, prgnNew, RGN_DIFF); + } + REGION_Delete(prgnNew); + } + if (Result != ERROR) + dc->fs |= DC_FLAG_DIRTY_RAO; - DC_UnlockDc(dc); + DC_UnlockDc(dc); - return Result; + return Result; } int APIENTRY NtGdiIntersectClipRect(HDC hDC, @@ -320,200 +250,191 @@ int APIENTRY NtGdiIntersectClipRect(HDC hDC, int RightRect, int BottomRect) { - INT Result; - RECTL Rect; - HRGN NewRgn; - PDC dc = DC_LockDc(hDC); + INT Result; + RECTL Rect; + PREGION pNewRgn; + PDC dc = DC_LockDc(hDC); - DPRINT("NtGdiIntersectClipRect(%p, %d,%d-%d,%d)\n", - hDC, LeftRect, TopRect, RightRect, BottomRect); + DPRINT("NtGdiIntersectClipRect(%p, %d,%d-%d,%d)\n", + hDC, LeftRect, TopRect, RightRect, BottomRect); - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; - } + if (!dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } - Rect.left = LeftRect; - Rect.top = TopRect; - Rect.right = RightRect; - Rect.bottom = BottomRect; + Rect.left = LeftRect; + Rect.top = TopRect; + Rect.right = RightRect; + Rect.bottom = BottomRect; - IntLPtoDP(dc, (LPPOINT)&Rect, 2); + IntLPtoDP(dc, (LPPOINT)&Rect, 2); - NewRgn = IntSysCreateRectRgnIndirect(&Rect); - if (!NewRgn) - { - Result = ERROR; - } - else if (!dc->rosdc.hClipRgn) - { - dc->rosdc.hClipRgn = NewRgn; - Result = SIMPLEREGION; - } - else - { - Result = NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, NewRgn, RGN_AND); - GreDeleteObject(NewRgn); - } - if (Result != ERROR) - CLIPPING_UpdateGCRegion(dc); + pNewRgn = IntSysCreateRectpRgnIndirect(&Rect); + if (!pNewRgn) + { + Result = ERROR; + } + else if (!dc->dclevel.prgnClip) + { + dc->dclevel.prgnClip = pNewRgn; + Result = SIMPLEREGION; + } + else + { + Result = IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, pNewRgn, RGN_AND); + REGION_Delete(pNewRgn); + } + if (Result != ERROR) + dc->fs |= DC_FLAG_DIRTY_RAO; - DC_UnlockDc(dc); + DC_UnlockDc(dc); - return Result; + return Result; } int APIENTRY NtGdiOffsetClipRgn(HDC hDC, int XOffset, int YOffset) { - INT Result; - DC *dc; + INT Result; + DC *dc; - if(!(dc = DC_LockDc(hDC))) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return ERROR; - } + if(!(dc = DC_LockDc(hDC))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } - if(dc->rosdc.hClipRgn != NULL) - { - Result = NtGdiOffsetRgn(dc->rosdc.hClipRgn, - XOffset, - YOffset); - CLIPPING_UpdateGCRegion(dc); - } - else - { - Result = NULLREGION; - } + if(dc->dclevel.prgnClip != NULL) + { + Result = IntGdiOffsetRgn(dc->dclevel.prgnClip, + XOffset, + YOffset); + dc->fs |= DC_FLAG_DIRTY_RAO; + } + else + { + Result = NULLREGION; + } - DC_UnlockDc(dc); - return Result; + DC_UnlockDc(dc); + return Result; } BOOL APIENTRY NtGdiPtVisible(HDC hDC, int X, int Y) { - HRGN rgn; - DC *dc; + BOOL ret = FALSE; + PDC dc; - if(!(dc = DC_LockDc(hDC))) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } + if(!(dc = DC_LockDc(hDC))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } - rgn = dc->rosdc.hGCClipRgn; - DC_UnlockDc(dc); + if (dc->prgnRao) + { + POINT pt = {X, Y}; + IntLPtoDP(dc, &pt, 1); + ret = REGION_PtInRegion(dc->prgnRao, pt.x, pt.y); + } - return (rgn ? NtGdiPtInRegion(rgn, X, Y) : FALSE); + DC_UnlockDc(dc); + + return ret; } -BOOL APIENTRY NtGdiRectVisible(HDC hDC, - LPRECT UnsafeRect) +BOOL +APIENTRY +NtGdiRectVisible( + HDC hDC, + LPRECT UnsafeRect) { - NTSTATUS Status = STATUS_SUCCESS; - PROSRGNDATA Rgn; - PDC dc = DC_LockDc(hDC); - BOOL Result = FALSE; - RECTL Rect; + NTSTATUS Status = STATUS_SUCCESS; + PDC dc = DC_LockDc(hDC); + BOOL Result = FALSE; + RECTL Rect; - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } + if (!dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } - _SEH2_TRY - { - ProbeForRead(UnsafeRect, + _SEH2_TRY + { + ProbeForRead(UnsafeRect, sizeof(RECT), 1); - Rect = *UnsafeRect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; + Rect = *UnsafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } + if(!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastNtError(Status); + return FALSE; + } - if (dc->rosdc.hGCClipRgn) - { - if((Rgn = (PROSRGNDATA)RGNOBJAPI_Lock(dc->rosdc.hGCClipRgn, NULL))) - { + if (dc->fs & DC_FLAG_DIRTY_RAO) + CLIPPING_UpdateGCRegion(dc); + + if (dc->prgnRao) + { IntLPtoDP(dc, (LPPOINT)&Rect, 2); - Result = REGION_RectInRegion(Rgn, &Rect); - RGNOBJAPI_Unlock(Rgn); - } - } - DC_UnlockDc(dc); + Result = REGION_RectInRegion(dc->prgnRao, &Rect); + } + DC_UnlockDc(dc); - return Result; + return Result; } int FASTCALL IntGdiSetMetaRgn(PDC pDC) { - INT Ret = ERROR; - PROSRGNDATA TempRgn; + INT Ret = ERROR; - if ( pDC->dclevel.prgnMeta ) - { - if ( pDC->dclevel.prgnClip ) - { - TempRgn = IntSysCreateRectpRgn(0,0,0,0); - if (TempRgn) + if ( pDC->dclevel.prgnMeta ) + { + if ( pDC->dclevel.prgnClip ) { - Ret = IntGdiCombineRgn( TempRgn, - pDC->dclevel.prgnMeta, - pDC->dclevel.prgnClip, - RGN_AND); - if ( Ret ) - { - GDIOBJ_vDereferenceObject(&pDC->dclevel.prgnMeta->BaseObject); - if (!((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.ulShareCount) - REGION_Delete(pDC->dclevel.prgnMeta); - - pDC->dclevel.prgnMeta = TempRgn; - - GDIOBJ_vDereferenceObject(&pDC->dclevel.prgnClip->BaseObject); - if (!((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.ulShareCount) - REGION_Delete(pDC->dclevel.prgnClip); - - pDC->dclevel.prgnClip = NULL; - - IntGdiReleaseRaoRgn(pDC); - } - else - REGION_Delete(TempRgn); + Ret = IntGdiCombineRgn(pDC->dclevel.prgnMeta, pDC->dclevel.prgnMeta, pDC->dclevel.prgnClip, RGN_AND); + if (Ret != ERROR) + { + REGION_Delete(pDC->dclevel.prgnClip); + pDC->dclevel.prgnClip = NULL; + IntGdiReleaseRaoRgn(pDC); + } } - } - else - Ret = REGION_Complexity(pDC->dclevel.prgnMeta); - } - else - { - if ( pDC->dclevel.prgnClip ) - { - Ret = REGION_Complexity(pDC->dclevel.prgnClip); - pDC->dclevel.prgnMeta = pDC->dclevel.prgnClip; - pDC->dclevel.prgnClip = NULL; - } - else - Ret = SIMPLEREGION; - } - return Ret; + else + Ret = REGION_Complexity(pDC->dclevel.prgnMeta); + } + else + { + if ( pDC->dclevel.prgnClip ) + { + Ret = REGION_Complexity(pDC->dclevel.prgnClip); + pDC->dclevel.prgnMeta = pDC->dclevel.prgnClip; + pDC->dclevel.prgnClip = NULL; + } + else + Ret = SIMPLEREGION; + } + + if (Ret != ERROR) + pDC->fs |= DC_FLAG_DIRTY_RAO; + + return Ret; } @@ -533,88 +454,95 @@ int APIENTRY NtGdiSetMetaRgn(HDC hDC) return Ret; } -INT FASTCALL -NEW_CLIPPING_UpdateGCRegion(PDC pDC) +VOID +FASTCALL +CLIPPING_UpdateGCRegion(PDC pDC) { - CLIPOBJ * co; + CLIPOBJ * co; - /* Must have VisRgn set to a valid state! */ - ASSERT (pDC->prgnVis); + /* Must have VisRgn set to a valid state! */ + ASSERT (pDC->prgnVis); -// FIXME: this seems to be broken! + if (pDC->prgnAPI) + { + REGION_Delete(pDC->prgnAPI); + pDC->prgnAPI = NULL; + } - if (pDC->prgnAPI) - { - REGION_Delete(pDC->prgnAPI); - pDC->prgnAPI = IntSysCreateRectpRgn(0,0,0,0); - } + if (pDC->prgnRao) + REGION_Delete(pDC->prgnRao); - if (pDC->prgnRao) - { - REGION_Delete(pDC->prgnRao); - pDC->prgnRao = IntSysCreateRectpRgn(0,0,0,0); - } + pDC->prgnRao = IntSysCreateRectpRgn(0,0,0,0); - if (!pDC->prgnRao) - { - return ERROR; - } + ASSERT(pDC->prgnRao); - if (pDC->dclevel.prgnMeta && pDC->dclevel.prgnClip) - { - IntGdiCombineRgn( pDC->prgnAPI, - pDC->dclevel.prgnClip, - pDC->dclevel.prgnMeta, - RGN_AND); - } - else - { - if (pDC->dclevel.prgnClip) - { - IntGdiCombineRgn( pDC->prgnAPI, - pDC->dclevel.prgnClip, - NULL, - RGN_COPY); - } - else if (pDC->dclevel.prgnMeta) - { - IntGdiCombineRgn( pDC->prgnAPI, - pDC->dclevel.prgnMeta, - NULL, - RGN_COPY); - } - } + if (pDC->dclevel.prgnMeta || pDC->dclevel.prgnClip) + { + pDC->prgnAPI = IntSysCreateRectpRgn(0,0,0,0); + if (!pDC->dclevel.prgnMeta) + { + IntGdiCombineRgn(pDC->prgnAPI, + pDC->dclevel.prgnClip, + NULL, + RGN_COPY); + } + else if (!pDC->dclevel.prgnClip) + { + IntGdiCombineRgn(pDC->prgnAPI, + pDC->dclevel.prgnMeta, + NULL, + RGN_COPY); + } + else + { + IntGdiCombineRgn(pDC->prgnAPI, + pDC->dclevel.prgnClip, + pDC->dclevel.prgnMeta, + RGN_AND); + } + } - IntGdiCombineRgn( pDC->prgnRao, - pDC->prgnVis, - pDC->prgnAPI, - RGN_AND); + if (pDC->prgnAPI) + { + IntGdiCombineRgn(pDC->prgnRao, + pDC->prgnVis, + pDC->prgnAPI, + RGN_AND); + } + else + { + IntGdiCombineRgn(pDC->prgnRao, + pDC->prgnVis, + NULL, + RGN_COPY); + } - RtlCopyMemory(&pDC->erclClip, + + IntGdiOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y); + + RtlCopyMemory(&pDC->erclClip, &pDC->prgnRao->rdh.rcBound, sizeof(RECTL)); - pDC->fs &= ~DC_FLAG_DIRTY_RAO; + pDC->fs &= ~DC_FLAG_DIRTY_RAO; - IntGdiOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y); + // pDC->co should be used. Example, CLIPOBJ_cEnumStart uses XCLIPOBJ to build + // the rects from region objects rects in pClipRgn->Buffer. + // With pDC->co.pClipRgn->Buffer, + // pDC->co.pClipRgn = pDC->prgnRao ? pDC->prgnRao : pDC->prgnVis; - // pDC->co should be used. Example, CLIPOBJ_cEnumStart uses XCLIPOBJ to build - // the rects from region objects rects in pClipRgn->Buffer. - // With pDC->co.pClipRgn->Buffer, - // pDC->co.pClipRgn = pDC->prgnRao ? pDC->prgnRao : pDC->prgnVis; + co = IntEngCreateClipRegion(pDC->prgnRao->rdh.nCount, + pDC->prgnRao->Buffer, + &pDC->erclClip); + if (co) + { + if (pDC->rosdc.CombinedClip != NULL) + IntEngDeleteClipRegion(pDC->rosdc.CombinedClip); - co = IntEngCreateClipRegion(pDC->prgnRao->rdh.nCount, - pDC->prgnRao->Buffer, - &pDC->erclClip); - if (co) - { - if (pDC->rosdc.CombinedClip != NULL) - IntEngDeleteClipRegion(pDC->rosdc.CombinedClip); + pDC->rosdc.CombinedClip = co; + } - pDC->rosdc.CombinedClip = co; - } - - return IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y); + IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y); } /* EOF */ diff --git a/reactos/win32ss/gdi/ntgdi/cliprgn.h b/reactos/win32ss/gdi/ntgdi/cliprgn.h index b16039292b4..64f4fb74081 100644 --- a/reactos/win32ss/gdi/ntgdi/cliprgn.h +++ b/reactos/win32ss/gdi/ntgdi/cliprgn.h @@ -1,6 +1,6 @@ #pragma once INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); -INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn); -INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); -int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); +VOID FASTCALL GdiSelectVisRgn(HDC hdc, PREGION prgn); +INT FASTCALL IntGdiExtSelectClipRgn (PDC dc, PREGION prgn, int fnMode); +VOID FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); diff --git a/reactos/win32ss/gdi/ntgdi/dc.h b/reactos/win32ss/gdi/ntgdi/dc.h index a65e7a3d64c..fbb76775cfe 100644 --- a/reactos/win32ss/gdi/ntgdi/dc.h +++ b/reactos/win32ss/gdi/ntgdi/dc.h @@ -48,9 +48,6 @@ typedef enum _DCTYPE typedef struct _ROS_DC_INFO { - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - CLIPOBJ *CombinedClip; } ROS_DC_INFO; @@ -199,9 +196,9 @@ BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); VOID FASTCALL DC_vUpdateViewportExt(PDC pdc); -VOID FASTCALL DC_vCopyState(PDC pdcSrc, PDC pdcDst, BOOL to); +VOID FASTCALL DC_vCopyState(PDC pdcSrc, PDC pdcDst, BOOL To); VOID FASTCALL DC_vFinishBlit(PDC pdc1, PDC pdc2); -VOID FASTCALL DC_vPrepareDCsForBlit(PDC pdc1, RECT rc1, PDC pdc2, RECT rc2); +VOID FASTCALL DC_vPrepareDCsForBlit(PDC pdcDest, const RECT* rcDest, PDC pdcSrc, const RECT* rcSrc); VOID NTAPI DC_vRestoreDC(IN PDC pdc, INT iSaveLevel); diff --git a/reactos/win32ss/gdi/ntgdi/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c index 3a8a35954db..e9aa7b0bca8 100644 --- a/reactos/win32ss/gdi/ntgdi/dclife.c +++ b/reactos/win32ss/gdi/ntgdi/dclife.c @@ -95,22 +95,11 @@ DC_AllocDcWithHandle() void DC_InitHack(PDC pdc) { - HRGN hVisRgn; - TextIntRealizeFont(pdc->pdcattr->hlfntNew,NULL); pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); /* This should never fail */ ASSERT(pdc->dclevel.ppal); - - /* Select regions */ - pdc->rosdc.hClipRgn = NULL; - pdc->rosdc.hGCClipRgn = NULL; - - hVisRgn = IntSysCreateRectRgn(0, 0, 1, 1); - ASSERT(hVisRgn); - GdiSelectVisRgn(pdc->BaseObject.hHmgr, hVisRgn); - GreDeleteObject(hVisRgn); } VOID @@ -170,7 +159,7 @@ DC_vInitDc( pdc->erclBoundsApp.right = 0x00007ffc; // FIXME pdc->erclBoundsApp.bottom = 0x00000333; // FIXME pdc->erclClip = pdc->erclBounds; -// pdc->co + pdc->co = gxcoTrivial; pdc->fs |= DC_SYNCHRONIZEACCESS | DC_ACCUM_APP | DC_PERMANANT | DC_DISPLAY; } @@ -185,7 +174,7 @@ DC_vInitDc( pdc->erclBounds.bottom = 0; pdc->erclBoundsApp = pdc->erclBounds; pdc->erclClip = pdc->erclWindow; - //pdc->co = NULL + pdc->co = gxcoTrivial; } //pdc->dcattr.VisRectRegion: @@ -237,6 +226,8 @@ DC_vInitDc( /* Setup regions */ pdc->prgnAPI = NULL; pdc->prgnRao = NULL; + pdc->dclevel.prgnClip = NULL; + pdc->dclevel.prgnMeta = NULL; /* Allocate a Vis region */ pdc->prgnVis = IntSysCreateRectpRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); ASSERT(pdc->prgnVis); @@ -372,17 +363,17 @@ DC_vCleanup(PVOID ObjectBody) LFONT_ShareUnlockFont(pdc->dclevel.plfnt); /* Free regions */ - if (pdc->rosdc.hClipRgn && GreIsHandleValid(pdc->rosdc.hClipRgn)) - GreDeleteObject(pdc->rosdc.hClipRgn); + if (pdc->dclevel.prgnClip) + REGION_Delete(pdc->dclevel.prgnClip); + if (pdc->dclevel.prgnMeta) + REGION_Delete(pdc->dclevel.prgnMeta); if (pdc->prgnVis) - { REGION_Delete(pdc->prgnVis); - } - if (pdc->rosdc.hGCClipRgn && GreIsHandleValid(pdc->rosdc.hGCClipRgn)) - { - GreDeleteObject(pdc->rosdc.hGCClipRgn); - } - if (NULL != pdc->rosdc.CombinedClip) + if (pdc->prgnRao) + REGION_Delete(pdc->prgnRao); + if (pdc->prgnAPI) + REGION_Delete(pdc->prgnAPI); + if (pdc->rosdc.CombinedClip) IntEngDeleteClipRegion(pdc->rosdc.CombinedClip); PATH_Delete(pdc->dclevel.hPath); @@ -397,17 +388,6 @@ VOID NTAPI DC_vSetOwner(PDC pdc, ULONG ulOwner) { - - if (pdc->rosdc.hClipRgn) - { - IntGdiSetRegionOwner(pdc->rosdc.hClipRgn, ulOwner); - } - - if (pdc->rosdc.hGCClipRgn) - { - IntGdiSetRegionOwner(pdc->rosdc.hGCClipRgn, ulOwner); - } - if (pdc->dclevel.hPath) { GreSetObjectOwner(pdc->dclevel.hPath, ulOwner); @@ -466,7 +446,7 @@ static void DC_vUpdateDC(PDC pdc) { - HRGN hVisRgn ; + // PREGION VisRgn ; PPDEVOBJ ppdev = pdc->ppdev ; pdc->dhpdev = ppdev->dhpdev; @@ -475,10 +455,12 @@ DC_vUpdateDC(PDC pdc) pdc->dclevel.pSurface = PDEVOBJ_pSurface(ppdev); PDEVOBJ_sizl(pdc->ppdev, &pdc->dclevel.sizl); - hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); - ASSERT(hVisRgn); - GdiSelectVisRgn(pdc->BaseObject.hHmgr, hVisRgn); - GreDeleteObject(hVisRgn); +#if 0 + VisRgn = IntSysCreateRectpRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); + ASSERT(VisRgn); + GdiSelectVisRgn(pdc->BaseObject.hHmgr, VisRgn); + REGION_Delete(VisRgn); +#endif pdc->flGraphicsCaps = ppdev->devinfo.flGraphicsCaps; pdc->flGraphicsCaps2 = ppdev->devinfo.flGraphicsCaps2; @@ -492,76 +474,107 @@ DC_vUpdateDC(PDC pdc) * from where we take pixels. */ VOID FASTCALL -DC_vPrepareDCsForBlit(PDC pdc1, - RECT rc1, - PDC pdc2, - RECT rc2) +DC_vPrepareDCsForBlit( + PDC pdcDest, + const RECT* rcDest, + PDC pdcSrc, + const RECT* rcSrc) { PDC pdcFirst, pdcSecond; - PRECT prcFirst, prcSecond; + const RECT *prcFirst, *prcSecond; /* Update brushes */ - if (pdc1->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(pdc1); - if (pdc1->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) - DC_vUpdateLineBrush(pdc1); - if(pdc1->pdcattr->ulDirty_ & DIRTY_TEXT) - DC_vUpdateTextBrush(pdc1); + if (pdcDest->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(pdcDest); + if (pdcDest->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(pdcDest); + if(pdcDest->pdcattr->ulDirty_ & DIRTY_TEXT) + DC_vUpdateTextBrush(pdcDest); /* Lock them in good order */ - if(pdc2) + if(pdcSrc) { - if((ULONG_PTR)pdc1->ppdev->hsemDevLock >= (ULONG_PTR)pdc2->ppdev->hsemDevLock) + if((ULONG_PTR)pdcDest->ppdev->hsemDevLock >= (ULONG_PTR)pdcSrc->ppdev->hsemDevLock) { - pdcFirst = pdc1; - prcFirst = &rc1; - pdcSecond = pdc2; - prcSecond = &rc2; + pdcFirst = pdcDest; + prcFirst = rcDest; + pdcSecond = pdcSrc; + prcSecond = rcSrc; } else { - pdcFirst = pdc2; - prcFirst = &rc2; - pdcSecond = pdc1; - prcSecond = &rc1; + pdcFirst = pdcSrc; + prcFirst = rcSrc; + pdcSecond = pdcDest; + prcSecond = rcDest; } } else { - pdcFirst = pdc1 ; - prcFirst = &rc1; + pdcFirst = pdcDest ; + prcFirst = rcDest; pdcSecond = NULL; prcSecond = NULL; } - if(pdcFirst && pdcFirst->dctype == DCTYPE_DIRECT) + /* Update clipping of dest DC if needed */ + if (pdcDest->dctype == DCTYPE_DIRECT) + { + DCE* dce = DceGetDceFromDC(pdcDest->BaseObject.hHmgr); + if (dce) + DceUpdateVisRgn(dce, dce->pwndOrg, dce->DCXFlags); + } + + if (pdcDest->fs & DC_FLAG_DIRTY_RAO) + CLIPPING_UpdateGCRegion(pdcDest); + + /* Lock and update first DC */ + if(pdcFirst->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcFirst->ppdev->hsemDevLock); - MouseSafetyOnDrawStart(pdcFirst->ppdev, - prcFirst->left, - prcFirst->top, - prcFirst->right, - prcFirst->bottom) ; /* Update surface if needed */ if(pdcFirst->ppdev->pSurface != pdcFirst->dclevel.pSurface) { DC_vUpdateDC(pdcFirst); } } - if(pdcSecond && pdcSecond->dctype == DCTYPE_DIRECT) + + if(pdcFirst->dctype == DCTYPE_DIRECT) + { + if (!prcFirst) + prcFirst = &pdcFirst->erclClip; + + MouseSafetyOnDrawStart(pdcFirst->ppdev, + prcFirst->left, + prcFirst->top, + prcFirst->right, + prcFirst->bottom) ; + } + + if (!pdcSecond) + return; + + /* Lock and update second DC */ + if(pdcSecond->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcSecond->ppdev->hsemDevLock); - MouseSafetyOnDrawStart(pdcSecond->ppdev, - prcSecond->left, - prcSecond->top, - prcSecond->right, - prcSecond->bottom) ; /* Update surface if needed */ if(pdcSecond->ppdev->pSurface != pdcSecond->dclevel.pSurface) { DC_vUpdateDC(pdcSecond); } } + + if(pdcSecond->dctype == DCTYPE_DIRECT) + { + if (!prcSecond) + prcSecond = &pdcSecond->erclClip; + MouseSafetyOnDrawStart(pdcSecond->ppdev, + prcSecond->left, + prcSecond->top, + prcSecond->right, + prcSecond->bottom) ; + } } /* Finishes a blit for one or two DCs */ diff --git a/reactos/win32ss/gdi/ntgdi/dcobjs.c b/reactos/win32ss/gdi/ntgdi/dcobjs.c index be21fedb221..67de9c926a9 100644 --- a/reactos/win32ss/gdi/ntgdi/dcobjs.c +++ b/reactos/win32ss/gdi/ntgdi/dcobjs.c @@ -330,7 +330,7 @@ NtGdiSelectBitmap( PDC pdc; HBITMAP hbmpOld; PSURFACE psurfNew, psurfOld; - HRGN hVisRgn; + PREGION VisRgn; HDC hdcOld; ULONG cBitsPixel; ASSERT_NOGDILOCKS(); @@ -452,15 +452,15 @@ NtGdiSelectBitmap( pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; /* FIXME: Improve by using a region without a handle and selecting it */ - hVisRgn = IntSysCreateRectRgn( 0, + VisRgn = IntSysCreateRectpRgn( 0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); - if (hVisRgn) + if (VisRgn) { - GdiSelectVisRgn(hdc, hVisRgn); - GreDeleteObject(hVisRgn); + GdiSelectVisRgn(hdc, VisRgn); + REGION_Delete(VisRgn); } /* Unlock the DC */ @@ -509,7 +509,10 @@ NtGdiSelectClipPath( /* Construct a region from the path */ else if (PATH_PathToRegion(pPath, pdcattr->jFillMode, &hrgnPath)) { - success = GdiExtSelectClipRgn(pdc, hrgnPath, Mode) != ERROR; + PREGION prgnPath = REGION_LockRgn(hrgnPath); + ASSERT(prgnPath); + success = IntGdiExtSelectClipRgn(pdc, prgnPath, Mode) != ERROR; + REGION_UnlockRgn(prgnPath); GreDeleteObject( hrgnPath ); /* Empty the path */ @@ -693,9 +696,7 @@ NtGdiGetRandomRgn( { INT ret = 0; PDC pdc; - HRGN hrgnSrc = NULL; PREGION prgnSrc = NULL; - POINTL ptlOrg; pdc = DC_LockDc(hdc); if (!pdc) @@ -707,8 +708,7 @@ NtGdiGetRandomRgn( switch (iCode) { case CLIPRGN: - hrgnSrc = pdc->rosdc.hClipRgn; -// if (pdc->dclevel.prgnClip) prgnSrc = pdc->dclevel.prgnClip; + prgnSrc = pdc->dclevel.prgnClip; break; case METARGN: @@ -716,14 +716,15 @@ NtGdiGetRandomRgn( break; case APIRGN: + if (pdc->fs & DC_FLAG_DIRTY_RAO) + CLIPPING_UpdateGCRegion(pdc); if (pdc->prgnAPI) { prgnSrc = pdc->prgnAPI; } -// else if (pdc->dclevel.prgnClip) prgnSrc = pdc->dclevel.prgnClip; - else if (pdc->rosdc.hClipRgn) + else if (pdc->dclevel.prgnClip) { - hrgnSrc = pdc->rosdc.hClipRgn; + prgnSrc = pdc->dclevel.prgnClip; } else if (pdc->dclevel.prgnMeta) { @@ -739,28 +740,20 @@ NtGdiGetRandomRgn( break; } - if (hrgnSrc) - { - ret = NtGdiCombineRgn(hrgnDest, hrgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1; - } - else if (prgnSrc) + if (prgnSrc) { PREGION prgnDest = REGION_LockRgn(hrgnDest); if (prgnDest) { ret = IntGdiCombineRgn(prgnDest, prgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1; + if ((ret == 1) && (iCode == SYSRGN)) + IntGdiOffsetRgn(prgnDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); REGION_UnlockRgn(prgnDest); } else ret = -1; } - if (iCode == SYSRGN) - { - ptlOrg = pdc->ptlDCOrig; - NtGdiOffsetRgn(hrgnDest, ptlOrg.x, ptlOrg.y ); - } - DC_UnlockDc(pdc); return ret; diff --git a/reactos/win32ss/gdi/ntgdi/dcstate.c b/reactos/win32ss/gdi/ntgdi/dcstate.c index d20018e298e..38ad48174b9 100644 --- a/reactos/win32ss/gdi/ntgdi/dcstate.c +++ b/reactos/win32ss/gdi/ntgdi/dcstate.c @@ -51,23 +51,26 @@ DC_vCopyState(PDC pdcSrc, PDC pdcDst, BOOL To) pdcDst->dclevel.plfnt = pdcSrc->dclevel.plfnt; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ - if (To) // Copy "To" SaveDC state. + if (!To) { - if (pdcSrc->rosdc.hClipRgn) + IntGdiExtSelectClipRgn(pdcDst, pdcSrc->dclevel.prgnClip, RGN_COPY); + if (pdcDst->dclevel.prgnMeta) { - pdcDst->rosdc.hClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(pdcDst->rosdc.hClipRgn, pdcSrc->rosdc.hClipRgn, 0, RGN_COPY); + REGION_Delete(pdcDst->dclevel.prgnMeta); + pdcDst->dclevel.prgnMeta = NULL; } - // FIXME: Handle prgnMeta! - } - else // Copy "!To" RestoreDC state. - { /* The VisRectRegion field needs to be set to a valid state */ - GdiExtSelectClipRgn(pdcDst, pdcSrc->rosdc.hClipRgn, RGN_COPY); + if (pdcSrc->dclevel.prgnMeta) + { + pdcDst->dclevel.prgnMeta = IntSysCreateRectpRgn(0, 0, 0, 0); + IntGdiCombineRgn(pdcDst->dclevel.prgnMeta, pdcSrc->dclevel.prgnMeta, NULL, RGN_COPY); + } + pdcDst->fs |= DC_FLAG_DIRTY_RAO; } } -BOOL FASTCALL +BOOL +FASTCALL IntGdiCleanDC(HDC hDC) { PDC dc; @@ -87,6 +90,16 @@ IntGdiCleanDC(HDC hDC) DC_vUpdateTextBrush(dc); } + /* DC_vCopyState frees the Clip rgn and the Meta rgn. Take care of the other ones + * There is no need to clear prgnVis, as UserGetDC updates it immediately. */ + if (dc->prgnRao) + REGION_Delete(dc->prgnRao); + if (dc->prgnAPI) + REGION_Delete(dc->prgnAPI); + dc->prgnRao = dc->prgnAPI = NULL; + + dc->fs |= DC_FLAG_DIRTY_RAO; + DC_UnlockDc(dc); return TRUE; @@ -272,7 +285,7 @@ NtGdiSaveDC( GDIOBJ_vSetObjectOwner(&pdcSave->BaseObject, GDI_OBJ_HMGR_PUBLIC); /* Copy the current state */ - DC_vCopyState(pdc, pdcSave, TRUE); + DC_vCopyState(pdc, pdcSave, FALSE); /* Only memory DC's change their surface */ if (pdc->dctype == DCTYPE_MEMORY) diff --git a/reactos/win32ss/gdi/ntgdi/dcutil.c b/reactos/win32ss/gdi/ntgdi/dcutil.c index 695d7e29a78..730713d6047 100644 --- a/reactos/win32ss/gdi/ntgdi/dcutil.c +++ b/reactos/win32ss/gdi/ntgdi/dcutil.c @@ -367,7 +367,7 @@ IntGdiSetHookFlags(HDC hDC, WORD Flags) } else if (Flags & DCHF_VALIDATEVISRGN || 0 == Flags) { - dc->fs &= ~DC_FLAG_DIRTY_RAO; + //dc->fs &= ~DC_FLAG_DIRTY_RAO; } DC_UnlockDc(dc); diff --git a/reactos/win32ss/gdi/ntgdi/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c index 032031199e6..65fbdd9dc9f 100644 --- a/reactos/win32ss/gdi/ntgdi/dibobj.c +++ b/reactos/win32ss/gdi/ntgdi/dibobj.c @@ -502,7 +502,7 @@ NtGdiSetDIBitsToDeviceInternal( } /* This is actually a blit */ - DC_vPrepareDCsForBlit(pDC, rcDest, NULL, rcDest); + DC_vPrepareDCsForBlit(pDC, &rcDest, NULL, NULL); pSurf = pDC->dclevel.pSurface; if (!pSurf) { @@ -1184,7 +1184,7 @@ NtGdiStretchDIBitsInternal( } /* Prepare DC for blit */ - DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcSrc); + DC_vPrepareDCsForBlit(pdc, &rcDst, NULL, NULL); psurfDst = pdc->dclevel.pSurface; diff --git a/reactos/win32ss/gdi/ntgdi/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c index 77e22f7efd7..1c3f374ac82 100644 --- a/reactos/win32ss/gdi/ntgdi/fillshap.c +++ b/reactos/win32ss/gdi/ntgdi/fillshap.c @@ -307,7 +307,7 @@ NtGdiEllipse( tmpFillBrushObj.ptOrigin.x += dc->ptlDCOrig.x; tmpFillBrushObj.ptOrigin.y += dc->ptlDCOrig.y; - DC_vPrepareDCsForBlit(dc, RectBounds, NULL, RectBounds); + DC_vPrepareDCsForBlit(dc, &RectBounds, NULL, NULL); ret = IntFillEllipse( dc, CenterX - RadiusX, @@ -480,8 +480,7 @@ NtGdiPolyPolyDraw( IN HDC hDC, return TRUE; } - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, - NULL, dc->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); @@ -567,7 +566,7 @@ IntRectangle(PDC dc, DestRect.bottom--; } - DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); + DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); @@ -796,7 +795,7 @@ IntRoundRect( else { - DC_vPrepareDCsForBlit(dc, RectBounds, NULL, RectBounds); + DC_vPrepareDCsForBlit(dc, &RectBounds, NULL, NULL); RtlCopyMemory(&brushTemp, pbrFill, sizeof(brushTemp)); brushTemp.ptOrigin.x += RectBounds.left - Left; @@ -962,9 +961,9 @@ GreGradientFill( EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0, 0); - ASSERT(pdc->rosdc.CombinedClip); + DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL); - DC_vPrepareDCsForBlit(pdc, rclExtent, NULL, rclExtent); + ASSERT(pdc->rosdc.CombinedClip); bRet = IntEngGradientFill(&psurf->SurfObj, pdc->rosdc.CombinedClip, @@ -1091,6 +1090,13 @@ NtGdiExtFloodFill( return TRUE; } + psurf = dc->dclevel.pSurface; + if (!psurf) + { + Ret = FALSE; + goto cleanup; + } + pdcattr = dc->pdcattr; if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) @@ -1103,20 +1109,18 @@ NtGdiExtFloodFill( Pt.y = YStart; IntLPtoDP(dc, (LPPOINT)&Pt, 1); - Ret = NtGdiPtInRegion(dc->rosdc.hGCClipRgn, Pt.x, Pt.y); - if (Ret) - IntGdiGetRgnBox(dc->rosdc.hGCClipRgn,(LPRECT)&DestRect); - else - goto cleanup; - - DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); - - psurf = dc->dclevel.pSurface; - if (!psurf) + if (dc->prgnRao) { - Ret = FALSE; - goto cleanup; + Ret = REGION_PtInRegion(dc->prgnRao, Pt.x, Pt.y); + if (Ret) + REGION_GetRgnBox(dc->prgnRao ,(LPRECT)&DestRect); + else + goto cleanup; } + else + RECTL_vSetRect(&DestRect, 0, psurf->SurfObj.sizlBitmap.cx, 0, psurf->SurfObj.sizlBitmap.cy); + + DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0xffffff, 0); @@ -1127,10 +1131,11 @@ NtGdiExtFloodFill( ConvColor = XLATEOBJ_iXlate(&exlo.xlo, Color); Ret = DIB_XXBPP_FloodFillSolid(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, ConvColor, FillType); + DC_vFinishBlit(dc, NULL); + EXLATEOBJ_vCleanup(&exlo); cleanup: - DC_vFinishBlit(dc, NULL); DC_UnlockDc(dc); return Ret; } diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c index 5ac3b60af37..560d12e58ab 100644 --- a/reactos/win32ss/gdi/ntgdi/freetype.c +++ b/reactos/win32ss/gdi/ntgdi/freetype.c @@ -3212,7 +3212,7 @@ GreExtTextOutW( LONGLONG TextLeft, RealXStart; ULONG TextTop, previous, BackgroundLeft; FT_Bool use_kerning; - RECTL DestRect, MaskRect, DummyRect = {0, 0, 0, 0}; + RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; HBITMAP HSourceGlyph; SURFOBJ *SourceGlyphSurf; @@ -3308,7 +3308,7 @@ GreExtTextOutW( DestRect.right += dc->ptlDCOrig.x; DestRect.bottom += dc->ptlDCOrig.y; - DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); + DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) DC_vUpdateBackgroundBrush(dc); @@ -3502,7 +3502,7 @@ GreExtTextOutW( BackgroundLeft = (RealXStart + 32) >> 6; /* Lock blit with a dummy rect */ - DC_vPrepareDCsForBlit(dc, DummyRect, NULL, DummyRect); + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); psurf = dc->dclevel.pSurface ; if(!psurf) psurf = psurfDefaultBitmap; diff --git a/reactos/win32ss/gdi/ntgdi/line.c b/reactos/win32ss/gdi/ntgdi/line.c index d4d5505fce4..93c89be562c 100644 --- a/reactos/win32ss/gdi/ntgdi/line.c +++ b/reactos/win32ss/gdi/ntgdi/line.c @@ -257,8 +257,7 @@ IntGdiPolyline(DC *dc, if (PATH_IsPathOpen(dc->dclevel)) return PATH_Polyline(dc, pt, Count); - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, - NULL, dc->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); @@ -411,7 +410,7 @@ NtGdiLineTo(HDC hDC, rcLockRect.right += dc->ptlDCOrig.x; rcLockRect.bottom += dc->ptlDCOrig.y; - DC_vPrepareDCsForBlit(dc, rcLockRect, NULL, rcLockRect); + DC_vPrepareDCsForBlit(dc, &rcLockRect, NULL, NULL); if (dc->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(dc); diff --git a/reactos/win32ss/gdi/ntgdi/path.c b/reactos/win32ss/gdi/ntgdi/path.c index 434518a940b..1f4218bef90 100644 --- a/reactos/win32ss/gdi/ntgdi/path.c +++ b/reactos/win32ss/gdi/ntgdi/path.c @@ -2511,8 +2511,7 @@ NtGdiFillPath(HDC hDC) return FALSE; } - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, - NULL, dc->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); pdcattr = dc->pdcattr; @@ -2777,8 +2776,7 @@ NtGdiStrokeAndFillPath(HDC hDC) return FALSE; } - DC_vPrepareDCsForBlit(pDc, pDc->rosdc.CombinedClip->rclBounds, - NULL, pDc->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(pDc, NULL, NULL, NULL); pdcattr = pDc->pdcattr; @@ -2822,8 +2820,7 @@ NtGdiStrokePath(HDC hDC) return FALSE; } - DC_vPrepareDCsForBlit(pDc, pDc->rosdc.CombinedClip->rclBounds, - NULL, pDc->rosdc.CombinedClip->rclBounds); + DC_vPrepareDCsForBlit(pDc, NULL, NULL, NULL); pdcattr = pDc->pdcattr; diff --git a/reactos/win32ss/gdi/ntgdi/region.c b/reactos/win32ss/gdi/ntgdi/region.c index ce79722837c..08a0cdd0c45 100644 --- a/reactos/win32ss/gdi/ntgdi/region.c +++ b/reactos/win32ss/gdi/ntgdi/region.c @@ -2300,11 +2300,13 @@ REGION_Delete(PROSRGNDATA pRgn) VOID FASTCALL IntGdiReleaseRaoRgn(PDC pDC) { - INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - pDC->fs |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; - RECTL_vSetEmptyRect(&pDC->erclClip); + INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + pDC->fs |= DC_FLAG_DIRTY_RAO; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; + RECTL_vSetEmptyRect(&pDC->erclClip); + REGION_Delete(pDC->prgnRao); + pDC->prgnRao = NULL; } VOID FASTCALL @@ -2503,8 +2505,6 @@ IntGdiPaintRgn( return FALSE; } - NtGdiCombineRgn(tmpVisRgn, tmpVisRgn, dc->rosdc.hGCClipRgn, RGN_AND); - visrgn = RGNOBJAPI_Lock(tmpVisRgn, NULL); if (visrgn == NULL) { @@ -2512,6 +2512,9 @@ IntGdiPaintRgn( return FALSE; } + if (dc->prgnRao) + IntGdiCombineRgn(visrgn, visrgn, dc->prgnRao, RGN_AND); + ClipRegion = IntEngCreateClipRegion(visrgn->rdh.nCount, visrgn->Buffer, &visrgn->rdh.rcBound ); @@ -2535,6 +2538,29 @@ IntGdiPaintRgn( return bRet; } +BOOL +FASTCALL +REGION_PtInRegion( + PREGION prgn, + INT X, + INT Y) +{ + ULONG i; + PRECT r; + + if (prgn->rdh.nCount > 0 && INRECT(prgn->rdh.rcBound, X, Y)) + { + r = prgn->Buffer; + for (i = 0; i < prgn->rdh.nCount; i++) + { + if (INRECT(r[i], X, Y)) + return TRUE; + } + } + + return FALSE; +} + BOOL FASTCALL REGION_RectInRegion( @@ -3861,27 +3887,19 @@ NtGdiPtInRegion( INT Y ) { - PROSRGNDATA rgn; - ULONG i; - PRECTL r; + PREGION prgn; + BOOL ret; - if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) + if (!(prgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) return FALSE; - if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) - { - r = rgn->Buffer; - for (i = 0; i < rgn->rdh.nCount; i++) - { - if (INRECT(*r, X, Y)) - { - RGNOBJAPI_Unlock(rgn); - return TRUE; - } - r++; - } - } - RGNOBJAPI_Unlock(rgn); + ret = REGION_PtInRegion(prgn, X, Y); + + RGNOBJAPI_Unlock(prgn); + return ret; + + + RGNOBJAPI_Unlock(prgn); return FALSE; } diff --git a/reactos/win32ss/gdi/ntgdi/region.h b/reactos/win32ss/gdi/ntgdi/region.h index b11f31da8ee..8fb7ca2267d 100644 --- a/reactos/win32ss/gdi/ntgdi/region.h +++ b/reactos/win32ss/gdi/ntgdi/region.h @@ -27,6 +27,7 @@ PROSRGNDATA FASTCALL REGION_AllocUserRgnWithHandle(INT n); VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, const RECTL *rect); INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect); BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); +BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT); BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); VOID NTAPI REGION_vCleanup(PVOID ObjectBody); diff --git a/reactos/win32ss/user/ntuser/cursoricon.c b/reactos/win32ss/user/ntuser/cursoricon.c index a4b0d3ad5f7..e730c585b38 100644 --- a/reactos/win32ss/user/ntuser/cursoricon.c +++ b/reactos/win32ss/user/ntuser/cursoricon.c @@ -1287,7 +1287,7 @@ UserDrawIconEx( RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); /* Prepare the underlying surface */ - DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); + DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* Get the clip object */ pdcClipObj = pdc->rosdc.CombinedClip; @@ -1472,7 +1472,7 @@ done: RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); /* Prepare the underlying surface */ - DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); + DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* Get the clip object */ pdcClipObj = pdc->rosdc.CombinedClip; diff --git a/reactos/win32ss/user/ntuser/cursoricon_new.c b/reactos/win32ss/user/ntuser/cursoricon_new.c index bdd7fbb1712..98e4300e473 100644 --- a/reactos/win32ss/user/ntuser/cursoricon_new.c +++ b/reactos/win32ss/user/ntuser/cursoricon_new.c @@ -1195,7 +1195,7 @@ UserDrawIconEx( RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); /* Prepare the underlying surface */ - DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); + DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; diff --git a/reactos/win32ss/user/ntuser/dce.h b/reactos/win32ss/user/ntuser/dce.h index 9d56ffd7a92..5c7e9327bd7 100644 --- a/reactos/win32ss/user/ntuser/dce.h +++ b/reactos/win32ss/user/ntuser/dce.h @@ -51,3 +51,5 @@ void FASTCALL DceFreeClassDCE(HDC); HWND FASTCALL UserGethWnd(HDC,PWNDOBJ*); void FASTCALL DceFreeWindowDCE(PWND); void FASTCALL DceFreeThreadDCE(PTHREADINFO); +VOID FASTCALL DceUpdateVisRgn(DCE *Dce, PWND Window, ULONG Flags); +DCE* FASTCALL DceGetDceFromDC(HDC hdc); diff --git a/reactos/win32ss/user/ntuser/windc.c b/reactos/win32ss/user/ntuser/windc.c index 4e697dfc079..492e09e66a4 100644 --- a/reactos/win32ss/user/ntuser/windc.c +++ b/reactos/win32ss/user/ntuser/windc.c @@ -46,21 +46,47 @@ DceCreateDisplayDC(VOID) return IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); } +/* Returns the DCE pointer from the HDC handle */ +DCE* +FASTCALL +DceGetDceFromDC(HDC hdc) +{ + LIST_ENTRY* Entry = LEDce.Flink; + DCE* dce; + + while (Entry != &LEDce) + { + dce = CONTAINING_RECORD(Entry, DCE, List); + if (dce->hDC == hdc) + return dce; + Entry = Entry->Flink; + } + + return NULL; +} + static -HRGN FASTCALL +PREGION FASTCALL DceGetVisRgn(PWND Window, ULONG Flags, HWND hWndChild, ULONG CFlags) { - HRGN VisRgn; + PREGION RetRgn; + HRGN hVisRgn; + hVisRgn = VIS_ComputeVisibleRegion( Window, + 0 == (Flags & DCX_WINDOW), + 0 != (Flags & DCX_CLIPCHILDREN), + 0 != (Flags & DCX_CLIPSIBLINGS)); - VisRgn = VIS_ComputeVisibleRegion( Window, - 0 == (Flags & DCX_WINDOW), - 0 != (Flags & DCX_CLIPCHILDREN), - 0 != (Flags & DCX_CLIPSIBLINGS)); + RetRgn = IntSysCreateRectpRgn(0, 0, 0, 0); - if (VisRgn == NULL) - VisRgn = IntSysCreateRectRgn(0, 0, 0, 0); + if (hVisRgn != NULL) + { + PREGION VisRgn = REGION_LockRgn(hVisRgn); + IntGdiCombineRgn(RetRgn, VisRgn, NULL, RGN_COPY); + REGION_UnlockRgn(VisRgn); + GreDeleteObject(hVisRgn); + } - return VisRgn; + return RetRgn; } PDCE FASTCALL @@ -150,6 +176,7 @@ DceSetDrawable( PWND Window OPTIONAL, dc->ptlDCOrig.y = Window->rcClient.top; } } + dc->fs |= DC_FLAG_DIRTY_RAO; DC_UnlockDc(dc); } @@ -175,10 +202,11 @@ DceDeleteClipRgn(DCE* Dce) IntGdiSetHookFlags(Dce->hDC, DCHF_INVALIDATEVISRGN); } -static VOID FASTCALL +VOID +FASTCALL DceUpdateVisRgn(DCE *Dce, PWND Window, ULONG Flags) { - HANDLE hRgnVisible = NULL; + PREGION RgnVisible = NULL; ULONG DcxFlags; PWND DesktopWindow; @@ -189,7 +217,7 @@ DceUpdateVisRgn(DCE *Dce, PWND Window, ULONG Flags) Parent = Window->spwndParent; if(!Parent) { - hRgnVisible = NULL; + RgnVisible = NULL; goto noparent; } @@ -202,23 +230,23 @@ DceUpdateVisRgn(DCE *Dce, PWND Window, ULONG Flags) { DcxFlags = Flags & ~(DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW); } - hRgnVisible = DceGetVisRgn(Parent, DcxFlags, Window->head.h, Flags); + RgnVisible = DceGetVisRgn(Parent, DcxFlags, Window->head.h, Flags); } else if (Window == NULL) { DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); if (NULL != DesktopWindow) { - hRgnVisible = IntSysCreateRectRgnIndirect(&DesktopWindow->rcWindow); + RgnVisible = IntSysCreateRectpRgnIndirect(&DesktopWindow->rcWindow); } else { - hRgnVisible = NULL; + RgnVisible = NULL; } } else { - hRgnVisible = DceGetVisRgn(Window, Flags, 0, 0); + RgnVisible = DceGetVisRgn(Window, Flags, 0, 0); } noparent: @@ -226,33 +254,37 @@ noparent: { if(Dce->hrgnClip != NULL) { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_AND); + PREGION RgnClip = REGION_LockRgn(Dce->hrgnClip); + IntGdiCombineRgn(RgnVisible, RgnVisible, RgnClip, RGN_AND); + REGION_UnlockRgn(RgnClip); } else { - if(hRgnVisible != NULL) + if(RgnVisible != NULL) { - GreDeleteObject(hRgnVisible); + REGION_Delete(RgnVisible); } - hRgnVisible = IntSysCreateRectRgn(0, 0, 0, 0); + RgnVisible = IntSysCreateRectpRgn(0, 0, 0, 0); } } - else if (Flags & DCX_EXCLUDERGN && Dce->hrgnClip != NULL) + else if ((Flags & DCX_EXCLUDERGN) && Dce->hrgnClip != NULL) { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_DIFF); + PREGION RgnClip = REGION_LockRgn(Dce->hrgnClip); + IntGdiCombineRgn(RgnVisible, RgnVisible, RgnClip, RGN_DIFF); + REGION_UnlockRgn(RgnClip); } Dce->DCXFlags &= ~DCX_DCEDIRTY; - GdiSelectVisRgn(Dce->hDC, hRgnVisible); + GdiSelectVisRgn(Dce->hDC, RgnVisible); if (VerifyWnd(Window)) // Window maybe dead by this time before finishing the DCE release. { IntEngWindowChanged(Window, WOC_RGN_CLIENT); } - if (hRgnVisible != NULL) + if (RgnVisible != NULL) { - GreDeleteObject(hRgnVisible); + REGION_Delete(RgnVisible); } } @@ -889,10 +921,10 @@ DceResetActiveDCEs(PWND Window) dc->ptlDCOrig.y = CurrentWindow->rcClient.top; } - if (NULL != dc->rosdc.hClipRgn) + if (NULL != dc->dclevel.prgnClip) { - NtGdiOffsetRgn(dc->rosdc.hClipRgn, DeltaX, DeltaY); - CLIPPING_UpdateGCRegion(dc); + IntGdiOffsetRgn(dc->dclevel.prgnClip, DeltaX, DeltaY); + dc->fs |= DC_FLAG_DIRTY_RAO; } if (NULL != pDCE->hrgnClip) { From 304292d17ed37fd6b6f99ce1e2ea83f01d28d529 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 23 Jul 2014 18:50:09 +0000 Subject: [PATCH 65/75] [WBEMPROX] - Don't omit lpBytesReturned in DeviceIoControl call ROSTESTS-120 #resolve svn path=/trunk/; revision=63733 --- reactos/dll/win32/wbemprox/builtin.c | 3 ++- rostests/winetests/wbemprox/query.c | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/wbemprox/builtin.c b/reactos/dll/win32/wbemprox/builtin.c index c053be79646..b2369e710ac 100644 --- a/reactos/dll/win32/wbemprox/builtin.c +++ b/reactos/dll/win32/wbemprox/builtin.c @@ -1477,6 +1477,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; + DWORD bytes_returned; free.QuadPart = 512 * 1024 * 1024; GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); @@ -1485,7 +1486,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) { - if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), &bytes_returned, NULL )) *disksize = info.DiskSize.QuadPart; CloseHandle( handle ); } diff --git a/rostests/winetests/wbemprox/query.c b/rostests/winetests/wbemprox/query.c index e1ed5beb49e..d244dad3109 100644 --- a/rostests/winetests/wbemprox/query.c +++ b/rostests/winetests/wbemprox/query.c @@ -675,14 +675,7 @@ START_TEST(query) RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); - if (!winetest_interactive) - { - skip("test_select( services ), ROSTESTS-120\n"); - } - else - { - test_select( services ); - } + test_select( services ); test_Win32_Process( services ); test_Win32_Service( services ); test_StdRegProv( services ); From dca53f8c007c421e17999892c594cc66da6b5011 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Thu, 24 Jul 2014 08:40:51 +0000 Subject: [PATCH 66/75] [NTOS:CC] - Remove useless list entry from ROS_VACB svn path=/trunk/; revision=63734 --- reactos/ntoskrnl/cc/fs.c | 1 - reactos/ntoskrnl/cc/view.c | 5 ----- reactos/ntoskrnl/include/internal/cc.h | 1 - 3 files changed, 7 deletions(-) diff --git a/reactos/ntoskrnl/cc/fs.c b/reactos/ntoskrnl/cc/fs.c index 2b95fb19376..27f6455904c 100644 --- a/reactos/ntoskrnl/cc/fs.c +++ b/reactos/ntoskrnl/cc/fs.c @@ -168,7 +168,6 @@ CcSetFileSizes ( if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) { RemoveEntryList(¤t->CacheMapVacbListEntry); - RemoveEntryList(¤t->VacbListEntry); RemoveEntryList(¤t->VacbLruListEntry); if (current->Dirty) { diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c index 0584917098c..10bf34cb248 100644 --- a/reactos/ntoskrnl/cc/view.c +++ b/reactos/ntoskrnl/cc/view.c @@ -42,7 +42,6 @@ /* GLOBALS *******************************************************************/ static LIST_ENTRY DirtyVacbListHead; -static LIST_ENTRY VacbListHead; static LIST_ENTRY VacbLruListHead; ULONG DirtyPageCount = 0; @@ -331,7 +330,6 @@ retry: ASSERT(!current->MappedCount); RemoveEntryList(¤t->CacheMapVacbListEntry); - RemoveEntryList(¤t->VacbListEntry); RemoveEntryList(¤t->VacbLruListEntry); InsertHeadList(&FreeList, ¤t->CacheMapVacbListEntry); @@ -688,7 +686,6 @@ CcRosCreateVacb ( InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, ¤t->CacheMapVacbListEntry); } KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - InsertTailList(&VacbListHead, ¤t->VacbListEntry); InsertTailList(&VacbLruListHead, ¤t->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); @@ -1040,7 +1037,6 @@ CcRosDeleteFileCache ( { current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - RemoveEntryList(¤t->VacbListEntry); RemoveEntryList(¤t->VacbLruListEntry); if (current->Dirty) { @@ -1267,7 +1263,6 @@ CcInitView ( { DPRINT("CcInitView()\n"); - InitializeListHead(&VacbListHead); InitializeListHead(&DirtyVacbListHead); InitializeListHead(&VacbLruListHead); KeInitializeGuardedMutex(&ViewLock); diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h index 57649deec89..3e559f8888b 100644 --- a/reactos/ntoskrnl/include/internal/cc.h +++ b/reactos/ntoskrnl/include/internal/cc.h @@ -135,7 +135,6 @@ typedef struct _ROS_VACB /* Entry in the list of VACBs which are dirty. */ LIST_ENTRY DirtyVacbListEntry; /* Entry in the list of VACBs. */ - LIST_ENTRY VacbListEntry; LIST_ENTRY VacbLruListEntry; /* Offset in the file which this view maps. */ LARGE_INTEGER FileOffset; From f3b4339291db7a115aecd9c7a657afe39dd09c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Fri, 25 Jul 2014 10:56:50 +0000 Subject: [PATCH 67/75] [WIN32K] - Improve parameter checking in NtGdiExtSelectClipRgn - Update the DC clipping regions before getting the clipbox svn path=/trunk/; revision=63735 --- reactos/win32ss/gdi/ntgdi/cliprgn.c | 33 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/reactos/win32ss/gdi/ntgdi/cliprgn.c b/reactos/win32ss/gdi/ntgdi/cliprgn.c index a5699ab19eb..42d5d29ae3b 100644 --- a/reactos/win32ss/gdi/ntgdi/cliprgn.c +++ b/reactos/win32ss/gdi/ntgdi/cliprgn.c @@ -44,9 +44,9 @@ IntGdiExtSelectClipRgn( PREGION prgn, int fnMode) { - if (!prgn) + if (fnMode == RGN_COPY) { - if (fnMode == RGN_COPY) + if (!prgn) { if (dc->dclevel.prgnClip != NULL) { @@ -56,13 +56,15 @@ IntGdiExtSelectClipRgn( } return SIMPLEREGION; } - else - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return ERROR; - } + + if (!dc->dclevel.prgnClip) + dc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + + return IntGdiCombineRgn(dc->dclevel.prgnClip, prgn, NULL, RGN_COPY); } + ASSERT(prgn != NULL); + if (!dc->dclevel.prgnClip) { RECTL rect; @@ -73,9 +75,6 @@ IntGdiExtSelectClipRgn( dc->fs |= DC_FLAG_DIRTY_RAO; - if(fnMode == RGN_COPY) - return IntGdiCombineRgn(dc->dclevel.prgnClip, prgn, 0, fnMode); - return IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, prgn, fnMode); } @@ -99,8 +98,15 @@ NtGdiExtSelectClipRgn( prgn = REGION_LockRgn(hrgn); - /* IntGdiExtSelectClipRgn takes care of checking for NULL region */ - retval = IntGdiExtSelectClipRgn(dc, prgn, fnMode); + if ((prgn == NULL) && (fnMode != RGN_COPY)) + { + EngSetLastError(ERROR_INVALID_HANDLE); + retval = ERROR; + } + else + { + retval = IntGdiExtSelectClipRgn(dc, prgn, fnMode); + } if (prgn) REGION_UnlockRgn(prgn); @@ -121,6 +127,9 @@ GdiGetClipBox(HDC hDC, PRECTL rc) return ERROR; } + if (dc->fs & DC_FLAG_DIRTY_RAO) + CLIPPING_UpdateGCRegion(dc); + /* FIXME: Rao and Vis only! */ if (dc->prgnAPI) // APIRGN { From 0e90ca943ec20c5434f35f1f31d9498822da2743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Fri, 25 Jul 2014 22:13:35 +0000 Subject: [PATCH 68/75] [NTOS/MM] - First implementation of NtProtectVirtualMemory with Transition PTE - Release PTE frame page after erasing the PTE to avoid useless page fault svn path=/trunk/; revision=63736 --- reactos/ntoskrnl/mm/ARM3/pagfault.c | 31 +++++++++-- reactos/ntoskrnl/mm/ARM3/pfnlist.c | 2 - reactos/ntoskrnl/mm/ARM3/virtual.c | 86 +++++++++++++++++++++-------- 3 files changed, 90 insertions(+), 29 deletions(-) diff --git a/reactos/ntoskrnl/mm/ARM3/pagfault.c b/reactos/ntoskrnl/mm/ARM3/pagfault.c index 662d1ea9702..0236bbf1655 100644 --- a/reactos/ntoskrnl/mm/ARM3/pagfault.c +++ b/reactos/ntoskrnl/mm/ARM3/pagfault.c @@ -1310,20 +1310,41 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, } } + /* Is this a transition PTE */ + if (TempPte.u.Soft.Transition) + { + PVOID InPageBlock = NULL; + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Resolve */ + Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); + + NT_ASSERT(NT_SUCCESS(Status)); + + /* And now release the lock and leave*/ + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; + } + // // The PTE must be invalid but not completely empty. It must also not be a - // prototype PTE as that scenario should've been handled above. These are - // all Windows checks + // prototype or transition PTE as those scenarii should've been handled above. + // These are all Windows checks // ASSERT(TempPte.u.Hard.Valid == 0); ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Long != 0); // - // No transition or page file software PTEs in ARM3 yet, so this must be a - // demand zero page. These are all ReactOS checks + // No page file software PTEs in ARM3 yet, so this must be a + // demand zero page. This is a ReactOS check. // - ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Soft.PageFileHigh == 0); // diff --git a/reactos/ntoskrnl/mm/ARM3/pfnlist.c b/reactos/ntoskrnl/mm/ARM3/pfnlist.c index af132b2e4a7..12b33cec0e7 100644 --- a/reactos/ntoskrnl/mm/ARM3/pfnlist.c +++ b/reactos/ntoskrnl/mm/ARM3/pfnlist.c @@ -292,7 +292,6 @@ MiUnlinkPageFromList(IN PMMPFN Pfn) ListHead = &MmModifiedPageListByColor[0]; /* Decrease transition page counter */ - ASSERT(Pfn->u3.e1.PrototypePte == 1); /* Only supported ARM3 case */ MmTransitionSharedPages--; } else if (ListHead == &MmModifiedNoWritePageListHead) @@ -984,7 +983,6 @@ MiInsertPageInList(IN PMMPFNLIST ListHead, ASSERT(Pfn1->OriginalPte.u.Soft.PageFileHigh == 0); /* One more transition page */ - ASSERT(Pfn1->u3.e1.PrototypePte == 1); MmTransitionSharedPages++; /* Increment the number of per-process modified pages */ diff --git a/reactos/ntoskrnl/mm/ARM3/virtual.c b/reactos/ntoskrnl/mm/ARM3/virtual.c index fc8762971a4..97d76011596 100644 --- a/reactos/ntoskrnl/mm/ARM3/virtual.c +++ b/reactos/ntoskrnl/mm/ARM3/virtual.c @@ -404,13 +404,36 @@ MiDeletePte(IN PMMPTE PointerPte, /* Capture the PTE */ TempPte = *PointerPte; - /* We only support valid PTEs for now */ - ASSERT(TempPte.u.Hard.Valid == 1); + /* See if the PTE is valid */ if (TempPte.u.Hard.Valid == 0) { - /* Invalid PTEs not supported yet */ + /* Prototype PTEs not supported yet */ ASSERT(TempPte.u.Soft.Prototype == 0); - ASSERT(TempPte.u.Soft.Transition == 0); + if (TempPte.u.Soft.Transition) + { + /* Get the PFN entry */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + + DPRINT1("Pte %p is transitional!\n", PointerPte); + + /* Destroy the PTE */ + MI_ERASE_PTE(PointerPte); + + /* Drop the reference on the page table. */ + MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + + if (Pfn1->u2.ShareCount == 0) + { + NT_ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + /* Mark the page temporarily as valid, we're going to make it free soon */ + Pfn1->u3.e1.PageLocation = ActiveAndValid; + + /* Bring it back into the free list */ + MiInsertPageInFreeList(PageFrameIndex); + } + return; + } } /* Get the PFN entry */ @@ -457,6 +480,9 @@ MiDeletePte(IN PMMPTE PointerPte, (ULONG_PTR)Pfn1->PteAddress); } } + + /* Erase it */ + MI_ERASE_PTE(PointerPte); } else { @@ -471,6 +497,9 @@ MiDeletePte(IN PMMPTE PointerPte, (ULONG_PTR)Pfn1->PteAddress); } + /* Erase the PTE */ + MI_ERASE_PTE(PointerPte); + /* There should only be 1 shared reference count */ ASSERT(Pfn1->u2.ShareCount == 1); @@ -485,8 +514,7 @@ MiDeletePte(IN PMMPTE PointerPte, //CurrentProcess->NumberOfPrivatePages--; } - /* Destroy the PTE and flush the TLB */ - MI_ERASE_PTE(PointerPte); + /* Flush the TLB */ KeFlushCurrentTb(); } @@ -2053,7 +2081,7 @@ MiProtectVirtualMemory(IN PEPROCESS Process, /* Check for ROS specific memory area */ MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); - if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) + if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { /* Evil hack */ return MiRosProtectVirtualMemory(Process, @@ -2231,27 +2259,41 @@ MiProtectVirtualMemory(IN PEPROCESS Process, if ((NewAccessProtection & PAGE_NOACCESS) || (NewAccessProtection & PAGE_GUARD)) { - /* The page should be in the WS and we should make it transition now */ - DPRINT1("Making valid page invalid is not yet supported!\n"); - Status = STATUS_NOT_IMPLEMENTED; - /* Unlock the working set */ - MiUnlockProcessWorkingSetUnsafe(Process, Thread); - goto FailPath; - } + KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* Write the protection mask and write it with a TLB flush */ - Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; - MiFlushTbAndCapture(Vad, - PointerPte, - ProtectionMask, - Pfn1, - TRUE); + /* Mark the PTE as transition and change its protection */ + PteContents.u.Hard.Valid = 0; + PteContents.u.Soft.Transition = 1; + PteContents.u.Trans.Protection = ProtectionMask; + /* Decrease PFN share count and write the PTE */ + MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&PteContents)); + // FIXME: remove the page from the WS + MI_WRITE_INVALID_PTE(PointerPte, PteContents); +#ifdef CONFIG_SMP + // FIXME: Should invalidate entry in every CPU TLB + ASSERT(FALSE); +#endif + KeInvalidateTlbEntry(MiPteToAddress(PointerPte)); + + /* We are done for this PTE */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + else + { + /* Write the protection mask and write it with a TLB flush */ + Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; + MiFlushTbAndCapture(Vad, + PointerPte, + ProtectionMask, + Pfn1, + TRUE); + } } else { /* We don't support these cases yet */ ASSERT(PteContents.u.Soft.Prototype == 0); - ASSERT(PteContents.u.Soft.Transition == 0); + //ASSERT(PteContents.u.Soft.Transition == 0); /* The PTE is already demand-zero, just update the protection mask */ PteContents.u.Soft.Protection = ProtectionMask; From 5398dcffe8c74ccd0e510919c0ce57e7aae92bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:40:44 +0000 Subject: [PATCH 69/75] [WIN32K] - Use debug channel for debug outputs svn path=/trunk/; revision=63737 --- reactos/win32ss/gdi/eng/engwindow.c | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index 423f61f79e2..0a25052360e 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -7,9 +7,8 @@ */ #include - -#define NDEBUG #include +DBG_DEFAULT_CHANNEL(EngWnd); INT gcountPWO = 0; @@ -42,7 +41,7 @@ IntEngWndCallChangeProc( pwo = NULL; } - DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", + TRACE("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", WndObjInt->ChangeProc, flChanged); WndObjInt->ChangeProc(pwo, flChanged); } @@ -61,7 +60,7 @@ IntEngWndUpdateClipObj( CLIPOBJ *ClipObj = NULL; CLIPOBJ *OldClipObj; - DPRINT("IntEngWndUpdateClipObj\n"); + TRACE("IntEngWndUpdateClipObj\n"); hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) @@ -74,15 +73,15 @@ IntEngWndUpdateClipObj( { ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); - DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); - DPRINT(" BoundingRect: %d, %d %d, %d\n", + TRACE("Created visible region with %lu rects\n", visRgn->rdh.nCount); + TRACE(" BoundingRect: %d, %d %d, %d\n", visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); { ULONG i; for (i = 0; i < visRgn->rdh.nCount; i++) { - DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, + TRACE(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, visRgn->Buffer[i].left, visRgn->Buffer[i].top, visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); } @@ -92,13 +91,13 @@ IntEngWndUpdateClipObj( } else { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + WARN("Couldn't lock visible region of window DC\n"); } GreDeleteObject(hVisRgn); } else { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); + WARN("VIS_ComputeVisibleRegion failed!\n"); } if (ClipObj == NULL) @@ -110,7 +109,7 @@ IntEngWndUpdateClipObj( if (ClipObj == NULL) { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); + ERR("IntEngCreateClipRegion() failed!\n"); return FALSE; } @@ -192,7 +191,7 @@ EngCreateWnd( BOOL calledFromUser; DECLARE_RETURN(WNDOBJ*); - DPRINT1("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", + TRACE("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", pso, hWnd, pfn, fl, iPixelFormat); calledFromUser = UserIsEntered(); @@ -211,7 +210,7 @@ EngCreateWnd( WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); if (WndObjInt == NULL) { - DPRINT1("Failed to allocate memory for a WND structure!\n"); + ERR("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } @@ -238,7 +237,7 @@ EngCreateWnd( IntSetProp(Window, AtomWndObj, WndObjInt); ++gcountPWO; - DPRINT("EngCreateWnd: SUCCESS!\n"); + TRACE("EngCreateWnd: SUCCESS!\n"); RETURN( WndObjUser); @@ -264,7 +263,7 @@ EngDeleteWnd( PWND Window; BOOL calledFromUser; - DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); + TRACE("EngDeleteWnd: pwo = 0x%p\n", pwo); calledFromUser = UserIsEntered(); if (!calledFromUser) { @@ -275,7 +274,7 @@ EngDeleteWnd( Window = UserGetWindowObject(WndObjInt->Hwnd); if (Window == NULL) { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + ERR("Couldnt get window object for WndObjInt->Hwnd!!!\n"); } else { @@ -307,10 +306,10 @@ WNDOBJ_bEnum( WNDGDI *WndObjInt = ObjToGDI(pwo, WND); BOOL Ret; - DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); + TRACE("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); + TRACE("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); return Ret; } @@ -329,13 +328,13 @@ WNDOBJ_cEnumStart( WNDGDI *WndObjInt = ObjToGDI(pwo, WND); ULONG Ret; - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", + TRACE("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", pwo, iType, iDirection, cLimit); /* FIXME: Should we enumerate all rectangles or not? */ Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); + TRACE("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); return Ret; } @@ -351,7 +350,7 @@ WNDOBJ_vSetConsumer( { BOOL Hack; - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); + TRACE("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); Hack = (pwo->pvConsumer == NULL); pwo->pvConsumer = pvConsumer; @@ -366,6 +365,7 @@ WNDOBJ_vSetConsumer( */ if (Hack) { + FIXME("Is this hack really needed?\n"); IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); IntEngWndCallChangeProc(pwo, WOC_CHANGED); IntEngWndCallChangeProc(pwo, WOC_DRAWN); From f00899b37893429d7a5e919cc64cdc59bab2ce4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:40:57 +0000 Subject: [PATCH 70/75] [WIN32K] - Do not offset the window visible region when creating the WNDOBJ, it's already fine svn path=/trunk/; revision=63738 --- reactos/win32ss/gdi/eng/engwindow.c | 1 - 1 file changed, 1 deletion(-) diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index 0a25052360e..c5b4d937814 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -65,7 +65,6 @@ IntEngWndUpdateClipObj( hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) { - NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); if (visRgn != NULL) { From 4069d63c30225d869768c99245cc85f0b9096714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:41:08 +0000 Subject: [PATCH 71/75] [WIN32K] - Improve the WNDOBJ/CLIPOBJ hack by using the same internal structure for both object. This way a driver can enumerate WNDOBJ::coClient safely. Also take this as an opportunity to get rid of DC::ros_dc. svn path=/trunk/; revision=63739 --- reactos/win32ss/gdi/eng/bitblt.c | 12 ++- reactos/win32ss/gdi/eng/clip.c | 117 ++++++++++++----------- reactos/win32ss/gdi/eng/engobjects.h | 30 +++--- reactos/win32ss/gdi/eng/engwindow.c | 98 +++++++------------ reactos/win32ss/gdi/eng/inteng.h | 14 ++- reactos/win32ss/gdi/eng/lineto.c | 5 +- reactos/win32ss/gdi/ntgdi/arc.c | 4 +- reactos/win32ss/gdi/ntgdi/bitblt.c | 10 +- reactos/win32ss/gdi/ntgdi/cliprgn.c | 16 +--- reactos/win32ss/gdi/ntgdi/dc.h | 8 -- reactos/win32ss/gdi/ntgdi/dclife.c | 8 +- reactos/win32ss/gdi/ntgdi/dibobj.c | 4 +- reactos/win32ss/gdi/ntgdi/drawing.c | 2 +- reactos/win32ss/gdi/ntgdi/fillshap.c | 18 ++-- reactos/win32ss/gdi/ntgdi/freetype.c | 6 +- reactos/win32ss/gdi/ntgdi/line.c | 4 +- reactos/win32ss/gdi/ntgdi/polyfill.c | 8 +- reactos/win32ss/gdi/ntgdi/region.c | 11 +-- reactos/win32ss/gdi/ntgdi/wingl.c | 2 + reactos/win32ss/user/ntuser/cursoricon.c | 4 +- reactos/win32ss/user/ntuser/windc.c | 10 +- 21 files changed, 182 insertions(+), 209 deletions(-) diff --git a/reactos/win32ss/gdi/eng/bitblt.c b/reactos/win32ss/gdi/eng/bitblt.c index 5753000b24a..96b031f1acf 100644 --- a/reactos/win32ss/gdi/eng/bitblt.c +++ b/reactos/win32ss/gdi/eng/bitblt.c @@ -14,7 +14,17 @@ XCLIPOBJ gxcoTrivial = { - {0, {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, DC_TRIVIAL, FC_RECT, TC_RECTANGLES, 0}, + /* CLIPOBJ */ + { + { + 0, /* iUniq */ + {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, /* rclBounds */ + DC_TRIVIAL, /* idCOmplexity */ + FC_RECT, /* iFComplexity */ + TC_RECTANGLES, /* iMode */ + 0 /* fjOptions */ + }, + }, 0, 0, 0 }; diff --git a/reactos/win32ss/gdi/eng/clip.c b/reactos/win32ss/gdi/eng/clip.c index bce0502cf45..7a7381581e1 100644 --- a/reactos/win32ss/gdi/eng/clip.c +++ b/reactos/win32ss/gdi/eng/clip.c @@ -190,63 +190,63 @@ CompareSpans( VOID FASTCALL -IntEngDeleteClipRegion(CLIPOBJ *ClipObj) +IntEngInitClipObj(XCLIPOBJ *Clip) { - EngFreeMem(ObjToGDI(ClipObj, CLIP)); + Clip->Rects = &Clip->ClipObj.rclBounds; } -CLIPOBJ* -FASTCALL -IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds) +VOID FASTCALL +IntEngFreeClipResources(XCLIPOBJ *Clip) { - CLIPGDI *Clip; + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); +} + +VOID +FASTCALL +IntEngUpdateClipRegion( + XCLIPOBJ* Clip, + ULONG count, + const RECTL* pRect, + const RECTL* rcBounds) +{ if(count > 1) { - RECTL *dest; + RECTL* NewRects = EngAllocMem(0, FIELD_OFFSET(ENUMRECTS, arcl[count]), GDITAG_CLIPOBJ); - Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), GDITAG_CLIPOBJ); - - if(Clip != NULL) + if(NewRects != NULL) { - Clip->EnumRects.c = count; + Clip->RectCount = count; Clip->EnumOrder = CD_ANY; - for(dest = Clip->EnumRects.arcl;count > 0; count--, dest++, pRect++) - { - *dest = *pRect; - } + RtlCopyMemory(NewRects, pRect, count * sizeof(RECTL)); Clip->ClipObj.iDComplexity = DC_COMPLEX; - Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4 : FC_COMPLEX); + Clip->ClipObj.iFComplexity = ((Clip->RectCount <= 4) ? FC_RECT4 : FC_COMPLEX); Clip->ClipObj.iMode = TC_RECTANGLES; Clip->ClipObj.rclBounds = *rcBounds; - return GDIToObj(Clip, CLIP); + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); + Clip->Rects = NewRects; } } else { - Clip = EngAllocMem(0, sizeof(CLIPGDI), GDITAG_CLIPOBJ); + Clip->EnumOrder = CD_ANY; - if(Clip != NULL) - { - Clip->EnumRects.c = 1; - Clip->EnumOrder = CD_ANY; - Clip->EnumRects.arcl[0] = *rcBounds; + Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && + (rcBounds->left == rcBounds->right)) + ? DC_TRIVIAL : DC_RECT); - Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && - (rcBounds->left == rcBounds->right)) - ? DC_TRIVIAL : DC_RECT); - - Clip->ClipObj.iFComplexity = FC_RECT; - Clip->ClipObj.iMode = TC_RECTANGLES; - Clip->ClipObj.rclBounds = *rcBounds; - - return GDIToObj(Clip, CLIP); - } + Clip->ClipObj.iFComplexity = FC_RECT; + Clip->ClipObj.iMode = TC_RECTANGLES; + Clip->ClipObj.rclBounds = *rcBounds; + Clip->RectCount = 1; + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); + Clip->Rects = &Clip->ClipObj.rclBounds; } - - return NULL; } /* @@ -259,7 +259,8 @@ EngCreateClip(VOID) CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), GDITAG_CLIPOBJ); if(Clip != NULL) { - return GDIToObj(Clip, CLIP); + Clip->Rects = &Clip->ClipObj.rclBounds; + return &Clip->ClipObj; } return NULL; @@ -273,7 +274,10 @@ APIENTRY EngDeleteClip( _In_ _Post_ptr_invalid_ CLIPOBJ *pco) { - EngFreeMem(ObjToGDI(pco, CLIP)); + XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + if (Clip->Rects != &Clip->ClipObj.rclBounds) + EngFreeMem(Clip->Rects); + EngFreeMem(Clip); } /* @@ -288,13 +292,13 @@ CLIPOBJ_cEnumStart( _In_ ULONG iDirection, _In_ ULONG cMaxRects) { - CLIPGDI *ClipGDI = ObjToGDI(pco, CLIP); + XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); SORTCOMP CompareFunc; - ClipGDI->EnumPos = 0; - ClipGDI->EnumMax = (cMaxRects > 0) ? cMaxRects : ClipGDI->EnumRects.c; + Clip->EnumPos = 0; + Clip->EnumMax = (cMaxRects > 0) ? cMaxRects : Clip->RectCount; - if (CD_ANY != iDirection && ClipGDI->EnumOrder != iDirection) + if (CD_ANY != iDirection && Clip->EnumOrder != iDirection) { switch (iDirection) { @@ -316,26 +320,26 @@ CLIPOBJ_cEnumStart( default: DPRINT1("Invalid iDirection %lu\n", iDirection); - iDirection = ClipGDI->EnumOrder; + iDirection = Clip->EnumOrder; CompareFunc = NULL; break; } if (NULL != CompareFunc) { - EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c, CompareFunc); + EngSort((PBYTE) Clip->Rects, sizeof(RECTL), Clip->RectCount, CompareFunc); } - ClipGDI->EnumOrder = iDirection; + Clip->EnumOrder = iDirection; } /* Return the number of rectangles enumerated */ - if ((cMaxRects > 0) && (ClipGDI->EnumRects.c > cMaxRects)) + if ((cMaxRects > 0) && (Clip->RectCount > cMaxRects)) { return 0xFFFFFFFF; } - return ClipGDI->EnumRects.c; + return Clip->RectCount; } /* @@ -348,14 +352,14 @@ CLIPOBJ_bEnum( _In_ ULONG cj, _Out_bytecap_(cj) ULONG *pulEnumRects) { - RECTL *dest, *src; - CLIPGDI *ClipGDI = ObjToGDI(pco, CLIP); - ULONG nCopy, i; + const RECTL* src; + XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + ULONG nCopy; ENUMRECTS* pERects = (ENUMRECTS*)pulEnumRects; // Calculate how many rectangles we should copy - nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos, - min( ClipGDI->EnumRects.c - ClipGDI->EnumPos, + nCopy = min( Clip->EnumMax - Clip->EnumPos, + min( Clip->RectCount - Clip->EnumPos, (cj - sizeof(ULONG)) / sizeof(RECTL))); if(nCopy == 0) @@ -364,17 +368,14 @@ CLIPOBJ_bEnum( } /* Copy rectangles */ - src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos; - for(i = 0, dest = pERects->arcl; i < nCopy; i++, dest++, src++) - { - *dest = *src; - } + src = &Clip->Rects[Clip->EnumPos]; + RtlCopyMemory(pERects->arcl, src, nCopy * sizeof(RECTL)); pERects->c = nCopy; - ClipGDI->EnumPos+=nCopy; + Clip->EnumPos+=nCopy; - return ClipGDI->EnumPos < ClipGDI->EnumRects.c; + return Clip->EnumPos < Clip->RectCount; } /* EOF */ diff --git a/reactos/win32ss/gdi/eng/engobjects.h b/reactos/win32ss/gdi/eng/engobjects.h index 12840a84a3d..a65772d4d60 100644 --- a/reactos/win32ss/gdi/eng/engobjects.h +++ b/reactos/win32ss/gdi/eng/engobjects.h @@ -68,11 +68,22 @@ typedef struct _XCLIPOBJ } */ typedef struct _CLIPGDI { - CLIPOBJ ClipObj; - ULONG EnumPos; - ULONG EnumOrder; - ULONG EnumMax; - ENUMRECTS EnumRects; + union + { + CLIPOBJ ClipObj; + WNDOBJ WndObj; + }; + /* WNDOBJ part */ + HWND Hwnd; + WNDOBJCHANGEPROC ChangeProc; + FLONG Flags; + int PixelFormat; + /* CLIPOBJ part */ + ULONG EnumPos; + ULONG EnumOrder; + ULONG EnumMax; + ULONG RectCount; + RECTL* Rects; } CLIPGDI, *PCLIPGDI; // HACK, until we use the original structure @@ -112,15 +123,6 @@ typedef struct _PATHGDI { PATHOBJ PathObj; } PATHGDI; -typedef struct _WNDGDI { - WNDOBJ WndObj; - HWND Hwnd; - CLIPOBJ *ClientClipObj; - WNDOBJCHANGEPROC ChangeProc; - FLONG Flags; - int PixelFormat; -} WNDGDI, *PWNDGDI; - typedef struct _XFORMGDI { ULONG Dummy; /* XFORMOBJ has no public members */ diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index c5b4d937814..34003ceff5a 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -21,15 +21,15 @@ IntEngWndCallChangeProc( IN WNDOBJ *pwo, IN FLONG flChanged) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); - if (WndObjInt->ChangeProc == NULL) + if (Clip->ChangeProc == NULL) { return; } /* check flags of the WNDOBJ */ - flChanged &= WndObjInt->Flags; + flChanged &= Clip->Flags; if (flChanged == 0) { return; @@ -42,8 +42,8 @@ IntEngWndCallChangeProc( } TRACE("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); + Clip->ChangeProc, flChanged); + Clip->ChangeProc(pwo, flChanged); } /* @@ -52,13 +52,11 @@ IntEngWndCallChangeProc( BOOLEAN FASTCALL IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, + XCLIPOBJ* Clip, PWND Window) { HRGN hVisRgn; PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; TRACE("IntEngWndUpdateClipObj\n"); @@ -70,8 +68,7 @@ IntEngWndUpdateClipObj( { if (visRgn->rdh.nCount > 0) { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, - &visRgn->rdh.rcBound); + IntEngUpdateClipRegion(Clip, visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); TRACE("Created visible region with %lu rects\n", visRgn->rdh.nCount); TRACE(" BoundingRect: %d, %d %d, %d\n", visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, @@ -95,28 +92,13 @@ IntEngWndUpdateClipObj( GreDeleteObject(hVisRgn); } else - { - WARN("VIS_ComputeVisibleRegion failed!\n"); - } - - if (ClipObj == NULL) { /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, - &Window->rcClient); + IntEngUpdateClipRegion(Clip, 1, &Window->rcClient, &Window->rcClient); } - if (ClipObj == NULL) - { - ERR("IntEngCreateClipRegion() failed!\n"); - return FALSE; - } - - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); + /* Update the WNDOBJ */ + Clip->WndObj.rclClient = Window->rcClient; return TRUE; } @@ -131,7 +113,7 @@ IntEngWindowChanged( _In_ FLONG flChanged) { PPROPERTY pprop; - WNDGDI *Current; + XCLIPOBJ *Current; HWND hWnd; ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); @@ -142,7 +124,7 @@ IntEngWindowChanged( { return; } - Current = (WNDGDI *)pprop->Data; + Current = (XCLIPOBJ *)pprop->Data; if ( gcountPWO && Current && Current->Hwnd == hWnd && @@ -184,7 +166,7 @@ EngCreateWnd( FLONG fl, int iPixelFormat) { - WNDGDI *WndObjInt = NULL; + XCLIPOBJ *Clip = NULL; WNDOBJ *WndObjUser = NULL; PWND Window; BOOL calledFromUser; @@ -206,34 +188,34 @@ EngCreateWnd( } /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); - if (WndObjInt == NULL) + Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof (XCLIPOBJ), GDITAG_WNDOBJ); + if (Clip == NULL) { ERR("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } + IntEngInitClipObj(Clip); /* Fill the clipobj */ - WndObjInt->ClientClipObj = NULL; - if (!IntEngWndUpdateClipObj(WndObjInt, Window)) + if (!IntEngWndUpdateClipObj(Clip, Window)) { - EngFreeMem(WndObjInt); + EngFreeMem(Clip); RETURN( NULL); } /* Fill user object */ - WndObjUser = GDIToObj(WndObjInt, WND); + WndObjUser = &Clip->WndObj; WndObjUser->psoOwner = pso; WndObjUser->pvConsumer = NULL; /* Fill internal object */ - WndObjInt->Hwnd = hWnd; - WndObjInt->ChangeProc = pfn; - WndObjInt->Flags = fl; - WndObjInt->PixelFormat = iPixelFormat; + Clip->Hwnd = hWnd; + Clip->ChangeProc = pfn; + Clip->Flags = fl; + Clip->PixelFormat = iPixelFormat; /* associate object with window */ - IntSetProp(Window, AtomWndObj, WndObjInt); + IntSetProp(Window, AtomWndObj, Clip); ++gcountPWO; TRACE("EngCreateWnd: SUCCESS!\n"); @@ -258,7 +240,7 @@ APIENTRY EngDeleteWnd( IN WNDOBJ *pwo) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); PWND Window; BOOL calledFromUser; @@ -270,7 +252,7 @@ EngDeleteWnd( } /* Get window object */ - Window = UserGetWindowObject(WndObjInt->Hwnd); + Window = UserGetWindowObject(Clip->Hwnd); if (Window == NULL) { ERR("Couldnt get window object for WndObjInt->Hwnd!!!\n"); @@ -287,8 +269,8 @@ EngDeleteWnd( } /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); + IntEngFreeClipResources(Clip); + EngFreeMem(Clip); } @@ -302,14 +284,8 @@ WNDOBJ_bEnum( IN ULONG cj, OUT ULONG *pul) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; - - TRACE("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - - TRACE("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; + /* Relay */ + return CLIPOBJ_bEnum(&pwo->coClient, cj, pul); } @@ -324,17 +300,9 @@ WNDOBJ_cEnumStart( IN ULONG iDirection, IN ULONG cLimit) { - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - ULONG Ret; - - TRACE("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", - pwo, iType, iDirection, cLimit); - - /* FIXME: Should we enumerate all rectangles or not? */ - Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - - TRACE("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); - return Ret; + /* Relay */ + // FIXME: Should we enumerate all rectangles or not? + return CLIPOBJ_cEnumStart(&pwo->coClient, FALSE, iType, iDirection, cLimit); } diff --git a/reactos/win32ss/gdi/eng/inteng.h b/reactos/win32ss/gdi/eng/inteng.h index a2e48e5f7a3..55b4fe2da05 100644 --- a/reactos/win32ss/gdi/eng/inteng.h +++ b/reactos/win32ss/gdi/eng/inteng.h @@ -114,13 +114,17 @@ IntEngPolyline(SURFOBJ *DestSurf, LONG dCount, MIX mix); -CLIPOBJ* FASTCALL -IntEngCreateClipRegion(ULONG count, - PRECTL pRect, - PRECTL rcBounds); +VOID FASTCALL +IntEngUpdateClipRegion(XCLIPOBJ* Clip, + ULONG count, + const RECTL* pRect, + const RECTL* rcBounds); VOID FASTCALL -IntEngDeleteClipRegion(CLIPOBJ *ClipObj); +IntEngInitClipObj(XCLIPOBJ *Clip); + +VOID FASTCALL +IntEngFreeClipResources(XCLIPOBJ *Clip); BOOL FASTCALL diff --git a/reactos/win32ss/gdi/eng/lineto.c b/reactos/win32ss/gdi/eng/lineto.c index 31b45c84dc5..c26ec9bbe62 100644 --- a/reactos/win32ss/gdi/eng/lineto.c +++ b/reactos/win32ss/gdi/eng/lineto.c @@ -366,11 +366,12 @@ EngLineTo( if (!Clip) { - Clip = pcoPriv = IntEngCreateClipRegion(0, 0, RectBounds); + Clip = pcoPriv = EngCreateClip(); if (!Clip) { return FALSE; } + IntEngUpdateClipRegion((XCLIPOBJ*)Clip, 0, 0, RectBounds); } x1 += Translate.x; @@ -487,7 +488,7 @@ EngLineTo( if (pcoPriv) { - IntEngDeleteClipRegion(pcoPriv); + EngDeleteClip(pcoPriv); } return IntEngLeave(&EnterLeave); diff --git a/reactos/win32ss/gdi/ntgdi/arc.c b/reactos/win32ss/gdi/ntgdi/arc.c index 5d65235fc45..7e329601ae5 100644 --- a/reactos/win32ss/gdi/ntgdi/arc.c +++ b/reactos/win32ss/gdi/ntgdi/arc.c @@ -8,7 +8,7 @@ */ #define PUTPIXEL(x,y,BrushInst) \ ret = ret && IntEngLineTo(&psurf->SurfObj, \ - dc->rosdc.CombinedClip, \ + &dc->co.ClipObj, \ &BrushInst.BrushObject, \ x, y, (x)+1, y, \ &RectBounds, \ @@ -16,7 +16,7 @@ #define PUTLINE(x1,y1,x2,y2,BrushInst) \ ret = ret && IntEngLineTo(&psurf->SurfObj, \ - dc->rosdc.CombinedClip, \ + &dc->co.ClipObj, \ &BrushInst.BrushObject, \ x1, y1, x2, y2, \ &RectBounds, \ diff --git a/reactos/win32ss/gdi/ntgdi/bitblt.c b/reactos/win32ss/gdi/ntgdi/bitblt.c index 7193d7723e0..ba86c99f072 100644 --- a/reactos/win32ss/gdi/ntgdi/bitblt.c +++ b/reactos/win32ss/gdi/ntgdi/bitblt.c @@ -131,7 +131,7 @@ NtGdiAlphaBlend( TRACE("Performing the alpha blend\n"); bResult = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->rosdc.CombinedClip, + &DCDest->co.ClipObj, &exlo.xlo, &DestRect, &SourceRect, @@ -290,7 +290,7 @@ NtGdiTransparentBlt( EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->rosdc.CombinedClip, &exlo.xlo, &rcDest, &rcSrc, + &DCDest->co.ClipObj, &exlo.xlo, &rcDest, &rcSrc, TransparentColor, 0); EXLATEOBJ_vCleanup(&exlo); @@ -487,7 +487,7 @@ NtGdiMaskBlt( Status = IntEngBitBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, psurfMask ? &psurfMask->SurfObj : NULL, - DCDest->rosdc.CombinedClip, + &DCDest->co.ClipObj, XlateObj, &DestRect, &SourcePoint, @@ -697,7 +697,7 @@ GreStretchBltMask( Status = IntEngStretchBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, BitmapMask ? &BitmapMask->SurfObj : NULL, - DCDest->rosdc.CombinedClip, + &DCDest->co.ClipObj, XlateObj, &DCDest->dclevel.ca, &DestRect, @@ -834,7 +834,7 @@ IntPatBlt( &psurf->SurfObj, NULL, NULL, - pdc->rosdc.CombinedClip, + &pdc->co.ClipObj, NULL, &DestRect, NULL, diff --git a/reactos/win32ss/gdi/ntgdi/cliprgn.c b/reactos/win32ss/gdi/ntgdi/cliprgn.c index 42d5d29ae3b..67fa4dfa9dd 100644 --- a/reactos/win32ss/gdi/ntgdi/cliprgn.c +++ b/reactos/win32ss/gdi/ntgdi/cliprgn.c @@ -467,8 +467,6 @@ VOID FASTCALL CLIPPING_UpdateGCRegion(PDC pDC) { - CLIPOBJ * co; - /* Must have VisRgn set to a valid state! */ ASSERT (pDC->prgnVis); @@ -540,16 +538,10 @@ CLIPPING_UpdateGCRegion(PDC pDC) // With pDC->co.pClipRgn->Buffer, // pDC->co.pClipRgn = pDC->prgnRao ? pDC->prgnRao : pDC->prgnVis; - co = IntEngCreateClipRegion(pDC->prgnRao->rdh.nCount, - pDC->prgnRao->Buffer, - &pDC->erclClip); - if (co) - { - if (pDC->rosdc.CombinedClip != NULL) - IntEngDeleteClipRegion(pDC->rosdc.CombinedClip); - - pDC->rosdc.CombinedClip = co; - } + IntEngUpdateClipRegion(&pDC->co, + pDC->prgnRao->rdh.nCount, + pDC->prgnRao->Buffer, + &pDC->erclClip); IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y); } diff --git a/reactos/win32ss/gdi/ntgdi/dc.h b/reactos/win32ss/gdi/ntgdi/dc.h index fbb76775cfe..bced3bf0640 100644 --- a/reactos/win32ss/gdi/ntgdi/dc.h +++ b/reactos/win32ss/gdi/ntgdi/dc.h @@ -46,11 +46,6 @@ typedef enum _DCTYPE /* Type definitions ***********************************************************/ -typedef struct _ROS_DC_INFO -{ - CLIPOBJ *CombinedClip; -} ROS_DC_INFO; - typedef struct _DCLEVEL { HPALETTE hpal; @@ -136,9 +131,6 @@ typedef struct _DC ULONG ulCopyCount; PVOID pSurfInfo; POINTL ptlDoBanding; - - /* Reactos specific members */ - ROS_DC_INFO rosdc; } DC; extern PDC defaultDCstate; diff --git a/reactos/win32ss/gdi/ntgdi/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c index e9aa7b0bca8..67ce491a2ab 100644 --- a/reactos/win32ss/gdi/ntgdi/dclife.c +++ b/reactos/win32ss/gdi/ntgdi/dclife.c @@ -232,6 +232,9 @@ DC_vInitDc( pdc->prgnVis = IntSysCreateRectpRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); ASSERT(pdc->prgnVis); + /* Initialize Clip object */ + IntEngInitClipObj(&pdc->co); + /* Setup palette */ pdc->dclevel.hpal = StockObjects[DEFAULT_PALETTE]; pdc->dclevel.ppal = PALETTE_ShareLockPalette(pdc->dclevel.hpal); @@ -373,8 +376,9 @@ DC_vCleanup(PVOID ObjectBody) REGION_Delete(pdc->prgnRao); if (pdc->prgnAPI) REGION_Delete(pdc->prgnAPI); - if (pdc->rosdc.CombinedClip) - IntEngDeleteClipRegion(pdc->rosdc.CombinedClip); + + /* Free CLIPOBJ resources */ + IntEngFreeClipResources(&pdc->co); PATH_Delete(pdc->dclevel.hPath); diff --git a/reactos/win32ss/gdi/ntgdi/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c index 65fbdd9dc9f..e391290ffe0 100644 --- a/reactos/win32ss/gdi/ntgdi/dibobj.c +++ b/reactos/win32ss/gdi/ntgdi/dibobj.c @@ -530,7 +530,7 @@ NtGdiSetDIBitsToDeviceInternal( Status = IntEngBitBlt(pDestSurf, pSourceSurf, NULL, - pDC->rosdc.CombinedClip, + &pDC->co.ClipObj, &exlo.xlo, &rcDest, &ptSource, @@ -1200,7 +1200,7 @@ NtGdiStretchDIBitsInternal( bResult = IntEngStretchBlt(&psurfDst->SurfObj, &psurfTmp->SurfObj, NULL, - pdc->rosdc.CombinedClip, + &pdc->co.ClipObj, &exlo.xlo, &pdc->dclevel.ca, &rcDst, diff --git a/reactos/win32ss/gdi/ntgdi/drawing.c b/reactos/win32ss/gdi/ntgdi/drawing.c index 0d28de08a22..76b0a722f73 100644 --- a/reactos/win32ss/gdi/ntgdi/drawing.c +++ b/reactos/win32ss/gdi/ntgdi/drawing.c @@ -1295,7 +1295,7 @@ IntFillRect( DC *dc, &psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, NULL, diff --git a/reactos/win32ss/gdi/ntgdi/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c index 1c3f374ac82..a5dd2e3bb9a 100644 --- a/reactos/win32ss/gdi/ntgdi/fillshap.c +++ b/reactos/win32ss/gdi/ntgdi/fillshap.c @@ -112,7 +112,7 @@ IntGdiPolygon(PDC dc, // Points[1].x, Points[1].y ); ret = IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points[i].x, /* From */ Points[i].y, @@ -126,7 +126,7 @@ IntGdiPolygon(PDC dc, if (ret) { ret = IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points[Count-1].x, /* From */ Points[Count-1].y, @@ -599,7 +599,7 @@ IntRectangle(PDC dc, ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, NULL, @@ -618,28 +618,28 @@ IntRectangle(PDC dc, { Mix = ROP2_TO_MIX(pdcattr->jROP2); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.left, DestRect.top, DestRect.right, DestRect.top, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, &DestRect, // Bounding rectangle @@ -963,10 +963,8 @@ GreGradientFill( DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL); - ASSERT(pdc->rosdc.CombinedClip); - bRet = IntEngGradientFill(&psurf->SurfObj, - pdc->rosdc.CombinedClip, + &pdc->co.ClipObj, &exlo.xlo, pVertex, nVertex, diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c index 560d12e58ab..aa2d36fac5a 100644 --- a/reactos/win32ss/gdi/ntgdi/freetype.c +++ b/reactos/win32ss/gdi/ntgdi/freetype.c @@ -3317,7 +3317,7 @@ GreExtTextOutW( &dc->dclevel.pSurface->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, &SourcePoint, @@ -3577,7 +3577,7 @@ GreExtTextOutW( &psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &DestRect, &SourcePoint, @@ -3650,7 +3650,7 @@ GreExtTextOutW( IntEngMaskBlt( SurfObj, SourceGlyphSurf, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &exloRGB2Dst.xlo, &exloDst2RGB.xlo, &DestRect, diff --git a/reactos/win32ss/gdi/ntgdi/line.c b/reactos/win32ss/gdi/ntgdi/line.c index 93c89be562c..2a5d541b6c3 100644 --- a/reactos/win32ss/gdi/ntgdi/line.c +++ b/reactos/win32ss/gdi/ntgdi/line.c @@ -149,7 +149,7 @@ IntGdiLineTo(DC *dc, if (!(pbrLine->flAttrs & BR_IS_NULL)) { Ret = IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points[0].x, Points[0].y, Points[1].x, Points[1].y, @@ -285,7 +285,7 @@ IntGdiPolyline(DC *dc, } Ret = IntEngPolyline(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, &dc->eboLine.BrushObject, Points, Count, diff --git a/reactos/win32ss/gdi/ntgdi/polyfill.c b/reactos/win32ss/gdi/ntgdi/polyfill.c index f8c8aed8bab..5e19d8be69c 100644 --- a/reactos/win32ss/gdi/ntgdi/polyfill.c +++ b/reactos/win32ss/gdi/ntgdi/polyfill.c @@ -408,7 +408,7 @@ POLYGONFILL_FillScanLineAlternate( //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, BrushObj, x1, ScanLine, @@ -481,7 +481,7 @@ POLYGONFILL_FillScanLineWinding( //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, BrushObj, x1, ScanLine, @@ -504,7 +504,7 @@ POLYGONFILL_FillScanLineWinding( //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, BrushObj, x1, ScanLine, @@ -627,7 +627,7 @@ IntFillPolygon( IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - dc->rosdc.CombinedClip, + &dc->co.ClipObj, NULL, &LineRect, NULL, diff --git a/reactos/win32ss/gdi/ntgdi/region.c b/reactos/win32ss/gdi/ntgdi/region.c index 08a0cdd0c45..dcea7d3dbea 100644 --- a/reactos/win32ss/gdi/ntgdi/region.c +++ b/reactos/win32ss/gdi/ntgdi/region.c @@ -2484,7 +2484,7 @@ IntGdiPaintRgn( { HRGN tmpVisRgn; PROSRGNDATA visrgn; - CLIPOBJ* ClipRegion; + XCLIPOBJ ClipRegion; BOOL bRet = FALSE; POINTL BrushOrigin; SURFACE *psurf; @@ -2515,10 +2515,8 @@ IntGdiPaintRgn( if (dc->prgnRao) IntGdiCombineRgn(visrgn, visrgn, dc->prgnRao, RGN_AND); - ClipRegion = IntEngCreateClipRegion(visrgn->rdh.nCount, - visrgn->Buffer, - &visrgn->rdh.rcBound ); - ASSERT(ClipRegion); + IntEngInitClipObj(&ClipRegion); + IntEngUpdateClipRegion(&ClipRegion, visrgn->rdh.nCount, visrgn->Buffer, &visrgn->rdh.rcBound ); BrushOrigin.x = pdcattr->ptlBrushOrigin.x; BrushOrigin.y = pdcattr->ptlBrushOrigin.y; @@ -2526,13 +2524,14 @@ IntGdiPaintRgn( /* FIXME: Handle psurf == NULL !!!! */ bRet = IntEngPaint(&psurf->SurfObj, - ClipRegion, + &ClipRegion.ClipObj, &dc->eboFill.BrushObject, &BrushOrigin, 0xFFFF); // FIXME: Don't know what to put here RGNOBJAPI_Unlock(visrgn); GreDeleteObject(tmpVisRgn); + IntEngFreeClipResources(&ClipRegion); // Fill the region return bRet; diff --git a/reactos/win32ss/gdi/ntgdi/wingl.c b/reactos/win32ss/gdi/ntgdi/wingl.c index 18023431702..7225b5d71c2 100644 --- a/reactos/win32ss/gdi/ntgdi/wingl.c +++ b/reactos/win32ss/gdi/ntgdi/wingl.c @@ -121,6 +121,8 @@ NtGdiSetPixelFormat( SURFOBJ *pso = NULL; BOOL Ret = FALSE; + DPRINT1("Setting pixel format from win32k!\n"); + pdc = DC_LockDc(hdc); if (!pdc) { diff --git a/reactos/win32ss/user/ntuser/cursoricon.c b/reactos/win32ss/user/ntuser/cursoricon.c index e730c585b38..0476291e8fa 100644 --- a/reactos/win32ss/user/ntuser/cursoricon.c +++ b/reactos/win32ss/user/ntuser/cursoricon.c @@ -1290,7 +1290,7 @@ UserDrawIconEx( DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* Get the clip object */ - pdcClipObj = pdc->rosdc.CombinedClip; + pdcClipObj = &pdc->co.ClipObj; /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; @@ -1475,7 +1475,7 @@ done: DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); /* Get the clip object */ - pdcClipObj = pdc->rosdc.CombinedClip; + pdcClipObj = &pdc->co.ClipObj; /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; diff --git a/reactos/win32ss/user/ntuser/windc.c b/reactos/win32ss/user/ntuser/windc.c index 492e09e66a4..5ff495c9950 100644 --- a/reactos/win32ss/user/ntuser/windc.c +++ b/reactos/win32ss/user/ntuser/windc.c @@ -1015,22 +1015,22 @@ UserGetWindowDC(PWND Wnd) HWND FASTCALL UserGethWnd( HDC hdc, PWNDOBJ *pwndo) { - PWNDGDI pWndgdi; + XCLIPOBJ* Clip; PWND Wnd; HWND hWnd; PPROPERTY pprop; hWnd = IntWindowFromDC(hdc); - if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + if (hWnd && (Wnd = UserGetWindowObject(hWnd))) { pprop = IntGetProp(Wnd, AtomWndObj); - pWndgdi = (WNDGDI *)pprop->Data; + Clip = (XCLIPOBJ*)pprop->Data; - if ( pWndgdi && pWndgdi->Hwnd == hWnd ) + if ( Clip && Clip->Hwnd == hWnd ) { - if (pwndo) *pwndo = (PWNDOBJ)pWndgdi; + if (pwndo) *pwndo = &Clip->WndObj; } } return hWnd; From bbaddbe80cd0a4ef65d5308a383a06fbaa0c4ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:41:21 +0000 Subject: [PATCH 72/75] [WIN32K] - Some more DPRINT -> DEBUGCHANNEL svn path=/trunk/; revision=63740 --- reactos/win32ss/gdi/eng/clip.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/reactos/win32ss/gdi/eng/clip.c b/reactos/win32ss/gdi/eng/clip.c index 7a7381581e1..61ffb0d34ad 100644 --- a/reactos/win32ss/gdi/eng/clip.c +++ b/reactos/win32ss/gdi/eng/clip.c @@ -7,9 +7,8 @@ */ #include +DBG_DEFAULT_CHANNEL(EngClip); -#define NDEBUG -#include static __inline int CompareRightDown( @@ -256,13 +255,15 @@ CLIPOBJ * APIENTRY EngCreateClip(VOID) { - CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), GDITAG_CLIPOBJ); + XCLIPOBJ *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(XCLIPOBJ), GDITAG_CLIPOBJ); if(Clip != NULL) { - Clip->Rects = &Clip->ClipObj.rclBounds; + IntEngInitClipObj(Clip); + TRACE("Created Clip Obj %p.\n", Clip); return &Clip->ClipObj; } + ERR("Clip object allocation failed!\n"); return NULL; } @@ -275,8 +276,8 @@ EngDeleteClip( _In_ _Post_ptr_invalid_ CLIPOBJ *pco) { XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); - if (Clip->Rects != &Clip->ClipObj.rclBounds) - EngFreeMem(Clip->Rects); + TRACE("Deleting %p.\n"); + IntEngFreeClipResources(Clip); EngFreeMem(Clip); } @@ -319,7 +320,7 @@ CLIPOBJ_cEnumStart( break; default: - DPRINT1("Invalid iDirection %lu\n", iDirection); + ERR("Invalid iDirection %lu\n", iDirection); iDirection = Clip->EnumOrder; CompareFunc = NULL; break; From 6d7085f1774612f091135ef0e90b8b77d4553d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:41:25 +0000 Subject: [PATCH 73/75] [WIN32K] - Explicitly initialize PropListItems svn path=/trunk/; revision=63741 --- reactos/win32ss/user/ntuser/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/reactos/win32ss/user/ntuser/window.c b/reactos/win32ss/user/ntuser/window.c index de3b4bd0c34..13d154685a4 100644 --- a/reactos/win32ss/user/ntuser/window.c +++ b/reactos/win32ss/user/ntuser/window.c @@ -1802,6 +1802,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, } InitializeListHead(&pWnd->PropListHead); + pWnd->PropListItems = 0; if ( WindowName->Buffer != NULL && WindowName->Length > 0 ) { From 2d6704f615069662a5683ed0729fe9fa715eaa87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:41:33 +0000 Subject: [PATCH 74/75] [WIN32K] - Avoid useless casts - Add a few debug prints - Add sanity check svn path=/trunk/; revision=63742 --- reactos/win32ss/gdi/eng/engobjects.h | 1 + reactos/win32ss/gdi/eng/engwindow.c | 51 ++++++++++++---------------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/reactos/win32ss/gdi/eng/engobjects.h b/reactos/win32ss/gdi/eng/engobjects.h index a65772d4d60..e907ae380ca 100644 --- a/reactos/win32ss/gdi/eng/engobjects.h +++ b/reactos/win32ss/gdi/eng/engobjects.h @@ -85,6 +85,7 @@ typedef struct _CLIPGDI { ULONG RectCount; RECTL* Rects; } CLIPGDI, *PCLIPGDI; +C_ASSERT(FIELD_OFFSET(CLIPGDI, ClipObj) == FIELD_OFFSET(CLIPGDI, WndObj.coClient)); // HACK, until we use the original structure #define XCLIPOBJ CLIPGDI diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index 34003ceff5a..486ac4a5622 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -18,11 +18,9 @@ INT gcountPWO = 0; VOID FASTCALL IntEngWndCallChangeProc( - IN WNDOBJ *pwo, - IN FLONG flChanged) + _In_ XCLIPOBJ *Clip, + _In_ FLONG flChanged) { - XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); - if (Clip->ChangeProc == NULL) { return; @@ -35,15 +33,14 @@ IntEngWndCallChangeProc( return; } - /* Call the WNDOBJCHANGEPROC */ - if (flChanged == WOC_CHANGED) - { - pwo = NULL; - } - TRACE("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", Clip->ChangeProc, flChanged); - Clip->ChangeProc(pwo, flChanged); + + /* Call the WNDOBJCHANGEPROC */ + if (flChanged == WOC_CHANGED) + Clip->ChangeProc(NULL, flChanged); + else + Clip->ChangeProc(&Clip->WndObj, flChanged); } /* @@ -112,30 +109,25 @@ IntEngWindowChanged( _In_ PWND Window, _In_ FLONG flChanged) { - PPROPERTY pprop; - XCLIPOBJ *Current; - HWND hWnd; + XCLIPOBJ *Clip; ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - hWnd = Window->head.h; - pprop = IntGetProp(Window, AtomWndObj); - if (!pprop) + Clip = UserGetProp(Window, AtomWndObj); + if (!Clip) { return; } - Current = (XCLIPOBJ *)pprop->Data; - if ( gcountPWO && - Current && - Current->Hwnd == hWnd && - Current->WndObj.pvConsumer != NULL ) + + ASSERT(Clip->Hwnd == Window->head.h); + if (Clip->WndObj.pvConsumer != NULL) { /* Update the WNDOBJ */ switch (flChanged) { case WOC_RGN_CLIENT: /* Update the clipobj and client rect of the WNDOBJ */ - IntEngWndUpdateClipObj(Current, Window); + IntEngWndUpdateClipObj(Clip, Window); break; case WOC_DELETE: @@ -144,12 +136,12 @@ IntEngWindowChanged( } /* Call the change proc */ - IntEngWndCallChangeProc(&Current->WndObj, flChanged); + IntEngWndCallChangeProc(Clip, flChanged); /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ if (flChanged == WOC_RGN_CLIENT) { - IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); + IntEngWndCallChangeProc(Clip, WOC_CHANGED); } } } @@ -218,7 +210,7 @@ EngCreateWnd( IntSetProp(Window, AtomWndObj, Clip); ++gcountPWO; - TRACE("EngCreateWnd: SUCCESS!\n"); + TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser); RETURN( WndObjUser); @@ -315,6 +307,7 @@ WNDOBJ_vSetConsumer( IN WNDOBJ *pwo, IN PVOID pvConsumer) { + XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); BOOL Hack; TRACE("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); @@ -333,9 +326,9 @@ WNDOBJ_vSetConsumer( if (Hack) { FIXME("Is this hack really needed?\n"); - IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); - IntEngWndCallChangeProc(pwo, WOC_CHANGED); - IntEngWndCallChangeProc(pwo, WOC_DRAWN); + IntEngWndCallChangeProc(Clip, WOC_RGN_CLIENT); + IntEngWndCallChangeProc(Clip, WOC_CHANGED); + IntEngWndCallChangeProc(Clip, WOC_DRAWN); } } From f637c9716ac3f22c75f970b8be976caab8000383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 26 Jul 2014 15:53:20 +0000 Subject: [PATCH 75/75] [WIN32K] - Hack around a bug (tm) svn path=/trunk/; revision=63743 --- reactos/win32ss/gdi/eng/engwindow.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index 486ac4a5622..86560c9770d 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -111,6 +111,12 @@ IntEngWindowChanged( { XCLIPOBJ *Clip; + /* + * This function is broken because AtomWndObj conflicts with + * properties set from user mode using SetPropW + */ + return; + ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); Clip = UserGetProp(Window, AtomWndObj);