Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[hbelusca] 66167: [DLLs]: Privatize the exports that should be so.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 5 00:12:12 2015 New Revision: 66167 URL: http://svn.reactos.org/svn/reactos?rev=66167&view=rev Log: [DLLs]: Privatize the exports that should be so. Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.spec trunk/reactos/dll/win32/msxml3/msxml3.spec trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/rsaenh/rsaenh.spec Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -19,5 +19,5 @@ @ stdcall D3DRMVectorScale(ptr ptr float) @ stdcall D3DRMVectorSubtract(ptr ptr ptr) @ stdcall Direct3DRMCreate(ptr) -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.sp… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -7,6 +7,6 @@ 12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -133,7 +133,7 @@ @ stdcall CreateStreamOnHGlobal(ptr long ptr) # DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall DoDragDrop(ptr ptr long ptr) Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.sp… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] Thu Feb 5 00:12:12 2015 @@ -23,5 +23,5 @@ @ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam @ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash @ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

9 years, 10 months

[jimtabor] 66166: [Win32ss] - Setup system cursors and icons. Could help with Themes. - Set default cursor to the message queue structure. - Fix wine cursor icon tests. Fix ATI cursor passing issue...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 5 00:11:35 2015 New Revision: 66166 URL: http://svn.reactos.org/svn/reactos?rev=66166&view=rev Log: [Win32ss] - Setup system cursors and icons. Could help with Themes. - Set default cursor to the message queue structure. - Fix wine cursor icon tests. Fix ATI cursor passing issue. - Fix that sticky mouse cursor while the screen saver is on. - Move cursor code from User32 and shake that pop up window too. - Setup for window station security checking. - Dedicated to the great work by Jérôme Gardou. Doing ones best to preserve his original code! Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/winsta.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -113,8 +113,13 @@ typedef struct _SETWNDICONS_CALLBACK_ARGUMENTS { + HICON hIconSample; + HICON hIconHand; + HICON hIconQuestion; + HICON hIconBang; + HICON hIconNote; + HICON hIconWindows; HICON hIconSmWindows; - HICON hIconWindows; } SETWNDICONS_CALLBACK_ARGUMENTS, *PSETWNDICONS_CALLBACK_ARGUMENTS; typedef struct _DDEPOSTGET_CALLBACK_ARGUMENTS Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1006,6 +1006,7 @@ LIST_ENTRY PropListEntry; HANDLE Data; ATOM Atom; + WORD fs; } PROPERTY, *PPROPERTY; typedef struct _BROADCASTPARM @@ -3184,13 +3185,13 @@ HOOKPROC HookProc, BOOL Ansi); -DWORD +BOOL NTAPI NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size); WORD NTAPI NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewVal); Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Callback to usermode support - * FILE: subsystems/win32/win32k/ntuser/callback.c + * FILE: win32ss/user/ntuser/callback.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * NOTES: Please use the Callback Memory Management functions for @@ -357,7 +357,7 @@ if (!NT_SUCCESS(Status)) { - ERR("Call to user mode failed!\n"); + ERR("Call to user mode failed! %p\n",Status); if (lParamBufferSize != -1) { IntCbFreeMemory(Arguments); @@ -1082,20 +1082,28 @@ UserEnterCo(); - /* FIXME: Need to setup Registry System Cursor & Icons via Callbacks at init time! */ + if (!NT_SUCCESS(Status)) + { + ERR("Set Window Icons callback failed!\n"); + IntCbFreeMemory(Argument); + return FALSE; + } + RtlMoveMemory(Common, ResultPointer, ArgumentLength); gpsi->hIconSmWindows = Common->hIconSmWindows; gpsi->hIconWindows = Common->hIconWindows; + IntLoadSystenIcons(Common->hIconSample, OIC_SAMPLE); + IntLoadSystenIcons(Common->hIconHand, OIC_HAND); + IntLoadSystenIcons(Common->hIconQuestion, OIC_QUES); + IntLoadSystenIcons(Common->hIconBang, OIC_BANG); + IntLoadSystenIcons(Common->hIconNote, OIC_NOTE); + IntLoadSystenIcons(gpsi->hIconWindows, OIC_WINLOGO); + IntLoadSystenIcons(gpsi->hIconSmWindows, OIC_WINLOGO+1); + ERR("hIconSmWindows %p hIconWindows %p \n",gpsi->hIconSmWindows,gpsi->hIconWindows); IntCbFreeMemory(Argument); - - if (!NT_SUCCESS(Status)) - { - ERR("Set Window Icons callback failed!\n"); - return FALSE; - } return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Window classes - * FILE: subsystems/win32/win32k/ntuser/class.c + * FILE: win32ss/user/ntuser/class.c * PROGRAMER: Thomas Weidenmueller <w3seek(a)reactos.com> */ @@ -38,7 +38,7 @@ CS_GLOBALCLASS|CS_DBLCLKS, NULL, // Use User32 procs sizeof(ULONG)*2, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, (HBRUSH)(COLOR_BACKGROUND), FNID_DESKTOP, ICLS_DESKTOP @@ -47,7 +47,7 @@ CS_VREDRAW|CS_HREDRAW|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, NULL, FNID_SWITCH, ICLS_SWITCH @@ -56,7 +56,7 @@ CS_DBLCLKS|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, (HBRUSH)(COLOR_MENU + 1), FNID_MENU, ICLS_MENU @@ -65,7 +65,7 @@ CS_DBLCLKS|CS_VREDRAW|CS_HREDRAW|CS_PARENTDC, NULL, // Use User32 procs sizeof(SBWND)-sizeof(WND), - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, NULL, FNID_SCROLLBAR, ICLS_SCROLLBAR @@ -75,7 +75,7 @@ CS_PARENTDC|CS_DBLCLKS, NULL, // Use User32 procs 0, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, 0, FNID_TOOLTIPS, ICLS_TOOLTIPS @@ -85,7 +85,7 @@ 0, NULL, // Use User32 procs 0, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, 0, FNID_ICONTITLE, ICLS_ICONTITLE @@ -94,7 +94,7 @@ CS_GLOBALCLASS, NULL, // Use User32 procs 0, - (HICON)IDC_ARROW, + (HICON)OCR_NORMAL, NULL, FNID_MESSAGEWND, ICLS_HWNDMESSAGE @@ -2424,7 +2424,8 @@ wc.cbClsExtra = 0; wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes; wc.hIcon = NULL; - wc.hCursor = DefaultServerClasses[i].hCursor; + //// System Cursors should be initilized!!! + wc.hCursor = DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL ? UserHMGetHandle(SYSTEMCUR(ARROW)) : NULL; hBrush = DefaultServerClasses[i].hBrush; if (hBrush <= (HBRUSH)COLOR_MENUBAR) { Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1593,4 +1593,16 @@ return 0; } +/* + * @unimplemented + */ +BOOL +APIENTRY +NtUserSetSystemCursor( + HCURSOR hcur, + DWORD id) +{ + return FALSE; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -114,6 +114,43 @@ BOOL ScreenSaverRunning; } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO; +typedef struct { + DWORD type; + PCURICON_OBJECT handle; +} SYSTEMCURICO; + +extern SYSTEMCURICO gasysico[]; +extern SYSTEMCURICO gasyscur[]; + +#define ROIC_SAMPLE 0 +#define ROIC_HAND 1 +#define ROIC_QUES 2 +#define ROIC_BANG 3 +#define ROIC_NOTE 4 +#define ROIC_WINLOGO 5 + +#define ROCR_ARROW 0 +#define ROCR_IBEAM 1 +#define ROCR_WAIT 2 +#define ROCR_CROSS 3 +#define ROCR_UP 4 +#define ROCR_SIZE 5 +#define ROCR_ICON 6 +#define ROCR_SIZENWSE 7 +#define ROCR_SIZENESW 8 +#define ROCR_SIZEWE 9 +#define ROCR_SIZENS 10 +#define ROCR_SIZEALL 11 +#define ROCR_NO 12 +#define ROCR_HAND 13 +#define ROCR_APPSTARTING 14 +#define ROCR_HELP 15 + +#define SYSTEMCUR(func) (gasyscur[ROCR_ ## func].handle) +#define SYSTEMICO(func) (gasysico[ROIC_ ## func].handle) + +VOID IntLoadSystenIcons(HICON,DWORD); + BOOL InitCursorImpl(VOID); HANDLE IntCreateCurIconHandle(BOOLEAN Anim); Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -24,6 +24,42 @@ SYSTEM_CURSORINFO gSysCursorInfo; +PCURICON_OBJECT gcurFirst = NULL; // After all is done, this should be WINLOGO! + +// +// System Cursors +// +SYSTEMCURICO gasyscur[] = { + {OCR_NORMAL, NULL}, + {OCR_IBEAM, NULL}, + {OCR_WAIT, NULL}, + {OCR_CROSS, NULL}, + {OCR_UP, NULL}, + {OCR_ICON, NULL}, + {OCR_SIZE, NULL}, + {OCR_SIZENWSE, NULL}, + {OCR_SIZENESW, NULL}, + {OCR_SIZEWE, NULL}, + {OCR_SIZENS, NULL}, + {OCR_SIZEALL, NULL}, + {OCR_NO, NULL}, + {OCR_HAND, NULL}, + {OCR_APPSTARTING,NULL}, + {OCR_HELP, NULL}, + }; + +// +// System Icons +// +SYSTEMCURICO gasysico[] = { + {OIC_SAMPLE, NULL}, + {OIC_HAND, NULL}, + {OIC_QUES, NULL}, + {OIC_BANG, NULL}, + {OIC_NOTE, NULL}, + {OIC_WINLOGO,NULL}, + }; + BOOL InitCursorImpl(VOID) { @@ -37,6 +73,57 @@ gSysCursorInfo.ClickLockTime = 0; return TRUE; +} + +VOID +IntLoadSystenIcons(HICON hcur, DWORD id) +{ + PCURICON_OBJECT pcur; + int i; + PPROCESSINFO ppi; + + if (hcur) + { + pcur = UserGetCurIconObject(hcur); + if (!pcur) + { + EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); + return; + } + + ppi = PsGetCurrentProcessWin32Process(); + + if (!(ppi->W32PF_flags & W32PF_CREATEDWINORDC)) + return; + + // Set Small Window Icon and do not link. + if ( id == OIC_WINLOGO+1 ) + { + pcur->CURSORF_flags |= CURSORF_GLOBAL; + UserReferenceObject(pcur); + pcur->head.ppi = NULL; + return; + } + + for(i = 0 ; i < 6; i++) + { + if (gasysico[i].type == id) + { + gasysico[i].handle = pcur; + pcur->CURSORF_flags |= CURSORF_GLOBAL|CURSORF_LINKED; + UserReferenceObject(pcur); + // + // The active switch between LR shared and Global public. + // This is hacked around to support this while at the initial system start up. + // + pcur->head.ppi = NULL; + // + pcur->pcurNext = gcurFirst; + gcurFirst = pcur; + return; + } + } + } } PSYSTEM_CURSORINFO @@ -183,6 +270,7 @@ ASSERT(CacheCurIcon != NULL); UserDereferenceObject(CurIcon); } + CurIcon->CURSORF_flags &= ~CURSORF_LINKED; } /* We just mark the handle as being destroyed. @@ -456,7 +544,7 @@ BOOL bRet = FALSE; TRACE("Enter NtUserGetIconSize\n"); - UserEnterExclusive(); + UserEnterShared(); if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { @@ -515,7 +603,7 @@ DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetCursorInfo\n"); - UserEnterExclusive(); + UserEnterShared(); CurInfo = IntGetSysCursorInfo(); CurIcon = (PCURICON_OBJECT)CurInfo->CurrentCursorObject; @@ -562,9 +650,13 @@ UserClipCursor( RECTL *prcl) { - /* FIXME: Check if process has WINSTA_WRITEATTRIBUTES */ PSYSTEM_CURSORINFO CurInfo; PWND DesktopWindow = NULL; + + if (!CheckWinstaAttributeAccess(WINSTA_WRITEATTRIBUTES)) + { + return FALSE; + } CurInfo = IntGetSysCursorInfo(); @@ -667,6 +759,14 @@ if (!bForce) { + /* Can not destroy global objects */ + if (CurIcon->head.ppi == NULL) + { + ERR("Trying to delete global cursor!\n"); + ret = TRUE; + goto leave; + } + /* Maybe we have good reasons not to destroy this object */ if (CurIcon->head.ppi != PsGetCurrentProcessWin32Process()) { @@ -750,7 +850,7 @@ goto done; } - UserEnterExclusive(); + UserEnterShared(); CurIcon = pProcInfo->pCursorCache; while(CurIcon) { @@ -770,7 +870,7 @@ CurIcon = CurIcon->pcurNext; continue; } - + if (IS_INTRESOURCE(CurIcon->strName.Buffer)) { if (CurIcon->strName.Buffer == ustrRsrcSafe.Buffer) @@ -787,6 +887,47 @@ } CurIcon = CurIcon->pcurNext; } + // + // Now search Global Cursors or Icons. + // + if(CurIcon == NULL) + { + CurIcon = gcurFirst; + while(CurIcon) + { + /* Icon/cursor */ + if (paramSafe.bIcon != is_icon(CurIcon)) + { + CurIcon = CurIcon->pcurNext; + continue; + } + /* See if module names match */ + if (atomModName == CurIcon->atomModName) + { + /* They do. Now see if this is the same resource */ + if (IS_INTRESOURCE(CurIcon->strName.Buffer) != IS_INTRESOURCE(ustrRsrcSafe.Buffer)) + { + /* One is an INT resource and the other is not -> no match */ + CurIcon = CurIcon->pcurNext; + continue; + } + if (IS_INTRESOURCE(CurIcon->strName.Buffer)) + { + if (CurIcon->strName.Buffer == ustrRsrcSafe.Buffer) + { + /* INT resources match */ + break; + } + } + else if (RtlCompareUnicodeString(&ustrRsrcSafe, &CurIcon->strName, TRUE) == 0) + { + /* Resource name strings match */ + break; + } + } + CurIcon = CurIcon->pcurNext; + } + } if(CurIcon) Ret = CurIcon->head.h; UserLeave(); @@ -807,14 +948,18 @@ NtUserGetClipCursor( RECTL *lpRect) { - /* FIXME: Check if process has WINSTA_READATTRIBUTES */ PSYSTEM_CURSORINFO CurInfo; RECTL Rect; NTSTATUS Status; DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetClipCursor\n"); - UserEnterExclusive(); + UserEnterShared(); + + if (!CheckWinstaAttributeAccess(WINSTA_READATTRIBUTES)) + { + RETURN(FALSE); + } if (!lpRect) RETURN(FALSE); @@ -881,6 +1026,21 @@ if (pcurOld) { hOldCursor = pcurOld->head.h; + /* + Problem: + + System Global Cursors start out having at least 2 lock counts. If a system + cursor is the default cursor and is returned to the caller twice in its + life, the count will reach zero. Causing an assert to occur in objects. + + This fixes a SeaMonkey crash while the mouse crosses a boundary. + */ + if (pcurOld->CURSORF_flags & CURSORF_GLOBAL) + { + TRACE("Returning Global Cursor hcur %p\n",hOldCursor); + goto leave; + } + /* See if it was destroyed in the meantime */ if (UserObjectInDestroy(hOldCursor)) hOldCursor = NULL; @@ -1015,6 +1175,11 @@ if(CurIcon->CURSORF_flags & CURSORF_LRSHARED) { IsShared = TRUE; + } + + // Support global public cursors and icons too. + if(!IsAnim || IsShared) + { if(pustrRsrc && pustrModule) { UNICODE_STRING ustrModuleSafe; @@ -1054,12 +1219,13 @@ UserReferenceObject(CurIcon); CurIcon->pcurNext = ppi->pCursorCache; ppi->pCursorCache = CurIcon; + CurIcon->CURSORF_flags |= CURSORF_LINKED; } Ret = TRUE; done: - if(!Ret && IsShared) + if(!Ret && (!IsAnim || IsShared)) { if(!IS_INTRESOURCE(CurIcon->strName.Buffer)) ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING); @@ -1555,7 +1721,7 @@ NTSTATUS Status = STATUS_SUCCESS; TRACE("Enter NtUserGetCursorFrameInfo\n"); - UserEnterExclusive(); + UserEnterShared(); if (!(CurIcon = UserGetCurIconObject(hCursor))) { @@ -1607,4 +1773,66 @@ return ret; } +/* + * @implemented + */ +BOOL +APIENTRY +NtUserSetSystemCursor( + HCURSOR hcur, + DWORD id) +{ + PCURICON_OBJECT pcur, pcurOrig = NULL; + int i; + PPROCESSINFO ppi; + BOOL Ret = FALSE; + UserEnterExclusive(); + + if (!CheckWinstaAttributeAccess(WINSTA_WRITEATTRIBUTES)) + { + goto Exit; + } + + if (hcur) + { + pcur = UserGetCurIconObject(hcur); + if (!pcur) + { + EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); + goto Exit; + } + + ppi = PsGetCurrentProcessWin32Process(); + + for(i = 0 ; i < 16; i++) + { + if (gasyscur[i].type == id) + { + pcurOrig = gasyscur[i].handle; + + if (pcurOrig) break; + + if (ppi->W32PF_flags & W32PF_CREATEDWINORDC) + { + gasyscur[i].handle = pcur; + pcur->CURSORF_flags |= CURSORF_GLOBAL|CURSORF_LINKED; + UserReferenceObject(pcur); + pcur->head.ppi = NULL; + pcur->pcurNext = gcurFirst; + gcurFirst = pcur; + Ret = TRUE; + } + break; + } + } + if (pcurOrig) + { + FIXME("Need to copy cursor data or do something! pcurOrig %p new pcur %p\n",pcurOrig,pcur); + } + } +Exit: + UserLeave(); + return Ret; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -754,7 +754,6 @@ return(Hook ? 1 : 0); // Don't call us again from user space. } -#if 0 // Keep it for later! PWND FASTCALL co_IntFindChildWindowToOwner(PWND Root, PWND Owner) { @@ -767,6 +766,12 @@ if(!OwnerWnd) continue; + if (!(Child->style & WS_POPUP) || + !(Child->style & WS_VISIBLE) || + /* Fixes CMD pop up properties window from having foreground. */ + Owner->head.pti->MessageQueue != Child->head.pti->MessageQueue) + continue; + if(OwnerWnd == Owner) { Ret = Child; @@ -775,7 +780,128 @@ } return NULL; } -#endif + +LRESULT +DefWndHandleSetCursor(PWND pWnd, WPARAM wParam, LPARAM lParam) +{ + PWND pwndPopUP = NULL; + WORD Msg = HIWORD(lParam); + + /* Not for child windows. */ + if (UserHMGetHandle(pWnd) != (HWND)wParam) + { + return FALSE; + } + + switch((short)LOWORD(lParam)) + { + case HTERROR: + { + //// This is the real fix for CORE-6129! This was a "Code Whole". + USER_REFERENCE_ENTRY Ref; + + if (Msg == WM_LBUTTONDOWN) + { + // Find a pop up window to bring active. + pwndPopUP = co_IntFindChildWindowToOwner(UserGetDesktopWindow(), pWnd); + if (pwndPopUP) + { + // Not a child pop up from desktop. + if ( pwndPopUP != UserGetDesktopWindow()->spwndChild ) + { + // Get original active window. + PWND pwndOrigActive = gpqForeground->spwndActive; + + co_WinPosSetWindowPos(pWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + UserRefObjectCo(pwndPopUP, &Ref); + //UserSetActiveWindow(pwndPopUP); + co_IntSetForegroundWindow(pwndPopUP); // HACK + UserDerefObjectCo(pwndPopUP); + + // If the change was made, break out. + if (pwndOrigActive != gpqForeground->spwndActive) + break; + } + } + } + //// + if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || + Msg == WM_RBUTTONDOWN || Msg == WM_XBUTTONDOWN) + { + if (pwndPopUP) + { + FLASHWINFO fwi = + {sizeof(FLASHWINFO), + UserHMGetHandle(pwndPopUP), + FLASHW_ALL, + gspv.dwForegroundFlashCount, + (gpsi->dtCaretBlink >> 3)}; + + // Now shake that window! + IntFlashWindowEx(pwndPopUP, &fwi); + } + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_MESSAGE_BEEP, 0); + } + break; + } + + case HTCLIENT: + { + if (pWnd->pcls->spcur) + { + UserSetCursor(pWnd->pcls->spcur, FALSE); + } + return FALSE; + } + + case HTLEFT: + case HTRIGHT: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZEWE), FALSE); + return TRUE; + } + + case HTTOP: + case HTBOTTOM: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZENS), FALSE); + return TRUE; + } + + case HTTOPLEFT: + case HTBOTTOMRIGHT: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZENWSE), FALSE); + return TRUE; + } + + case HTBOTTOMLEFT: + case HTTOPRIGHT: + { + if (pWnd->style & WS_MAXIMIZE) + { + break; + } + UserSetCursor(SYSTEMCUR(SIZENESW), FALSE); + return TRUE; + } + } + UserSetCursor(SYSTEMCUR(ARROW), FALSE); + return FALSE; +} VOID FASTCALL DefWndPrint( PWND pwnd, HDC hdc, ULONG uFlags) { @@ -886,6 +1012,23 @@ case WM_CTLCOLOR: return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); + + case WM_SETCURSOR: + { + if (Wnd->style & WS_CHILD) + { + /* with the exception of the border around a resizable wnd, + * give the parent first chance to set the cursor */ + if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT) + { + PWND parent = Wnd->spwndParent;//IntGetParent( Wnd ); + if (parent != UserGetDesktopWindow() && + co_IntSendMessage( UserHMGetHandle(parent), WM_SETCURSOR, wParam, lParam)) + return TRUE; + } + } + return DefWndHandleSetCursor(Wnd, wParam, lParam); + } case WM_ACTIVATE: /* The default action in Windows is to set the keyboard focus to @@ -1094,12 +1237,11 @@ { PCURICON_OBJECT pIcon = NULL; HICON hIcon; - // First thing to do, init the Window Logo icons. - if (!gpsi->hIconSmWindows) co_IntSetWndIcons(); //FIXME: Some callers use this function as if it returns a boolean saying "this window has an icon". //FIXME: Hence we must return a pointer with no reference count. //FIXME: This is bad and we should feel bad. + //FIXME: Stop whining over wine code. hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: General input functions - * FILE: subsystems/win32/win32k/ntuser/input.c + * FILE: win32ss/user/ntuser/input.c * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Rafal Harabien (rafalh(a)reactos.org) */ @@ -450,6 +450,7 @@ { MSG msg; PATTACHINFO pai; + PCURICON_OBJECT CurIcon; /* Can not be the same thread. */ if (ptiFrom == ptiTo) return STATUS_INVALID_PARAMETER; @@ -497,7 +498,6 @@ ERR("ptiFrom is Foreground\n"); ptiTo->MessageQueue->spwndActive = ptiFrom->MessageQueue->spwndActive; ptiTo->MessageQueue->spwndFocus = ptiFrom->MessageQueue->spwndFocus; - ptiTo->MessageQueue->CursorObject = ptiFrom->MessageQueue->CursorObject; ptiTo->MessageQueue->spwndCapture = ptiFrom->MessageQueue->spwndCapture; ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); ptiTo->MessageQueue->CaretInfo = ptiFrom->MessageQueue->CaretInfo; @@ -510,9 +510,23 @@ ERR("ptiFrom NOT Foreground\n"); } + CurIcon = ptiFrom->MessageQueue->CursorObject; + MsqDestroyMessageQueue(ptiFrom); + if (CurIcon && UserObjectInDestroy(UserHMGetHandle(CurIcon))) + { + CurIcon = NULL; + } + ptiFrom->MessageQueue = ptiTo->MessageQueue; + + // Pass cursor From if To is null. Pass test_SetCursor parent_id == current pti ID. + if (CurIcon && ptiTo->MessageQueue->CursorObject == NULL) + { + ptiTo->MessageQueue->CursorObject = CurIcon; + UserReferenceObject(CurIcon); + } ptiFrom->MessageQueue->cThreads++; ERR("ptiTo S Share count %d\n", ptiFrom->MessageQueue->cThreads); @@ -603,14 +617,14 @@ BOOL Ret = FALSE; UserEnterExclusive(); - ERR("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); + TRACE("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); pti = IntTID2PTI((HANDLE)idAttach); ptiTo = IntTID2PTI((HANDLE)idAttachTo); if ( !pti || !ptiTo ) { - ERR("AttachThreadInput pti or ptiTo NULL.\n"); + TRACE("AttachThreadInput pti or ptiTo NULL.\n"); EngSetLastError(ERROR_INVALID_PARAMETER); goto Exit; } @@ -618,13 +632,13 @@ Status = UserAttachThreadInput( pti, ptiTo, fAttach); if (!NT_SUCCESS(Status)) { - ERR("AttachThreadInput Error Status 0x%x. \n",Status); + TRACE("AttachThreadInput Error Status 0x%x. \n",Status); EngSetLastError(RtlNtStatusToDosError(Status)); } else Ret = TRUE; Exit: - ERR("Leave NtUserAttachThreadInput, ret=%d\n",Ret); + TRACE("Leave NtUserAttachThreadInput, ret=%d\n",Ret); UserLeave(); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -86,12 +86,6 @@ pti = PsGetCurrentThreadWin32Thread(); MessageQueue = pti->MessageQueue; - /* Get the screen DC */ - if(!(hdcScreen = IntGetScreenDC())) - { - return NULL; - } - OldCursor = MessageQueue->CursorObject; /* Check if cursors are different */ @@ -105,10 +99,22 @@ if (MessageQueue->iCursorLevel < 0) return OldCursor; + // Fixes the error message "Not the same cursor!". + if (gpqCursor == NULL) + { + gpqCursor = MessageQueue; + } + /* Update cursor if this message queue controls it */ pWnd = IntTopLevelWindowFromPoint(gpsi->ptCursor.x, gpsi->ptCursor.y); if (pWnd && pWnd->head.pti->MessageQueue == MessageQueue) { + /* Get the screen DC */ + if (!(hdcScreen = IntGetScreenDC())) + { + return NULL; + } + if (NewCursor) { /* Call GDI to set the new screen cursor */ @@ -681,7 +687,7 @@ } else GreMovePointer(hdcScreen, Msg->pt.x, Msg->pt.y); } - /* Check if w have to hide cursor */ + /* Check if we have to hide cursor */ else if (CurInfo->ShowingCursor >= 0) GreMovePointer(hdcScreen, -1, -1); @@ -1053,20 +1059,21 @@ ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! /* Don't send from or to a dying thread */ - if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) - { - // Unless we are dying and need to tell our parents. - if (pti->TIF_flags & TIF_INCLEANUP && !(ptirec->TIF_flags & TIF_INCLEANUP)) - { + if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) + { + // Unless we are dying and need to tell our parents. + if (pti->TIF_flags & TIF_INCLEANUP && !(ptirec->TIF_flags & TIF_INCLEANUP)) + { // Parent notify is the big one. Fire and forget! TRACE("Send message from dying thread %d\n",Msg); co_MsqSendMessageAsync(ptirec, Wnd, Msg, wParam, lParam, NULL, 0, FALSE, HookMessage); - } - if (uResult) *uResult = -1; - TRACE("MsqSM: Msg %d Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); - return STATUS_UNSUCCESSFUL; - } - + } + if (uResult) *uResult = -1; + TRACE("MsqSM: Msg %d Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); + return STATUS_UNSUCCESSFUL; + } + + // Should we do the same for No Wait? if ( HookMessage == MSQ_NORMAL ) { pWnd = ValidateHwndNoErr(Wnd); @@ -1511,6 +1518,8 @@ // Null window or not the same "Hardware" message queue. if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != pti->MessageQueue) { + // Crossing a boundary, so set cursor. See default message queue cursor. + UserSetCursor(SYSTEMCUR(ARROW), FALSE); /* Remove and ignore the message */ *RemoveMessages = TRUE; return FALSE; @@ -2074,7 +2083,12 @@ InitializeListHead(&MessageQueue->HardwareMessagesListHead); // Keep here! MessageQueue->spwndFocus = NULL; MessageQueue->iCursorLevel = 0; - MessageQueue->CursorObject = NULL; + MessageQueue->CursorObject = SYSTEMCUR(WAIT); // See test_initial_cursor. + if (MessageQueue->CursorObject) + { + TRACE("Default cursor hcur %p\n",UserHMGetHandle(MessageQueue->CursorObject)); + UserReferenceObject(MessageQueue->CursorObject); + } RtlCopyMemory(MessageQueue->afKeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); MessageQueue->ptiMouse = pti; MessageQueue->ptiKeyboard = pti; Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1111,25 +1111,6 @@ return(0); } -/* - * NtUserSetWindowStationUser - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - STUB - - return 0; -} - BOOL APIENTRY NtUserAddClipboardFormatListener( HWND hwnd ) @@ -1156,16 +1137,4 @@ return FALSE; } -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id) -{ - return FALSE; -} - /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -252,10 +252,14 @@ ACCESS_MASK amwinsta; DWORD dwHotkey; HMONITOR hMonitor; + UINT iClipSerialNumber; struct _CURICON_OBJECT* pCursorCache; + PVOID pClientBase; + DWORD dwLpkEntryPoints; + PVOID pW32Job; + DWORD dwImeCompatFlags; LUID luidSession; USERSTARTUPINFO usi; - PVOID pW32Job; DWORD dwLayout; DWORD dwRegisteredClasses; Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Window stations - * FILE: subsystems/win32/win32k/ntuser/winsta.c + * FILE: win32ss/user/ntuser/winsta.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * TODO: The process window station is created on * the first USER32/GDI32 call not related @@ -295,7 +295,7 @@ co_IntLoadDefaultCursors(); /* Setup the icons */ - //co_IntSetWndIcons(); + co_IntSetWndIcons(); /* Show the desktop */ pdesk = IntGetActiveDesktop(); @@ -1437,7 +1437,7 @@ } BOOL APIENTRY -NEW_NtUserSetWindowStationUser( +NtUserSetWindowStationUser( HWINSTA hWindowStation, PLUID pluid, PSID psid, Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -580,13 +580,18 @@ { PSETWNDICONS_CALLBACK_ARGUMENTS Common = Arguments; - if (!hIconSmWindows) + if (!gpsi->hIconSmWindows) { - hIconSmWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); - hIconWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + Common->hIconSample = LoadImageW(0, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconHand = LoadImageW(0, IDI_HAND, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconQuestion = LoadImageW(0, IDI_QUESTION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconBang = LoadImageW(0, IDI_EXCLAMATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconNote = LoadImageW(0, IDI_ASTERISK, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + Common->hIconSmWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0); + hIconWindows = Common->hIconWindows; + hIconSmWindows = Common->hIconSmWindows; } - Common->hIconSmWindows = hIconSmWindows; - Common->hIconWindows = hIconWindows; ERR("hIconSmWindows %p hIconWindows %p \n",hIconSmWindows,hIconWindows); return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); } Modified: trunk/reactos/win32ss/user/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/w… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/misc/winsta.c + * FILE: win32ss/user/user32/misc/winsta.c * PURPOSE: Window stations * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -388,16 +388,16 @@ /* * @unimplemented */ -DWORD +BOOL WINAPI SetWindowStationUser( - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4 + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size ) { - return NtUserSetWindowStationUser(Unknown1, Unknown2, Unknown3, Unknown4); + return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); } /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS user32.dll * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: dll/win32/user32/windows/cursoricon.c + * FILE: win32ss/user//user32/windows/cursoricon.c * PURPOSE: cursor and icons implementation * PROGRAMMER: JÃ©rÃ´me Gardou (jerome.gardou(a)reactos.org) */ @@ -19,6 +19,30 @@ #define MAKEINTRESOURCE MAKEINTRESOURCEW /************* USER32 INTERNAL FUNCTIONS **********/ + +VOID LoadSystemCursors(VOID) +{ + if (!gpsi->hIconSmWindows) + { + ERR("Loading System Cursors\n"); + NtUserSetSystemCursor(LoadImageW( 0, IDC_ARROW, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_NORMAL); + NtUserSetSystemCursor(LoadImageW( 0, IDC_IBEAM, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_IBEAM); + NtUserSetSystemCursor(LoadImageW( 0, IDC_WAIT, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_WAIT); + NtUserSetSystemCursor(LoadImageW( 0, IDC_CROSS, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_CROSS); + NtUserSetSystemCursor(LoadImageW( 0, IDC_UPARROW, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_UP); + NtUserSetSystemCursor(LoadImageW( 0, IDC_ICON, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_ICON); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZE, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZE); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZENWSE, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZENWSE); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZENESW, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZENESW); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZEWE, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZEWE); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZENS, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZENS); + NtUserSetSystemCursor(LoadImageW( 0, IDC_SIZEALL, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_SIZEALL); + NtUserSetSystemCursor(LoadImageW( 0, IDC_NO, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_NO); + NtUserSetSystemCursor(LoadImageW( 0, IDC_HAND, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_HAND); + NtUserSetSystemCursor(LoadImageW( 0, IDC_APPSTARTING, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_APPSTARTING); + NtUserSetSystemCursor(LoadImageW( 0, IDC_HELP, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ), OCR_HELP); + } +} /* This callback routine is called directly after switching to gui mode */ NTSTATUS @@ -28,6 +52,9 @@ { BOOL *DefaultCursor = (BOOL*)Arguments; HCURSOR hCursor; + + /* Load system cursors first */ + LoadSystemCursors(); if(*DefaultCursor) { @@ -1397,29 +1424,25 @@ BOOL bStatus; UNICODE_STRING ustrRsrc; UNICODE_STRING ustrModule = {0, 0, NULL}; - + /* Fix width/height */ if(fuLoad & LR_DEFAULTSIZE) { if(!cxDesired) cxDesired = GetSystemMetrics(bIcon ? SM_CXICON : SM_CXCURSOR); if(!cyDesired) cyDesired = GetSystemMetrics(bIcon ? SM_CYICON : SM_CYCURSOR); } - + if(fuLoad & LR_LOADFROMFILE) { return CURSORICON_LoadFromFileW(lpszName, cxDesired, cyDesired, fuLoad, bIcon); } - + /* Check if caller wants OEM icons */ if(!hinst) hinst = User32Instance; - - if(fuLoad & LR_SHARED) - { - DWORD size = MAX_PATH; - FINDEXISTINGCURICONPARAM param; - - TRACE("Checking for an LR_SHARED cursor/icon.\n"); + + if(lpszName) + { /* Prepare the resource name string */ if(IS_INTRESOURCE(lpszName)) { @@ -1429,7 +1452,11 @@ } else RtlInitUnicodeString(&ustrRsrc, lpszName); - + } + + if(hinst) + { + DWORD size = MAX_PATH; /* Get the module name string */ while (TRUE) { @@ -1460,7 +1487,13 @@ ustrModule.MaximumLength = size * sizeof(WCHAR); break; } - + } + + if(fuLoad & LR_SHARED) + { + FINDEXISTINGCURICONPARAM param; + + TRACE("Checking for an LR_SHARED cursor/icon.\n"); /* Ask win32k */ param.bIcon = bIcon; param.cx = cxDesired; @@ -1469,7 +1502,7 @@ if(hCurIcon) { /* Woohoo, got it! */ - TRACE("MATCH!\n"); + TRACE("MATCH! %p\n",hCurIcon); HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); return hCurIcon; } @@ -1484,18 +1517,18 @@ /* We let FindResource, LoadResource, etc. call SetLastError */ if(!hrsrc) goto done; - + handle = LoadResource(hinst, hrsrc); if(!handle) goto done; - + dir = LockResource(handle); if(!dir) goto done; - + wResId = LookupIconIdFromDirectoryEx((PBYTE)dir, bIcon, cxDesired, cyDesired, fuLoad); FreeResource(handle); - + /* Get the relevant resource pointer */ hrsrc = FindResourceW( hinst, @@ -1503,11 +1536,11 @@ bIcon ? RT_ICON : RT_CURSOR); if(!hrsrc) goto done; - + handle = LoadResource(hinst, hrsrc); if(!handle) goto done; - + bits = LockResource(handle); if(!bits) { @@ -1531,32 +1564,31 @@ cursorData.cx = cxDesired; cursorData.cy = cyDesired; cursorData.rt = (USHORT)((ULONG_PTR)(bIcon ? RT_ICON : RT_CURSOR)); - + /* Get the bitmaps */ bStatus = CURSORICON_GetCursorDataFromBMI( &cursorData, (BITMAPINFO*)bits); - + FreeResource( handle ); - + if(!bStatus) goto done; - + /* Create the handle */ hCurIcon = NtUserxCreateEmptyCurObject(FALSE); if(!hCurIcon) { goto end_error; } - + + if(fuLoad & LR_SHARED) + { + cursorData.CURSORF_flags |= CURSORF_LRSHARED; + } + /* Tell win32k */ - if(fuLoad & LR_SHARED) - { - cursorData.CURSORF_flags |= CURSORF_LRSHARED; - bStatus = NtUserSetCursorIconData(hCurIcon, &ustrModule, &ustrRsrc, &cursorData); - } - else - bStatus = NtUserSetCursorIconData(hCurIcon, NULL, NULL, &cursorData); + bStatus = NtUserSetCursorIconData(hCurIcon, hinst ? &ustrModule : NULL, lpszName ? &ustrRsrc : NULL, &cursorData); if(!bStatus) { @@ -1575,7 +1607,7 @@ DeleteObject(cursorData.hbmMask); if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); - + return NULL; } @@ -2580,8 +2612,15 @@ _In_ DWORD id ) { - UNIMPLEMENTED; - return FALSE; + if (hcur == NULL) + { + hcur = LoadImageW( 0, MAKEINTRESOURCE(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ); + if (hcur == NULL) + { + return FALSE; + } + } + return NtUserSetSystemCursor(hcur,id); } BOOL WINAPI SetCursorPos( Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Thu Feb 5 00:11:35 2015 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: dll/win32/user32/windows/defwnd.c + * FILE: win32ss/user/user32/windows/defwnd.c * PURPOSE: Window management * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -181,109 +181,6 @@ } ERR("IDCWTO Nothing found\n"); return NULL; -} - -LRESULT -DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) -{ - /* Not for child windows. */ - if (hWnd != (HWND)wParam) - { - return 0; - } - - switch((short)LOWORD(lParam)) - { - case HTERROR: - { - //// This is the real fix for CORE-6129! - HWND hwndPopUP; - WORD Msg = HIWORD(lParam); - - if (Msg == WM_LBUTTONDOWN) - { - // Find a pop up window to bring active. - hwndPopUP = IntFindChildWindowToOwner(GetDesktopWindow(), hWnd); - if (hwndPopUP) - { - // Not a child pop up from desktop. - if ( hwndPopUP != GetWindow(GetDesktopWindow(), GW_CHILD) ) - { - // Get original active window. - HWND hwndOrigActive = GetActiveWindow(); - - SetWindowPos(hWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - - //SetActiveWindow(hwndPopUP); - SetForegroundWindow(hwndPopUP); // HACK - - // If the change was made, break out. - if (hwndOrigActive != GetActiveWindow()) - break; - } - } - } - //// - if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || - Msg == WM_RBUTTONDOWN || Msg == WM_XBUTTONDOWN) - { - ERR("Beep!\n"); - MessageBeep(0); - } - break; - } - - case HTCLIENT: - { - HICON hCursor = (HICON)GetClassLongPtrW(hWnd, GCL_HCURSOR); - if (hCursor) - { - SetCursor(hCursor); - return TRUE; - } - return FALSE; - } - - case HTLEFT: - case HTRIGHT: - { - if (Style & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZEWE))); - } - - case HTTOP: - case HTBOTTOM: - { - if (Style & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENS))); - } - - case HTTOPLEFT: - case HTBOTTOMRIGHT: - { - if (Style & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENWSE))); - } - case HTBOTTOMLEFT: - case HTTOPRIGHT: - { - if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE) - { - break; - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENESW))); - } - } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_ARROW))); } /*********************************************************************** @@ -893,34 +790,6 @@ case WM_CTLCOLOR: return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); - - case WM_SETCURSOR: - { - LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE); - - if (Style & WS_CHILD) - { - /* with the exception of the border around a resizable wnd, - * give the parent first chance to set the cursor */ - if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT) - { - HWND parent = GetParent( hWnd ); - if (bUnicode) - { - if (parent != GetDesktopWindow() && - SendMessageW( parent, WM_SETCURSOR, wParam, lParam)) - return TRUE; - } - else - { - if (parent != GetDesktopWindow() && - SendMessageA( parent, WM_SETCURSOR, wParam, lParam)) - return TRUE; - } - } - } - return (DefWndHandleSetCursor(hWnd, wParam, lParam, Style)); - } case WM_SYSCOMMAND: return (DefWndHandleSysCommand(hWnd, wParam, lParam));

9 years, 10 months

[hbelusca] 66165: [SPEC2DEF] - Warn about symbols that should be private. Patch by Thomas Faber. CORE-8445 #resolve #comment Committed in revision 66165. It's also nice/useful to get the warnings e...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 4 23:56:23 2015 New Revision: 66165 URL: http://svn.reactos.org/svn/reactos?rev=66165&view=rev Log: [SPEC2DEF] - Warn about symbols that should be private. Patch by Thomas Faber. CORE-8445 #resolve #comment Committed in revision 66165. It's also nice/useful to get the warnings even if we are not generating an import lib (example when building rsaenh): MSVC warns also in this case. - Improve error messages. - some_ptr = 0; ---> use NULL instead. - remove useless extra parentheses. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Feb 4 23:56:23 2015 @@ -6,6 +6,8 @@ #ifdef _MSC_VER #define strcasecmp _stricmp #endif + +#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) typedef struct _STRING { @@ -38,11 +40,13 @@ typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbMSComp = 0; int gbImportLib = 0; +int gbNotPrivateNoWarn = 0; int gbTracing = 0; int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; -char *pszDllName = 0; +char *pszSourceFileName = NULL; +char *pszDllName = NULL; char *gpszUnderscore = ""; int gbDebug; #define DbgPrint(...) (!gbDebug || fprintf(stderr, __VA_ARGS__)) @@ -80,13 +84,32 @@ ARG_FLOAT }; -char* astrCallingConventions[] = +const char* astrCallingConventions[] = { "STDCALL", "CDECL", "FASTCALL", "THISCALL", "EXTERN" +}; + +static const char* astrShouldBePrivate[] = +{ + "DllCanUnloadNow", + "DllGetClassObject", + "DllGetClassFactoryFromClassString", + "DllGetDocumentation", + "DllInitialize", + "DllInstall", + "DllRegisterServer", + "DllRegisterServerEx", + "DllRegisterServerExW", + "DllUnload", + "DllUnregisterServer", + "RasCustomDeleteEntryNotify", + "RasCustomDial", + "RasCustomDialDlg", + "RasCustomEntryDlg", }; static @@ -284,7 +307,7 @@ fprintf(file, "\tint retval;\n"); } fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(", - pszDllName, pexp->strName.len, pexp->strName.buf); + pszDllName, pexp->strName.len, pexp->strName.buf); } for (i = 0; i < pexp->nArgCount; i++) @@ -352,12 +375,12 @@ if (pexp->uFlags & FL_RET64) { fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n", - pszDllName, pexp->strName.len, pexp->strName.buf); + pszDllName, pexp->strName.len, pexp->strName.buf); } else { fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s: retval = 0x%%lx\\n\", retval);\n", - pszDllName, pexp->strName.len, pexp->strName.buf); + pszDllName, pexp->strName.len, pexp->strName.buf); } fprintf(file, "\treturn retval;\n}\n\n"); } @@ -380,8 +403,7 @@ } else if (giArch == ARCH_ARM) { - fprintf(file, - " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); + fprintf(file, " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); } } @@ -689,6 +711,7 @@ EXPORT exp; int included; char namebuffer[16]; + unsigned int i; //fprintf(stderr, "info: line %d, pcStart:'%.30s'\n", nLine, pcStart); @@ -703,7 +726,6 @@ exp.uFlags = 0; exp.nNumber++; - //if (!strncmp(pcLine, "22 stdcall @(long) MPR_Alloc",28)) // gbDebug = 1; @@ -734,7 +756,7 @@ /* Go to next token (type) */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "error: line %d, unexpected end of line\n", nLine); + fprintf(stderr, "%s line %d : error: unexpected end of line\n", pszSourceFileName, nLine); return -10; } @@ -768,8 +790,8 @@ } else { - fprintf(stderr, "error: line %d, expected callconv, got '%.*s' %d\n", - nLine, TokenLength(pc), pc, *pc); + fprintf(stderr, "%s line %d : error: expected callconv, got '%.*s' %d\n", + pszSourceFileName, nLine, TokenLength(pc), pc, *pc); return -11; } @@ -879,14 +901,14 @@ /* Go to next token */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "error: line %d, expected token\n", nLine); + fprintf(stderr, "%s line %d : error: expected token\n", pszSourceFileName, nLine); return -13; } /* Verify syntax */ if (*pc++ != '(') { - fprintf(stderr, "error: line %d, expected '('\n", nLine); + fprintf(stderr, "%s line %d : error: expected '('\n", pszSourceFileName, nLine); return -14; } @@ -937,7 +959,7 @@ exp.anArgs[exp.nArgCount] = ARG_FLOAT; } else - fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc); + fprintf(stderr, "%s line %d : error: expected type, got: %.10s\n", pszSourceFileName, nLine, pc); exp.nArgCount++; @@ -952,7 +974,7 @@ /* Check syntax */ if (*pc++ != ')') { - fprintf(stderr, "error: line %d, expected ')'\n", nLine); + fprintf(stderr, "%s line %d : error: expected ')'\n", pszSourceFileName, nLine); return -16; } } @@ -978,7 +1000,7 @@ exp.strName.len = (int)(p - pc); if (exp.strName.len < 1) { - fprintf(stderr, "error, @ in line %d\n", nLine); + fprintf(stderr, "%s line %d : error: unexpected @ found\n", pszSourceFileName, nLine); return -1; } exp.nStackBytes = atoi(p + 1); @@ -1001,7 +1023,7 @@ /* Check syntax (end of line) */ if (NextToken(pc)) { - fprintf(stderr, "error: line %d, additional tokens after ')'\n", nLine); + fprintf(stderr, "%s line %d : error: additional tokens after ')'\n", pszSourceFileName, nLine); return -17; } @@ -1010,15 +1032,28 @@ } else { - exp.strTarget.buf = 0; + exp.strTarget.buf = NULL; exp.strTarget.len = 0; } /* Check for no-name without ordinal */ if ((exp.uFlags & FL_ORDINAL) && (exp.nOrdinal == -1)) { - fprintf(stderr, "error: line %d, ordinal export without ordinal!\n", nLine); + fprintf(stderr, "%s line %d : error: ordinal export without ordinal!\n", pszSourceFileName, nLine); return -1; + } + + if (!gbNotPrivateNoWarn && !(exp.uFlags & FL_PRIVATE)) + { + for (i = 0; i < ARRAYSIZE(astrShouldBePrivate); i++) + { + if (strlen(astrShouldBePrivate[i]) == exp.strName.len && + strncmp(exp.strName.buf, astrShouldBePrivate[i], exp.strName.len) == 0) + { + fprintf(stderr, "%s line %d : warning: export of '%.*s' should be PRIVATE\n", + pszSourceFileName, nLine, exp.strName.len, exp.strName.buf); + } + } } OutputLine(fileDest, &exp); @@ -1028,26 +1063,26 @@ return 0; } - void usage(void) { printf("syntax: spec2def [<options> ...] <spec file>\n" "Possible options:\n" - " -h --help prints this screen\n" - " -l=<file> generates an asm lib stub\n" - " -d=<file> generates a def file\n" - " -s=<file> generates a stub file\n" - " --ms msvc compatibility\n" - " -n=<name> name of the dll\n" - " --implib generate a def file for an import library\n" - " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n" - " --with-tracing generates wine-like \"+relay\" trace trampolines. (necessitates -s)\n"); + " -h --help print this help screen\n" + " -l=<file> generate an asm lib stub\n" + " -d=<file> generate a def file\n" + " -s=<file> generate a stub file\n" + " --ms MSVC compatibility\n" + " -n=<name> name of the dll\n" + " --implib generate a def file for an import library\n" + " --no-private-warnings suppress warnings about symbols that should be -private\n" + " -a=<arch> set architecture to <arch> (i386, x86_64, arm)\n" + " --with-tracing generate wine-like \"+relay\" trace trampolines (needs -s)\n"); } int main(int argc, char *argv[]) { size_t nFileSize; - char *pszSource, *pszDefFileName = 0, *pszStubFileName = 0, *pszLibStubName = 0; + char *pszSource, *pszDefFileName = NULL, *pszStubFileName = NULL, *pszLibStubName = NULL; char achDllName[40]; FILE *file; int result = 0, i; @@ -1083,15 +1118,19 @@ { pszDllName = argv[i] + 3; } - else if ((strcasecmp(argv[i], "--implib") == 0)) + else if (strcasecmp(argv[i], "--implib") == 0) { gbImportLib = 1; } - else if ((strcasecmp(argv[i], "--ms") == 0)) + else if (strcasecmp(argv[i], "--ms") == 0) { gbMSComp = 1; } - else if ((strcasecmp(argv[i], "--with-tracing") == 0)) + else if (strcasecmp(argv[i], "--no-private-warnings") == 0) + { + gbNotPrivateNoWarn = 1; + } + else if (strcasecmp(argv[i], "--with-tracing") == 0) { if (!pszStubFileName) { @@ -1152,11 +1191,12 @@ pszDllName = achDllName; } - /* Open input file argv[1] */ - file = fopen(argv[i], "r"); + /* Open input file */ + pszSourceFileName = argv[i]; + file = fopen(pszSourceFileName, "r"); if (!file) { - fprintf(stderr, "error: could not open file %s ", argv[i]); + fprintf(stderr, "error: could not open file %s\n", pszSourceFileName); return -3; } @@ -1186,7 +1226,7 @@ file = fopen(pszDefFileName, "w"); if (!file) { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + fprintf(stderr, "error: could not open output file %s\n", argv[i + 1]); return -5; } @@ -1201,7 +1241,7 @@ file = fopen(pszStubFileName, "w"); if (!file) { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + fprintf(stderr, "error: could not open output file %s\n", argv[i + 1]); return -5; } @@ -1216,7 +1256,7 @@ file = fopen(pszLibStubName, "w"); if (!file) { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + fprintf(stderr, "error: could not open output file %s\n", argv[i + 1]); return -5; } @@ -1226,6 +1266,5 @@ fclose(file); } - return result; }

9 years, 10 months

[jimtabor] 66164: [NtUser] - Add object handle information and set station user support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 4 21:59:15 2015 New Revision: 66164 URL: http://svn.reactos.org/svn/reactos?rev=66164&view=rev Log: [NtUser] - Add object handle information and set station user support. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/ntuser/winsta.h Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -25,7 +25,7 @@ NTSTATUS Status; hWinSta = UserGetProcessWindowStation(); - Status = IntValidateWindowStationHandle(hWinSta, KernelMode, WINSTA_ACCESSCLIPBOARD, &pWinStaObj); + Status = IntValidateWindowStationHandle(hWinSta, KernelMode, WINSTA_ACCESSCLIPBOARD, &pWinStaObj, 0); if (!NT_SUCCESS(Status)) { ERR("Cannot open winsta\n"); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -1516,7 +1516,8 @@ Status = IntValidateWindowStationHandle( PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, - &WinStaObj); + &WinStaObj, + 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -1407,7 +1407,8 @@ Status = IntValidateWindowStationHandle(CurrentProcess->Win32WindowStation, KernelMode, 0, - &WinStaObject); + &WinStaObject, + 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -113,7 +113,6 @@ HBITMAP hPattern55AABitmap = NULL; NTSTATUS Status; -// Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) // Create Event for Diconnect Desktop. Status = UserCreateWinstaDirectory(); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -3399,7 +3399,8 @@ NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, - &WinStaObject); + &WinStaObject, + 0); if (!NT_SUCCESS(Status)) { @@ -3448,7 +3449,8 @@ Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, - &WinStaObject); + &WinStaObject, + 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -104,6 +104,8 @@ PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeleteParameters->Object; TRACE("Deleting window station (0x%p)\n", WinSta); + + WinSta->Flags |= WSS_DYING; UserEmptyClipboardData(WinSta); @@ -214,7 +216,8 @@ HWINSTA WindowStation, KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, - PWINSTATION_OBJECT *Object) + PWINSTATION_OBJECT *Object, + POBJECT_HANDLE_INFORMATION pObjectHandleInfo) { NTSTATUS Status; @@ -231,7 +234,7 @@ ExWindowStationObjectType, AccessMode, (PVOID*)Object, - NULL); + pObjectHandleInfo); if (!NT_SUCCESS(Status)) SetLastNtError(Status); @@ -291,6 +294,9 @@ /* Setup the cursor */ co_IntLoadDefaultCursors(); + /* Setup the icons */ + //co_IntSetWndIcons(); + /* Show the desktop */ pdesk = IntGetActiveDesktop(); ASSERT(pdesk); @@ -317,6 +323,29 @@ { return ScreenDeviceContext; } + +BOOL FASTCALL +CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) +{ + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + if ( gpidLogon != PsGetCurrentProcessId() ) + { + if (!(ppi->W32PF_flags & W32PF_IOWINSTA)) + { + ERR("Requires Interactive Window Station\n"); + EngSetLastError(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); + return FALSE; + } + if (!RtlAreAllAccessesGranted(ppi->amwinsta, DesiredAccess)) + { + ERR("Access Denied\n"); + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + } + return TRUE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ @@ -458,10 +487,16 @@ if (InputWindowStation == NULL) { - TRACE("Initializeing input window station\n"); + ERR("Initializeing input window station\n"); InputWindowStation = WindowStationObject; + WindowStationObject->Flags &= ~WSS_NOIO; + InitCursorImpl(); + } + else + { + WindowStationObject->Flags |= WSS_NOIO; } TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n", @@ -563,7 +598,8 @@ hWinSta, KernelMode, 0, - &Object); + &Object, + 0); if (!NT_SUCCESS(Status)) { @@ -852,6 +888,7 @@ PPROCESSINFO ppi; NTSTATUS Status; HWINSTA hwinstaOld; + OBJECT_HANDLE_INFORMATION ObjectHandleInfo; PWINSTATION_OBJECT NewWinSta = NULL, OldWinSta; ppi = PsGetCurrentProcessWin32Process(); @@ -862,7 +899,8 @@ Status = IntValidateWindowStationHandle( hWindowStation, KernelMode, 0, - &NewWinSta); + &NewWinSta, + &ObjectHandleInfo); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -895,7 +933,26 @@ ppi->prpwinsta = NewWinSta; ppi->hwinsta = hWindowStation; - + ppi->amwinsta = ObjectHandleInfo.GrantedAccess; + ERR("WS : Granted Access %p\n",ppi->amwinsta); + + if (RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_READSCREEN)) + { + ppi->W32PF_flags |= W32PF_READSCREENACCESSGRANTED; + } + else + { + ppi->W32PF_flags &= ~W32PF_READSCREENACCESSGRANTED; + } + + if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO) ) + { + ppi->W32PF_flags |= W32PF_IOWINSTA; + } + else // Might be closed if the handle is null. + { + ppi->W32PF_flags &= ~W32PF_IOWINSTA; + } return TRUE; } @@ -958,7 +1015,8 @@ hWindowStation, KernelMode, 0, - &Object); + &Object, + 0); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -1003,7 +1061,8 @@ hWindowStation, KernelMode, 0, - &Object); + &Object, + 0); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -1212,7 +1271,8 @@ Status = IntValidateWindowStationHandle(hWindowStation, KernelMode, 0, - &WindowStation); + &WindowStation, + 0); if (! NT_SUCCESS(Status)) { return Status; @@ -1376,4 +1436,75 @@ return ret; } +BOOL APIENTRY +NEW_NtUserSetWindowStationUser( + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size) +{ + NTSTATUS Status; + PWINSTATION_OBJECT WindowStation = NULL; + BOOL Ret = FALSE; + + UserEnterExclusive(); + + if (gpidLogon != PsGetCurrentProcessId()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + goto Leave; + } + + Status = IntValidateWindowStationHandle(hWindowStation, + KernelMode, + 0, + &WindowStation, + 0); + if (!NT_SUCCESS(Status)) + { + goto Leave; + } + + if (WindowStation->psidUser) + { + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); + } + + WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); + if (WindowStation->psidUser == NULL) + { + EngSetLastError(ERROR_OUTOFMEMORY); + goto Leave; + } + + _SEH2_TRY + { + ProbeForRead( psid, size, 1); + ProbeForRead( pluid, sizeof(LUID), 1); + + RtlCopyMemory(WindowStation->psidUser, psid, size); + WindowStation->luidUser = *pluid; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(WindowStation->psidUser, 0); + WindowStation->psidUser = 0; + goto Leave; + } + + Ret = TRUE; + +Leave: + if (WindowStation) ObDereferenceObject(WindowStation); + UserLeave(); + return Ret; +} + + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] Wed Feb 4 21:59:15 2015 @@ -4,8 +4,12 @@ #define SESSION_DIR L"\\Sessions" /* Window Station Status Flags */ -#define WSS_LOCKED (1) -#define WSS_NOINTERACTIVE (2) +#define WSS_LOCKED (1) +#define WSS_NOINTERACTIVE (2) +#define WSS_NOIO (4) +#define WSS_SHUTDOWN (8) +#define WSS_DYING (16) +#define WSS_REALSHUTDOWN (32) typedef struct _WINSTATION_OBJECT { @@ -31,6 +35,11 @@ INT iClipSequenceNumber; INT fClipboardChanged : 1; INT fInDelayedRendering : 1; + + PWND spwndClipboardListener; + LUID luidEndSession; + LUID luidUser; + PVOID psidUser; } WINSTATION_OBJECT, *PWINSTATION_OBJECT; @@ -95,10 +104,12 @@ HWINSTA WindowStation, KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, - PWINSTATION_OBJECT *Object); + PWINSTATION_OBJECT *Object, + POBJECT_HANDLE_INFORMATION pObjectHandleInfo); BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID); VOID FASTCALL IntEndDesktopGraphics(VOID); +BOOL FASTCALL CheckWinstaAttributeAccess(ACCESS_MASK); /* EOF */

9 years, 10 months

[hbelusca] 66163: [MSPAINT]: Improve help menu name in some languages. Patch by Jared. CORE-9087 #resolve #comment Fixed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 4 21:34:22 2015 New Revision: 66163 URL: http://svn.reactos.org/svn/reactos?rev=66163&view=rev Log: [MSPAINT]: Improve help menu name in some languages. Patch by Jared. CORE-9087 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc trunk/reactos/base/applications/mspaint/lang/de-DE.rc trunk/reactos/base/applications/mspaint/lang/en-GB.rc trunk/reactos/base/applications/mspaint/lang/en-US.rc trunk/reactos/base/applications/mspaint/lang/fr-FR.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/hu-HU.rc trunk/reactos/base/applications/mspaint/lang/it-IT.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/nl-NL.rc trunk/reactos/base/applications/mspaint/lang/no-NO.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pt-BR.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/sq-AL.rc Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&ÐÐ¾Ð¼Ð¾Ñ" BEGIN MENUITEM "ÐÐ¾Ð¼Ð¾Ñ", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Moderne Palette", IDM_COLORSMODERNPALETTE MENUITEM "Alte Palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Hilfe" BEGIN MENUITEM "Hilfethemen", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Help" BEGIN MENUITEM "&Help topics", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Help" BEGIN MENUITEM "&Help topics", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -72,7 +72,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Aide" BEGIN MENUITEM "Rubriques d'aide", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -72,7 +72,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&×¢××¨×" BEGIN MENUITEM "× ××©×× ×¢××¨×", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -72,7 +72,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&SegÃtsÃ©g" BEGIN MENUITEM "TÃ©makÃ¶rÃ¶k", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Aiuto" BEGIN MENUITEM "Guida in linea", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Help" BEGIN MENUITEM "ãã«ã ãããã¯(&H)", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Helpen" BEGIN MENUITEM "Help-onderwerpen", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&Hjelp?" + POPUP "&Hjelp" BEGIN MENUITEM "Emner i hjelp", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -81,7 +81,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Pomoc" BEGIN MENUITEM "Tematy pomocy", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Ajuda" BEGIN MENUITEM "&TÃ³picos da Ajuda", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "PaletÄ &modernÄ", IDM_COLORSMODERNPALETTE MENUITEM "PaletÄ &veche", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Ajutor" BEGIN MENUITEM "&Manualâ¦", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mspaint/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sq-AL.rc [iso-8859-1] Wed Feb 4 21:34:22 2015 @@ -80,7 +80,7 @@ MENUITEM "Paleta moderne", IDM_COLORSMODERNPALETTE MENUITEM "Paleta te vjetra", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&NdihmÃ«" BEGIN MENUITEM "NdihmÃ« me temÃ«", IDM_HELPHELPTOPICS MENUITEM SEPARATOR

9 years, 10 months

[dreimer] 66162: [RAPPS] Fix broken link to Total Commander CORE-9123 #resolve #comment Please retry. Thx for help.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 4 21:27:20 2015 New Revision: 66162 URL: http://svn.reactos.org/svn/reactos?rev=66162&view=rev Log: [RAPPS] Fix broken link to Total Commander CORE-9123 #resolve #comment Please retry. Thx for help. Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] Wed Feb 4 21:27:20 2015 @@ -9,7 +9,7 @@ Size = 3.55 MB Category = 12 URLSite = http://www.ghisler.com/ -URLDownload = http://www.slo.ru/download/total_commander/tcm851ax32.exe +URLDownload = http://totalcmd2.s3.amazonaws.com/tcmd851ax32.exe CDPath = none [Section.0407]

9 years, 10 months

[jgardou] 66161: [NTDLL] - use the edx register to store the function pointer to the syscall trampoline. This is how google Chrome checks if an exported function is a system call or not. See https:...

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Feb 4 16:58:41 2015 New Revision: 66161 URL: http://svn.reactos.org/svn/reactos?rev=66161&view=rev Log: [NTDLL] - use the edx register to store the function pointer to the syscall trampoline. This is how google Chrome checks if an exported function is a system call or not. See https://chromium.googlesource.com/chromium/src.git/+/master/sandbox/win/src… and https://bugs.winehq.org/show_bug.cgi?id=21232 for details Modified: trunk/reactos/include/asm/syscalls.inc Modified: trunk/reactos/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?r… ============================================================================== --- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Wed Feb 4 16:58:41 2015 @@ -1,109 +1,109 @@ - -#ifdef _M_IX86 -#define KUSER_SHARED_SYSCALL HEX(7ffe0300) -#define KGDT_R0_CODE 8 -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) - StackBytes = 4 * ArgCount - FPO 0, 0, 0, 0, 0, FRAME_FPO - mov eax, SyscallId - mov ecx, KUSER_SHARED_SYSCALL - call dword ptr [ecx] - ret StackBytes -ENDM -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) - StackBytes = 4 * &ArgCount - FPO 0, 0, 0, 0, 0, FRAME_FPO - mov eax, SyscallId - lea edx, [esp + 4] - pushfd - push KGDT_R0_CODE - call _KiSystemService - ret StackBytes -ENDM -#elif defined(_M_AMD64) -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) - .ENDPROLOG - mov eax, SyscallId - mov r10, rcx - syscall - ret -ENDM -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) - .ENDPROLOG - EXTERN Nt&Name:PROC - lea rax, Nt&Name[rip] - mov r10, ArgCount * 8 - jmp KiZwSystemService -ENDM -#elif defined(_M_ARM) -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) - swi #SyscallId - bx lr -ENDM -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) - mov ip, lr - swi #SyscallId - bx ip -ENDM -#elif defined(_M_PPC) -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) - stwu 1,-16(1) - mflr 0 - stw 0,0(1) - li 0, SyscallId - sc - lwz 0,0(1) - mtlr 0 - addi 1,1,16 - blr -ENDM -#define STUBCODE_K STUBCODE_U -#elif defined(_M_MIPS) -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) - li $8, KUSER_SHARED_SYSCALL - lw $8,0($8) - j $8 - nop -ENDM -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) - j KiSystemService - nop -ENDM -#else -#error unsupported architecture -#endif - -#ifdef _M_IX86 -MACRO(MAKE_LABEL, Name, StackBytes) - PUBLIC _&Name&@&StackBytes - _&Name&@&StackBytes: -ENDM -MACRO(START_PROC, Name, StackBytes) - PUBLIC _&Name&@&StackBytes - .PROC _&Name&@&StackBytes -ENDM -#else -MACRO(MAKE_LABEL, Name, StackBytes) - PUBLIC &Name - &Name: -ENDM -MACRO(START_PROC, Name, StackBytes) - PUBLIC &Name - .PROC &Name -ENDM -#endif - -MACRO(STUB_U, Name, ArgCount) - MAKE_LABEL Zw&Name, %ArgCount * 4 - START_PROC Nt&Name, %ArgCount * 4 - STUBCODE_U Name, SyscallId, %ArgCount - .ENDP - SyscallId = SyscallId + 1 -ENDM - -MACRO(STUB_K, Name, ArgCount) - START_PROC Zw&Name, %ArgCount * 4 - STUBCODE_K Name, SyscallId, %ArgCount - .ENDP - SyscallId = SyscallId + 1 -ENDM + +#ifdef _M_IX86 +#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +#define KGDT_R0_CODE 8 +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) + StackBytes = 4 * ArgCount + FPO 0, 0, 0, 0, 0, FRAME_FPO + mov eax, SyscallId + mov edx, KUSER_SHARED_SYSCALL + call dword ptr [edx] + ret StackBytes +ENDM +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) + StackBytes = 4 * &ArgCount + FPO 0, 0, 0, 0, 0, FRAME_FPO + mov eax, SyscallId + lea edx, [esp + 4] + pushfd + push KGDT_R0_CODE + call _KiSystemService + ret StackBytes +ENDM +#elif defined(_M_AMD64) +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) + .ENDPROLOG + mov eax, SyscallId + mov r10, rcx + syscall + ret +ENDM +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) + .ENDPROLOG + EXTERN Nt&Name:PROC + lea rax, Nt&Name[rip] + mov r10, ArgCount * 8 + jmp KiZwSystemService +ENDM +#elif defined(_M_ARM) +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) + swi #SyscallId + bx lr +ENDM +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) + mov ip, lr + swi #SyscallId + bx ip +ENDM +#elif defined(_M_PPC) +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) + stwu 1,-16(1) + mflr 0 + stw 0,0(1) + li 0, SyscallId + sc + lwz 0,0(1) + mtlr 0 + addi 1,1,16 + blr +ENDM +#define STUBCODE_K STUBCODE_U +#elif defined(_M_MIPS) +MACRO(STUBCODE_U, Name, SyscallId, ArgCount) + li $8, KUSER_SHARED_SYSCALL + lw $8,0($8) + j $8 + nop +ENDM +MACRO(STUBCODE_K, Name, SyscallId, ArgCount) + j KiSystemService + nop +ENDM +#else +#error unsupported architecture +#endif + +#ifdef _M_IX86 +MACRO(MAKE_LABEL, Name, StackBytes) + PUBLIC _&Name&@&StackBytes + _&Name&@&StackBytes: +ENDM +MACRO(START_PROC, Name, StackBytes) + PUBLIC _&Name&@&StackBytes + .PROC _&Name&@&StackBytes +ENDM +#else +MACRO(MAKE_LABEL, Name, StackBytes) + PUBLIC &Name + &Name: +ENDM +MACRO(START_PROC, Name, StackBytes) + PUBLIC &Name + .PROC &Name +ENDM +#endif + +MACRO(STUB_U, Name, ArgCount) + MAKE_LABEL Zw&Name, %ArgCount * 4 + START_PROC Nt&Name, %ArgCount * 4 + STUBCODE_U Name, SyscallId, %ArgCount + .ENDP + SyscallId = SyscallId + 1 +ENDM + +MACRO(STUB_K, Name, ArgCount) + START_PROC Zw&Name, %ArgCount * 4 + STUBCODE_K Name, SyscallId, %ArgCount + .ENDP + SyscallId = SyscallId + 1 +ENDM

9 years, 10 months

[akhaldi] 66160: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-7861

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 4 14:58:20 2015 New Revision: 66160 URL: http://svn.reactos.org/svn/reactos?rev=66160&view=rev Log: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-7861 Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Wed Feb 4 14:58:20 2015 @@ -75,37 +75,37 @@ DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Sayfa Ayarla" BEGIN - GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX + GROUPBOX "Ãn Ä°zleme", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 22, 36, 8 + GROUPBOX "KÃ¢ÄÄ±t", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "&BÃ¼yÃ¼klÃ¼k:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 42, 36, 8 + LTEXT "&Kaynak:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 82, 30, 8 + GROUPBOX "YÃ¶n", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Portre", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "K&Ä±r Resmi", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "KÄ±yÄ±lar", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&SaÄ:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Right:", stc16, 159, 82, 30, 8 + LTEXT "S&ol:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "T&op:", stc17, 88, 102, 30, 8 + LTEXT "&Ãst:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Bottom:", stc18, 159, 102, 30, 8 + LTEXT "&Alt:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Header:", 0x140, 8, 132, 40, 15 + LTEXT "Ãs&t Bilgi:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Footer:", 0x142, 8, 149, 40, 15 + LTEXT "A&lt Bilgi:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 + PUSHBUTTON "YardÄ±m", IDHELP, 8, 170, 50, 14 + DEFPUSHBUTTON "Tamam", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Ä°ptal", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "&YazÄ±cÄ±...", psh3, 310, 170, 50, 14 END /* Dialog 'Encoding' */ @@ -179,5 +179,5 @@ STRING_LF "UNIX (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d. YataÃ§, %d. DikeÃ§" - STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_PRINTERROR """%s"" kÃ¼tÃ¼ÄÃ¼ yazdÄ±rÄ±lamÄ±yor.\n\nYazÄ±cÄ±nÄ±n aÃ§Ä±k olduÄundan ve doÄru yapÄ±landÄ±rÄ±ldÄ±ÄÄ±ndan emin olunuz." END Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] Wed Feb 4 14:58:20 2015 @@ -146,6 +146,6 @@ IDS_SUMMARYSUBTITLE "Kurulumdan aygÄ±tÄ±na uygulanmadan Ã¶nce gÃ¶zden geÃ§irmek iÃ§in dizelgelenen kurulum seÃ§enekleri." IDS_ABORTSETUP "ReactOS bilgisayarÄ±nÄ±za tÃ¼mÃ¼yle kurulmadÄ±. EÄer Åimdi Kur'dan Ã§Ä±karsanÄ±z, ReactOS'u kurmak iÃ§in Kur'u yeniden Ã§alÄ±ÅtÄ±rmayÄ± isteybilirsiniz. GerÃ§ekten Ã§Ä±kÄ±lsÄ±n mÄ±?" IDS_ABORTSETUP2 "Kurulum iptal edilsin mi?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF """txtsetup.sif"" bulunamÄ±yor.\nKur sÃ¼rdÃ¼remiyor." IDS_CAPTION "ReactOS Kur" END Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] Wed Feb 4 14:58:20 2015 @@ -424,7 +424,7 @@ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 GROUPBOX "KÃ¢ÄÄ±t", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "B&oyutlar:", stc2, 16, 112, 36, 8 + LTEXT "B&Ã¼yÃ¼klÃ¼k:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL LTEXT "Ka&ynak:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL Modified: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] Wed Feb 4 14:58:20 2015 @@ -1856,7 +1856,7 @@ 212 "BaÅarÄ±yla baÄlandÄ±.\0" 213 "HusÃ»siyetler'e basmakla husÃ»sÃ® seÃ§ili kimlik doÄrulamasÄ± yÃ¶ntemi baÅlatÄ±lmalÄ±dÄ±r.\0" 214 "lnk\0" - 215 "Ãevirme kÄ±sayolu kÃ¼tÃ¼kleri (*.rnk)\0" + 215 "Ãevirme KÄ±sayolu KÃ¼tÃ¼kleri (*.rnk)\0" 216 "*.rnk\0" 217 "Ãevirme KÄ±sayolu OluÅtur\0" 218 "%1'e baÄlanma baÅarÄ±sÄ±z oldu. Yeniden baÄlanma beklemede...\0" @@ -1939,7 +1939,7 @@ 295 "Ãoklu GeÃ§ekler\0" 296 "(Ayarlamak iÃ§in YapÄ±landÄ±r'a basÄ±nÄ±z.)\0" 297 "DeÄiÅmez DNS ve WINS adresleri girebilirsiniz.\0" - 298 "Ad Sunucu Adresleri\0" + 298 "Ad Sunucusu Adresleri\0" 299 "DÃ¼ÅÃ¼k dÃ¼zey RAS\0" 300 "PPP\0" 301 "PPP Ã§oklu baÄlantÄ±lÄ±\0" @@ -1956,7 +1956,7 @@ 312 """%1"" Ã¶nceden dizelgede.\0" 313 "Åifremi ve verimi koru.\0" 314 "%1 iletiÅim kÃ¢idesi kurulu olmadÄ±ÄÄ±ndan ya da Uzaktan EriÅim iÃ§in edilgin olduÄundan dolayÄ± seÃ§ilemiyor. DeÄiÅtirmek iÃ§in Denetim MasasÄ±'nda AÄ'Ä± baÅlatÄ±nÄ±z, Hizmetler sayfasÄ±nÄ± seÃ§iniz, Uzaktan EriÅim HusÃ»siyetleri'ni seÃ§ip aÄ dÃ¼Ämesine basÄ±nÄ±z.\0" - 315 "Åifre kaydedilemiyor.\0" + 315 "Åifre saklanamÄ±yor.\0" 316 "Veri gÃ¶rÃ¼ntÃ¼lenemiyor.\0" 317 "KendiliÄinden Ã§evirme bilgisi alÄ±namÄ±yor.\0" 318 "Ä°letiÅim kutusu yÃ¼klenemiyor.\0" @@ -2010,7 +2010,7 @@ 366 "Telefon NumarasÄ± Ãn Ekleri\0" 367 "Bir ya da daha Ã§ok istenilen aÄ iletiÅim kÃ¢idesi baÅarÄ±lÄ± olarak baÄlanmadÄ±.\n\n\0" 368 "BaÄlantÄ±yÄ± olduÄu gibi kullanmak iÃ§in Onayla'ya, baÄlantÄ±yÄ± kesmek iÃ§in Ertele'ye basÄ±nÄ±z.\0" - 369 "%1, %2 arayÃ¼zÃ¼nde bir isteÄe baÄlÄ± arama baÄlantÄ±sÄ± baÅlattÄ±ÄÄ±nda kullanÄ±lacak noktadan noktaya iletiÅim kÃ¢idesi ayarlarÄ±:\0" + 369 "%1, %2 arayÃ¼zÃ¼nde bir isteÄe baÄlÄ± Ã§evirme baÄlantÄ±sÄ± baÅlattÄ±ÄÄ±nda kullanÄ±lacak noktadan noktaya iletiÅim kÃ¢idesi ayarlarÄ±:\0" 370 "[Saklanan Åifreyi deÄiÅtirmek iÃ§in buraya tÄ±klayÄ±nÄ±z.]\0" 405 "Daha eski RAS sunucularÄ±nÄ± aramak iÃ§in NetBEUI iletiÅim kÃ¢idesi gereklidir.\0" 406 "Daha eski RAS sunucularÄ±nÄ± arayabilmenizden Ã¶nce NetBEUI iletiÅim kÃ¢idesini kurmalÄ±sÄ±nÄ±z. NetBEUI, Denetim MasasÄ± AÄ Ã¶Äesiyle kurulabilir.\0" @@ -2039,276 +2039,276 @@ 429 "Kimlik doÄrulamasÄ± yapÄ±ldÄ±.\0" 430 "%1'den baÄlanÄ±yor...\0" 431 "Ãevriliyor...\0" - 432 "Modems connecting...\0" - 433 "Connecting over cable...\0" - 434 "Dialing %1...\0" - 435 "Connecting over X.25 to %1...\0" - 436 "Postconnecting through %1...\0" - 437 "Preconnecting through %1...\0" - 438 "Connected.\0" - 439 "Device connected.\0" - 440 "Disconnected.\0" - 441 "Modem connected.\0" - 442 "Cable connected.\0" - 443 "Opening port...\0" - 444 "X.25 connected.\0" - 445 "Port opened.\0" - 446 "Postconnect complete.\0" - 447 "Preconnect complete.\0" - 448 "Preparing for callback...\0" - 449 "Checking network protocol connections...\0" - 450 "Verifying username and password...\0" - 451 "Connected, bundling additional lines\0" - 452 "Unknown state.\0" - 453 "Waiting for callback...\0" - 454 "Waiting for modem reset...\0" - 455 "Make the phone number change permanent?\0" + 432 "Ãevirgeler baÄlanÄ±yor...\0" + 433 "Kablo boyunca baÄlanÄ±lÄ±yor...\0" + 434 "%1 Ã§evriliyor...\0" + 435 "%1'e X.25 boyunca baÄlanÄ±lÄ±yor...\0" + 436 "%1 boyunca sonradan baÄlanÄ±lÄ±yor...\0" + 437 "%1 boyunca Ã¶nceden baÄlanÄ±lÄ±yor...\0" + 438 "BaÄlandÄ±.\0" + 439 "AygÄ±t baÄlandÄ±.\0" + 440 "BaÄlantÄ±sÄ± kesildi.\0" + 441 "Ãevirge baÄlandÄ±.\0" + 442 "Kablo baÄlandÄ±.\0" + 443 "GiriÅ aÃ§Ä±lÄ±yor...\0" + 444 "X.25 baÄlandÄ±.\0" + 445 "GiriÅ baÄlandÄ±.\0" + 446 "Sonradan baÄlanmak bitti.\0" + 447 "Ãnceden baÄlanmak bitti.\0" + 448 "Geri arama iÃ§in hazÄ±rlanÄ±yor...\0" + 449 "AÄ iletiÅim kÃ¢idesi baÄlantÄ±larÄ± denetleniyor...\0" + 450 "KullanÄ±cÄ± adÄ± ve Åifre doÄrulanÄ±yor...\0" + 451 "BaÄlandÄ±, ek geÃ§ekler paketleniyor\0" + 452 "Bilinmeyen durum.\0" + 453 "Geri arama iÃ§in bekleniyor...\0" + 454 "Ãevirge sÄ±fÄ±rlanmasÄ± iÃ§in bekleniyor...\0" + 455 "Telefon numarasÄ± deÄiÅikliÄi kalÄ±cÄ± yapÄ±lsÄ±n mÄ±?\0" 456 "scp\0" 457 "*.scp\0" - 458 "Dial-up script files (*.scp)\0" - 459 "Browse Dial-Up Scripts\0" - 460 "You must check at least one modem or adapter.\0" - 461 "Phone number\0" - 462 "TCP/IP protocol is required to call SLIP servers.\0" - 463 "Before you can call SLIP servers you must install the TCP/IP protocol. TCP/IP can be installed with the Control Panel Network applet.\0" - 464 "Status\0" - 465 "&New suffix:\0" - 466 "&Suffixes:\0" - 467 "Phone Number Suffixes\0" - 468 "You can go on to choose special settings, if necessary.\0" - 469 "Custom Settings\0" - 470 "Manual Modem Command Terminal\0" - 471 "After Dial Terminal\0" - 472 "Before Dial Terminal\0" - 473 "SLIP Login Terminal\0" - 474 "10 minutes\0" - 475 "10 seconds\0" - 476 "1 hour\0" - 477 "1 minute\0" - 478 "24 hours\0" - 479 "2 hours\0" - 480 "2 minutes\0" - 481 "30 minutes\0" - 482 "30 seconds\0" - 483 "3 seconds\0" - 484 "4 hours\0" - 485 "4 minutes\0" - 486 "5 minutes\0" - 487 "5 seconds\0" - 488 "8 hours\0" - 489 "never\0" - 490 "You can make the new connection available to any user or only to yourself.\0" - 491 "Connection Availability\0" - 492 "Discard multiple line settings for the entry?\0" - 493 "Unavailable device\0" - 494 "Logon Preferences\0" - 495 "Dial-up Preferences\0" + 458 "Ãevirme Betik KÃ¼tÃ¼kleri (*.scp)\0" + 459 "Ãevirme Betiklerine GÃ¶z At\0" + 460 "En azÄ±ndan bir Ã§evirgeyi ya da bir baÄdaÅtÄ±rÄ±cÄ±yÄ± denetlemelisiniz.\0" + 461 "Telefon numarasÄ±\0" + 462 "TCP/IP iletiÅim kÃ¢idesi SLIP sunucularÄ±nÄ± aramak iÃ§in gereklidir.\0" + 463 "SLIP sunucularÄ±nÄ± arayabilmenizden Ã¶nce TCP/IP iletiÅim kÃ¢idesini kuramlÄ±sÄ±nÄ±z. TCP/IP Denetim MasasÄ± AÄ Ã¶Äesiyle yÃ¼klenebilir.\0" + 464 "Durum\0" + 465 "&Yeni Ãn Ek:\0" + 466 "&Ãn Ekler:\0" + 467 "Telefon NumarasÄ± Ãn Ekleri\0" + 468 "Gerekliyse husÃ»sÃ® ayarlarÄ± seÃ§meye gidebilirsiniz.\0" + 469 "HusÃ»sÃ® Ayarlar\0" + 470 "Elle Ãevirge Komut UÃ§birimi\0" + 471 "UÃ§birimi Ãevirmeden Sonra\0" + 472 "UÃ§birimi Ãevirmeden Ãnce\0" + 473 "SLIP Oturum AÃ§ma UÃ§birimi\0" + 474 "10 dakÃ®ka\0" + 475 "10 sÃ¢niye\0" + 476 "1 saat\0" + 477 "1 dakÃ®ka\0" + 478 "24 saat\0" + 479 "2 saat\0" + 480 "2 dakÃ®ka\0" + 481 "30 dakÃ®ka\0" + 482 "30 sÃ¢niye\0" + 483 "3 sÃ¢niye\0" + 484 "4 saat\0" + 485 "4 dakÃ®ka\0" + 486 "5 dakÃ®ka\0" + 487 "5 sÃ¢niye\0" + 488 "8 saat\0" + 489 "hiÃ§bir zaman\0" + 490 "Yeni baÄlantÄ±yÄ± bir kullanÄ±cÄ± iÃ§in ya da yalnÄ±zca kendiniz iÃ§in kullanÄ±labilir yapabilirsiniz.\0" + 491 "BaÄlantÄ± KullanÄ±labilirliÄi\0" + 492 "Girdi iÃ§in Ã§oklu geÃ§ek ayarlarÄ±nÄ± Ã§Ä±kar?\0" + 493 "Var olmayan aygÄ±t\0" + 494 "Oturum AÃ§ma YeÄlemeleri\0" + 495 "Ãevirme YeÄlemeleri\0" 496 "X.25\0" 497 "X.25 PAD\0" - 498 "You can let other computers access resources through this dial-up connection.\0" - 499 "VPN Server Selection\0" - 500 "Cannot enable on-demand dialing.\0" - 501 "What is the name or address of the VPN server?\0" - 502 "Cannot disable on-demand dialing.\0" - 503 "Public Network\0" - 504 "ReactOS can make sure the public network is connected first.\0" + 498 "Bu Ã§evirmeli baÄlantÄ±dan baÅka bilgisayarlarÄ±n kaynaklara eriÅmesine izin verebilirsiniz.\0" + 499 "VPN Sunucusu SeÃ§imi\0" + 500 "Ä°stek Ã¼zerine Ã§evirme etkinleÅtirilemiyor.\0" + 501 "VPN sunucusunun adÄ± ya da adresi ne?\0" + 502 "Ä°steÄe baÄlÄ± Ã§evirme edilginleÅtirilemiyor.\0" + 503 "UmÃ»mÃ® AÄ\0" + 504 "ReactOS umÃ»mÃ® aÄÄ±n ilk kez baÄlandÄ±ÄÄ±na emin olabilir.\0" 505 "VPN1\0" - 506 "Internet Connection Sharing\0" - 507 "You can let a local network access resources through this dial-up connection.\0" - 508 "Host or Guest?\0" - 509 "Internet Connection Sharing is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0" - 510 "To connect two computers, your computer must be identified as either a host or a guest.\0" - 511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically. Are you sure you want to enable Internet Connection Sharing?\0" - 512 "Select a Device\0" - 513 "This is the device that will be used to make the connection.\0" - 514 "&Connect\0" - 515 "Let the server determine encryption\0" - 516 "Always encrypt my data\0" - 517 "Use MPPE-40 data encryption\0" - 518 "Use MPPE-128 data encryption\0" - 519 "The current encryption selection requires MS-CHAP or EAP authentication.\0" - 520 "Custom Authentication Message\0" - 521 "Connecting to %1...\0" - 522 "Connection Name\0" - 523 "Automatic\0" + 506 "UmÃ»mÃ® AÄ BaÄlantÄ±sÄ± PaylaÅÄ±mÄ±\0" + 507 "Bu Ã§evirmeli baÄlantÄ±dan bir yerli aÄÄ±n kaynaklara eriÅmesine izin verebilirsiniz.\0" + 508 "Anabilgisayar ya da Konuk?\0" + 509 "UmÃ»mÃ® AÄ BaÄlantÄ±sÄ± PaylaÅÄ±mÄ± ""%1"" baÄlantÄ±sÄ± iÃ§in Åimdilik etkin.\n\nOnun yerine ""%2"" baÄlantÄ±sÄ± iÃ§in Åimdi etkin olacaktÄ±r.\0" + 510 "Ä°ki bilgisayarÄ± baÄlamak iÃ§in, bilgisayarÄ±nÄ±z bir anabilgisayar ya da bir konuk olarak tanÄ±mlanmalÄ±dÄ±r.\0" + 511 "UmÃ»mÃ® AÄ BaÄlantÄ±sÄ± PaylaÅÄ±mÄ± etkin olduÄunda LAN baÄdaÅtÄ±rÄ±cÄ±nÄ±z 192.168.0.1 IP adresini kullanmaya ayarlanacaktÄ±r. BilgisayarÄ±nÄ±z aÄÄ±nÄ±zda baÅka bilgisayarlarla baÄlanabilirliÄini yitirebilir. Bu baÅka bilgisayarlarÄ±n deÄiÅmez IP adresleri varsa kendiliÄinden IP adreslerini saÄlamak iÃ§in onlarÄ± ayarlamalÄ±sÄ±nÄ±z. UmÃ»mÃ® AÄ BaÄlantÄ±sÄ± PaylaÅÄ±mÄ±'nÄ± etkinleÅtirmek istediÄinizden emin misiniz?\0" + 512 "Bir AygÄ±t SeÃ§\0" + 513 "Bu, baÄlantÄ±yÄ± yapmak iÃ§in kullanÄ±lacak aygÄ±ttÄ±r.\0" + 514 "&BaÄlan\0" + 515 "Sunucu belirleme Åifrelemesine izin ver\0" + 516 "Verimi tÃ¼m zamanlarda Åifrele\0" + 517 "MPPE-40 veri Åifrelemesini kullan\0" + 518 "MPPE-128 veri Åifrelemesini kullan\0" + 519 "Åimdiki Åifreleme seÃ§imi MS-CHAP ya da EAP kimlik doÄrulamasÄ±nÄ± gerektirir.\0" + 520 "HusÃ»sÃ® Kimlik DoÄrulamasÄ± Ä°letisi\0" + 521 "%1'e baÄlanÄ±lÄ±yor...\0" + 522 "BaÄlantÄ± AdÄ±\0" + 523 "KendiliÄinden\0" 524 "PPTP VPN\0" 525 "L2TP IPSec VPN\0" - 526 "Select the type of the connection.\0" - 527 "Type of Connection\0" + 526 "BaÄlantÄ±nÄ±n tÃ¼rÃ¼nÃ¼ seÃ§iniz.\0" + 527 "BaÄlantÄ±nÄ±n TÃ¼rÃ¼\0" 528 "hh.exe netcfg.chm::/trouble_all.htm\0" - 529 "Virtual Private Connection\0" - 530 "Use any form of authentication required including clear text. Do not encrypt data.\0" - 531 "Use any form of authentication that requires passwords to be encrypted. Do not encrypt data.\0" - 532 "Please type a name for the entry.\0" - 533 "Encrypt passwords and data.\0" - 534 "Please type a port number between 1 and 65535.\0" - 535 "Specify custom authentication and data encryption with the Settings button.\0" - 536 "Use any form of authentication that requires encrypted passwords. Do not encrypt data.\0" - 537 "Encrypt passwords and data.\0" - 538 "Specify custom authentication and data encryption with the Settings button.\0" - 539 "The port number is already used by another entry.\nPlease enter a unique port number.\0" - 540 "Please enter one or more ports for incoming responses.\0" - 541 "Please select the entry to be deleted.\0" - 542 "1 second\0" - 543 "Please select the entry to be modified.\0" - 549 "What is the name of the other computer you are connecting to?\0" - 576 "20 minutes\0" - 579 "Specify a name for this connection to your workplace.\0" - 581 "Network Application Settings\0" - 582 "Type a name for this connection in the following box.\0" - 583 "Type the name of the other computer in the following box.\0" - 584 "Type the name of your ISP in the following box.\0" - 585 "What is the name of the service that provides your Internet connection?\0" - 586 "Please type the IP address of the server computer on the private network.\0" - 587 "Advanced Settings\0" - 588 "The entry name begins with a period. or contains some invalid characters. \nChoose a different name.\0" - 589 "Properties\0" - 1512 "Communications Port\0" - 1523 " channel\0" - 1526 "Smart Cards\0" - 1527 "You can use your smart card with this connection.\0" - 1528 "Direct Connection\0" - 1529 "Please select a device for this connection.\0" - 1530 "Verdana Bold\0" + 529 "FarazÃ® ÅahsÃ® BaÄlantÄ±\0" + 530 "AÃ§Ä±k metin iÃ§erme gerekli kimlik doÄrulamasÄ±nÄ±n bir tÃ¼rÃ¼nÃ¼ kullanÄ±nÄ±z. Veri Åifrelemeyiniz\0" + 531 "Åifrelerin Åifrelenmesini gerektiren kimlik doÄrulamasÄ±nÄ±n bir tÃ¼rÃ¼nÃ¼ kullanÄ±nÄ±z. Veri Åifrelemeyiniz.\0" + 532 "LÃ¼tfen girdi iÃ§in bir ad yazÄ±nÄ±z.\0" + 533 "Åifreleri ve veriyi Åifreleyiniz.\0" + 534 "LÃ¼tfen 1 ile 65535 arasÄ±nda bir giriÅ numarasÄ± yazÄ±nÄ±z.\0" + 535 "Ayarlar dÃ¼Ämesiyle husÃ»sÃ® kimlik doÄrulamasÄ± ve veri Åifrelemesi belirtiniz.\0" + 536 "ÅifrelenmiÅ Åifreler gerektiren kimlik doÄrulamasÄ±nÄ±n bir tÃ¼rÃ¼nÃ¼ kullanÄ±nÄ±z. Veri Åifrelemeyiniz.\0" + 537 "Åifreleri ve veriyi Åifreleyiniz.\0" + 538 "Ayarlar dÃ¼Ämesiyle husÃ»sÃ® kimlik doÄrulamasÄ± ve veri Åifrelemesi belirtiniz.\0" + 539 "GiriÅ numarasÄ± baÅka bir girdi eliyle Ã¶nceden kullanÄ±lmÄ±Å.\nLÃ¼tfen bir eÅsiz giriÅ numarasÄ± giriniz.\0" + 540 "Gelen yanÄ±tlar iÃ§in bir ya da daha Ã§ok giriÅ giriniz.\0" + 541 "LÃ¼tfen silinecek girdiyi seÃ§iniz.\0" + 542 "1 sÃ¢niye\0" + 543 "LÃ¼tfen deÄiÅtirilecek girdiyi seÃ§iniz.\0" + 549 "BaÄlanÄ±yor olduÄunuz baÅka bilgisayarÄ±n adÄ± ne?\0" + 576 "20 dakÃ®ka\0" + 579 "Ä°Å yerinize bu baÄlantÄ± iÃ§in bir ad belirtiniz.\0" + 581 "AÄ Uygulama AyarlarÄ±\0" + 582 "AÅaÄÄ±daki kutuda bu baÄlantÄ± iÃ§in bir ad yazÄ±nÄ±z.\0" + 583 "AÅaÄÄ±daki kutuda baÅka bilgisayarÄ±n adÄ±nÄ± yazÄ±nÄ±z.\0" + 584 "AÅaÄÄ±daki kutuda ISP'nizin adÄ±nÄ± yazÄ±nÄ±z.\0" + 585 "UmÃ»mÃ® AÄ baÄlantÄ±nÄ±zÄ± saÄlayan hizmetin adÄ± ne?\0" + 586 "LÃ¼tfen ÅahsÃ® aÄda sunucu bilgisayarÄ±n IP adresini yazÄ±nÄ±z.\0" + 587 "GeliÅmiÅ Ayarlar\0" + 588 "Girdi adÄ± bir noktayla baÅlÄ±yor veyÃ¢ birtakÄ±m geÃ§ersiz damgalar iÃ§eriyor.\nAyrÄ± bir ad seÃ§iniz.\0" + 589 "HusÃ»siyetler\0" + 1512 "Ä°letiÅim GiriÅi\0" + 1523 " kanal\0" + 1526 "AkÄ±llÄ± Kartlar\0" + 1527 "Bu baÄlantÄ±yla akÄ±llÄ± kartÄ±nÄ±zÄ± kullanabilirsiniz.\0" + 1528 "DoÄrudan BaÄlantÄ±\0" + 1529 "LÃ¼tfen bu baÄlantÄ± iÃ§in bir aygÄ±t seÃ§iniz.\0" + 1530 "Verdana KalÄ±n\0" 1531 "12\0" - 1532 "Connection Type\0" - 1533 "Select the type of demand dial interface you want to create.\0" - 1534 "Select a device\0" - 1535 "This is the device that will be used to make the connection.\0" - 1536 "Phone Number\0" - 1537 "Enter the phone number of the remote server or router you are calling.\0" - 1538 "VPN Type\0" - 1539 "Select the type of VPN interface you want to create.\0" - 1540 "Destination Address\0" - 1541 "What is the name or address of the remote router?\0" - 1544 "IP Address\0" - 1545 "Configure this router's IP address for this interface.\0" - 1546 "Name Server Addresses\0" - 1547 "Configure DNS and WINS addresses for use by this interface.\0" - 1548 "Router Scripting\0" - 1549 "You can set up a scripting for connecting to the remote router.\0" - 1550 "Dial In Credentials\0" - 1551 "Configure the user name and password that the remote router will use when it dials in to this server.\0" - 1552 "Dial Out Credentials\0" - 1553 "Configure the user name and password to be used when connecting to the remote router.\0" - 1554 "Interface Name\0" - 1555 "Select the name by which this new interface will be known.\0" - 1556 "No available devices\0" - 1557 "A user account named %1 already exists on the local computer. Should the demand dial interface be configured to use this user account?\0" - 1558 "There are no security protocol settings for SLIP server connections.\0" - 1559 "Allow unsecured password\0" - 1560 "Require secured password\0" - 1561 "Use smart card\0" - 1562 "You must select at least one password authentication protocol.\0" - 1563 "No encryption allowed (server will disconnect if it requires encryption)\0" - 1564 "Optional encryption (connect even if no encryption)\0" - 1565 "Require encryption (disconnect if server declines)\0" - 1566 "Maximum strength encryption (disconnect if server declines)\0" - 1567 " (encryption enabled)\0" - 1568 "Internet Account Information\0" - 1569 "You will need an account name and password to sign in to your Internet account.\0" - 1570 "The selected EAP package does not provide encryption keys. Select an EAP package that does provide keys or select not to encrypt.\0" - 1571 "The current encryption selection requires EAP or some version of MS-CHAP logon security methods.\0" - 1572 "Protocols and Security\0" - 1573 "Select transports and security options for this connection.\0" - 1574 "The protocols you have selected include PAP, SPAP, and/or CHAP. If one of these is negotiated, data encryption will not occur. Do you want to keep these settings?\0" - 1575 "To connect to '%1', you must first be connected to '%2'. Do you want to connect to '%2' now?\0" - 1576 "Connecting over parallel cable...\0" - 1577 "Connecting over infrared...\0" - 1578 "Parallel cable connected.\0" - 1579 "Infrared connected.\0" - 1580 "This connection was configured to use a data encryption strength that is not supported by the installed software. The security properties of this connection have been reset to the available encryption strengths.\0" - 1581 "Typ&e of VPN:\0" - 1582 "Please enter a user name.\0" - 1583 "This user name and password will be saved for your own use. There is already a user name and password saved for all other users of this connection. Do you want to delete the user name and password saved for all other users?\0" - 1584 "For example, you could type the name of your workplace or the name of a server you will connect to.\0" - 1585 "Account Information\0" - 1586 "The controls on this property sheet are disabled because the system must first be rebooted before any configuration changes can be made.\0" - 1587 "The controls on this property sheet are disabled because one or more other Network property sheets are already open. To use these controls, close all these property sheets and then reopen this one.\0" - 1588 "Some of the controls on this property sheet are disabled because you do not have sufficient privileges to access them.\0" - 1589 "The following message was received from your service provider:\r\n\r\n%1\0" - 1590 "Reconnect %1\0" - 1591 "Service Name\0" - 1592 "What is the name of the service that provides your broadband connection?\0" - 1593 "You will need an account name and password to sign on to your account\0" + 1532 "BaÄlantÄ± TÃ¼rÃ¼\0" + 1533 "OluÅturmak istediÄiniz isteÄe baÄlÄ± Ã§evirme arayÃ¼zÃ¼nÃ¼n tÃ¼rÃ¼nÃ¼ seÃ§iniz.\0" + 1534 "Bir aygÄ±t seÃ§\0" + 1535 "Bu, baÄlantÄ±yÄ± yapmak iÃ§in kullanÄ±lacak aygÄ±ttÄ±r.\0" + 1536 "Telefon NumarasÄ±\0" + 1537 "ArÄ±yor olduÄunuz uzak sunucunun ya da yÃ¶nlendiricinin telefon numarasÄ±nÄ± giriniz.\0" + 1538 "VPN TÃ¼rÃ¼\0" + 1539 "OluÅturmak istediÄiniz VPN arayÃ¼zÃ¼nÃ¼n tÃ¼rÃ¼nÃ¼ seÃ§iniz.\0" + 1540 "VarÄ±Å Adresi\0" + 1541 "Uzak yÃ¶lendiricinin adÄ± ya da adresi ne?\0" + 1544 "IP Adresi\0" + 1545 "Bu arayÃ¼z iÃ§in bu yÃ¶nlendiricinin IP adresini yapÄ±landÄ±rÄ±nÄ±z.\0" + 1546 "Ad Sunucusu Adresleri\0" + 1547 "Bu arayÃ¼z eliyle kullanmak iÃ§in DNS ve WINS adreslerini yapÄ±landÄ±rÄ±nÄ±z.\0" + 1548 "YÃ¶nlendirici Betik KÃ¼tÃ¼ÄÃ¼\0" + 1549 "Uzak yÃ¶nlendiriciye baÄlanma iÃ§in bir betik kÃ¼tÃ¼ÄÃ¼ ayarlayabilirsiniz.\0" + 1550 "Ä°Ã§eriye Arama Kimlik Bilgileri\0" + 1551 "Bu sunucuya iÃ§eri aradÄ±ÄÄ±nda uzak yÃ¶nlendiricinin kullanacaÄÄ± kullanÄ±cÄ± adÄ±nÄ± ve Åifreyi yapÄ±landÄ±rÄ±nÄ±z.\0" + 1552 "DÄ±ÅaryÄ±a Arama Kimlik Bilgileri\0" + 1553 "Uzak yÃ¶nlendiriciye baÄlanÄ±rken kullanÄ±lacak kullanÄ±cÄ± adÄ±nÄ± ve Åifreyi yapÄ±landÄ±rÄ±nÄ±z.\0" + 1554 "ArayÃ¼z AdÄ±\0" + 1555 "Bilinecek bu yeni arayÃ¼z eliyle adÄ± seÃ§iniz.\0" + 1556 "KullanÄ±labilir aygÄ±t yok\0" + 1557 "%1 adlÄ± bir kullanÄ±cÄ± hesÃ¢bÄ± yerli bilgisayar Ã¼zerinde Ã¶nceden var. Bu kullanÄ±cÄ± hesÃ¢bÄ±nÄ± kullanmak iÃ§in isteÄe baÄlÄ± Ã§evirme arayÃ¼zÃ¼ yapÄ±landÄ±rÄ±lmalÄ± mÄ±?\0" + 1558 "SLIP sunucusu baÄlantÄ±larÄ± iÃ§in burada bir gÃ¼venlik iletiÅim kÃ¢idesi ayÃ¢rÄ± yok.\0" + 1559 "GÃ¼vensiz Åifreye Ä°zin Ver\0" + 1560 "GÃ¼venli Åifre Gerektir\0" + 1561 "AkÄ±llÄ± Kart Kullan\0" + 1562 "En azÄ±ndan bir Åifre kimlik doÄrulamasÄ± iletiÅim kÃ¢idesi seÃ§melisiniz.\0" + 1563 "Ä°zin verilmiÅ Åifreleme yok (Åifreleme gerektirirse sunucu baÄlantÄ±yÄ± kesecek.)\0" + 1564 "SeÃ§imlik Åifreleme (Åifreleme yoksa bile baÄlan.)\0" + 1565 "Åifreleme gerektir (Sunucu geri Ã§evirirse baÄlantÄ±yÄ± kes.)\0" + 1566 "En Ã§ok gÃ¼Ã§lÃ¼ Åifreleme (Sunucu geri Ã§evirirse baÄlantÄ±yÄ± kes.)\0" + 1567 " (Åifreleme etkin.)\0" + 1568 "UmÃ»mÃ® AÄ Hesap Bilgisi\0" + 1569 "UmÃ»mÃ® AÄ hesÃ¢bÄ±nÄ±za girmek iÃ§in bir hesap adÄ±na ve bir Åifreye gereksinim duyacaksÄ±nÄ±z.\0" + 1570 "SeÃ§ili EAP paketi Åifreleme anahtarlarÄ± saÄlamaz. AnahtarlarÄ± saÄlayan bir EAP paketi seÃ§iniz ya da Åifrelememeyi seÃ§iniz.\0" + 1571 "Åimdiki Åifreleme seÃ§imi EAP ya da MS-CHAP oturum aÃ§ma gÃ¼venlik yÃ¶netmlerinin birtakÄ±m sÃ¼rÃ¼mlerini gerektirir.\0" + 1572 "Ä°letiÅim KÃ¢ideleri ve GÃ¼venlik\0" + 1573 "Bu baÄlantÄ± iÃ§in aktarÄ±mlarÄ± ve gÃ¼venlik seÃ§eneklerini seÃ§iniz.\0" + 1574 "SeÃ§tiÄiniz iletiÅim kÃ¢ideleri PAP, SPAP veyÃ¢ CHAP iÃ§erir. BunlarÄ±n birisi aÅÄ±lmÄ±Åsa veri Åifreleme olmayacaktÄ±r. Bu ayarlarÄ± korumak ister misiniz?\0" + 1575 """%1""e baÄlanmak iÃ§in ilk Ã¶nce ""%2""ye baÄlanmalÄ±sÄ±nÄ±z. Åimdi ""%2""ye baÄlanmak ister misiniz?\0" + 1576 "KoÅut kablodan baÄlanÄ±lÄ±yor...\0" + 1577 "KÄ±zÄ±lÃ¶tesinden baÄlanÄ±lÄ±yor...\0" + 1578 "KoÅut giriÅ baÄlandÄ±.\0" + 1579 "KÄ±zÄ±lÃ¶tesi baÄlandÄ±.\0" + 1580 "Bu baÄlantÄ± kurulu yazÄ±lÄ±m eliyle desteklenmeyen bir veri Åifreleme gÃ¼cÃ¼ kullanmak iÃ§in yapÄ±landÄ±rÄ±lmÄ±ÅtÄ±. Bu baÄlantÄ±nÄ±n gÃ¼venlik husÃ»siyetleri var olan Åifreleme gÃ¼Ã§leri iÃ§in sÄ±fÄ±rlandÄ±.\0" + 1581 "&VPN TÃ¼rÃ¼:\0" + 1582 "LÃ¼tfen bir kullanÄ±cÄ± adÄ± giriniz.\0" + 1583 "Bu kullanÄ±cÄ± ve Åifre kendi kullanÄ±mÄ±nÄ±z iÃ§in saklanacaktÄ±r. Burada bu baÄlantÄ±nÄ±n tÃ¼m baÅka kullanÄ±cÄ±larÄ± iÃ§in saklanmÄ±Å bir kullanÄ±cÄ± adÄ± ve Åifre Ã¶nceden var.TÃ¼m baÅka kullanÄ±cÄ±lar iÃ§in saklanmÄ±Å kullanÄ±cÄ± adÄ±nÄ± ve Åifreyi silmek ister misiniz?\0" + 1584 "ÃrneÄin, iÅ yerinizin adÄ±nÄ± ya da baÄlanacaÄÄ±nÄ±z bir sunucunun adÄ±nÄ± yazabilirdiniz.\0" + 1585 "Hesap Bilgisi\0" + 1586 "Bir yapÄ±landÄ±rma deÄiÅikliÄinin yapÄ±labilmesinden Ã¶nce dizge ilk Ã¶nce yeniden baÅlatÄ±lmalÄ± olduÄundan dolayÄ± bu husÃ»siyet sayfasÄ± Ã¼zerindeki denetimler edilgin.\0" + 1587 "Bir ya da daha Ã§ok baÅka AÄ husÃ»siyet sayfasÄ±nÄ±n Ã¶nceden aÃ§Ä±k olduÄundan dolayÄ± bu husÃ»siyet sayfasÄ± Ã¼zerindeki denetimler edilgin. Bu denetimleri kullanmak iÃ§in tÃ¼m bu husÃ»siyet sayfalarÄ±nÄ± kapatÄ±nÄ±z ve sonra bunu yeniden aÃ§Ä±nÄ±z.\0" + 1588 "Sizde onlara eriÅmek iÃ§in uygun ayrÄ±calÄ±klar olmadÄ±ÄÄ±ndan dolayÄ± bu husÃ»siyet sayfasÄ±ndaki birtakÄ±m denetimler edilgin.\0" + 1589 "AÅaÄÄ±daki ileti hizmet saÄlayÄ±cÄ±nÄ±zdan alÄ±nmÄ±ÅtÄ±r:\r\n\r\n%1\0" + 1590 "%1'e Yeniden BaÄlan\0" + 1591 "Hizmet AdÄ±\0" + 1592 "GeniÅ bant baÄlantÄ±nÄ±zÄ± saÄlayan hizmetin adÄ± ne?\0" + 1593 "HesÃ¢bÄ±nÄ±za girmek iÃ§in bÅr hesap adÄ±na ve bir Åifreye gereksinim duyacaksÄ±nÄ±z.\0" 1594 "PPPOE1-0\0" - 1595 "Point-to-Point Protocol over Ethernet (PPPoE)\0" - 1596 "Type of &broadband connection to make:\0" - 1611 "Broadband Connection\0" - 1612 "You have selected to use a preshared key but you have not entered one. \nPlease enter a preshared key.\0" - 1613 "Cannot Commit Credentials\0" - 1634 "Because the Windows Management Instrumentation (WMI) service has been disabled, ReactOS cannot display the properties of this connection or the home network.\n\nTo configure the properties of this connection or your home network, you must first enable the WMI service. To do this, in the Administrative Tools control panel, double-click Services, right-click Windows Management Instrumentation, and then click Start.\0" - 1635 "ReactOS cannot display the properties of this connection. The Windows Management Instrumentation (WMI) information might be corrupted. To correct this, use System Restore to restore ReactOS to an earlier time (called a restore point). System Restore is located in the System Tools folder in Accessories.\0" - 1646 "Allow incoming echo request\0" - 1647 "Allow incoming timestamp request\0" - 1648 "Allow incoming mask request\0" - 1649 "Allow incoming router request\0" - 1650 "Allow outgoing destination unreachable\0" - 1651 "Allow outgoing source quench\0" - 1652 "Allow outgoing parameter problem\0" - 1653 "Allow outgoing time exceeded\0" - 1654 "Allow redirect\0" + 1595 "Ethernet'ten Noktadan Noktaya Ä°letiÅim KÃ¢idesi (PPPoE)\0" + 1596 "Yapmak iÃ§in geniÅ bant baÄlantÄ±nÄ±n tÃ¼rÃ¼:\0" + 1611 "GeniÅ Bant BaÄlantÄ±\0" + 1612 "Bir Ã¶nceden paylaÅÄ±lmÄ±Å anahtar kullanmayÄ± seÃ§tiniz ancak birini girmediniz.\nLÃ¼tfen bir Ã¶nceden paylaÅÄ±lmÄ±Å anahtar giriniz.\0" + 1613 "Kimlik Bilgileri Ä°Ålenemez\0" + 1634 "Windows YÃ¶netim AraÃ§larÄ± (WMI) hizmeti edilgin olduÄundan dolayÄ± ReactOS bu baÄlantÄ±nÄ±n ya da ev aÄÄ±nÄ±n husÃ»siyetlerini gÃ¶rÃ¼ntÃ¼leyemiyor.\n\nBu baÄlantÄ±nÄ±n ya da ev aÄÄ±nÄ±zÄ±n husÃ»siyetlerini yapÄ±landÄ±rmak iÃ§in ilk Ã¶nce WMI hizmetini etkinleÅtirmelisiniz. Bunu yapmak iÃ§in YÃ¶netim AraÃ§larÄ± denetim masasÄ±nda Hizmetlere'e Ã§ift tÄ±klayÄ±nÄ±z, Windows YÃ¶netim AraÃ§larÄ±'na saÄ tÄ±klayÄ±nÄ±z ve sonra BaÅlat'a tÄ±klayÄ±nÄ±z.\0" + 1635 "ReactOS, bu baÄlantÄ±nÄ±n husÃ»siyetlerini gÃ¶rÃ¼ntÃ¼leyemiyor. Windows YÃ¶netim AraÃ§larÄ± (WMI) bilgisi bozulmuÅ olabilir. Bunu dÃ¼zeltmek iÃ§in, ReactOS'u, geri yÃ¼kleme noktasÄ± olarak adlandÄ±rÄ±lan daha erken bir zamÃ¢na geri yÃ¼klemek iÃ§in Dizge Geri YÃ¼kleme'yi kullanÄ±nÄ±z. Dizge Geri YÃ¼kleme DonatÄ±lar'da Dizge AraÃ§larÄ± dizininde bulunur.\0" + 1646 "Gelen YankÄ± Ä°steÄine Ä°zin Ver\0" + 1647 "Gelen Zaman DamgasÄ± Ä°steÄine Ä°zin Ver\0" + 1648 "Gelen Maske Ä°steÄine Ä°zin Ver\0" + 1649 "Gelen YÃ¶nlendirici Ä°steÄine Ä°zin Ver\0" + 1650 "Giden EriÅilemeyen VarÄ±Åa Ä°zin Ver\0" + 1651 "Giden Kaynak DaraltmasÄ±na Ä°zin Ver\0" + 1652 "Giden DeÄiÅken Sorununa Ä°zin Ver\0" + 1653 "Giden AÅÄ±lmÄ±Å ZamÃ¢na Ä°zin Ver\0" + 1654 "Yeniden YÃ¶nlendirmeye Ä°zin Ver\0" 1655 "log\0" 1656 "*.log\0" - 1657 "Firewall log files (*.log)\0" - 1658 "Browse\0" - 1663 "Select a private network connection\0" - 1664 "To enable Internet Connection Sharing a connection must be selected for the private network. Please select a connection from the list of available connections.\0" - 1665 "Messages sent to this computer will be repeated back to the sender. This is commonly used for troubleshooting, for example, to ping a machine.\0" - 1666 "Data sent to this computer can be acknowledged with a confirmation message indicating the time that the data was received.\0" - 1667 "This computer will listen for and respond to requests for more information about the public network to which it is attached.\0" - 1668 "This computer will respond to requests for information about the routes it recognizes.\0" - 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a ""destination unreachable"" message explaining the failure.\0" - 1670 "When this computer's ability to process incoming data cannot keep up with the rate of a transmission, data will be dropped and the sender will be asked to slow down.\0" - 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a ""bad header"" error message.\0" - 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0" - 1673 "Data sent from this computer will be rerouted if the default path changes.\0" - 1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0" - 1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0" - 1686 "Type an account name and password. (If you have forgotten an existing account name or password, contact your network administrator.)\0" - 1687 "Computer N&ame\0" - 1688 "ISP N&ame\0" - 1689 "Company N&ame\0" - 1690 "What is the phone number you will use to make this connection?\n\0" - 7301 "Incoming TCP/IP Properties\0" - 7302 "You must choose a value from %1 to %2 for this field.\0" - 7306 "Incoming Connections Error\0" - 7307 "Incoming Connections General Error\0" - 7308 "Incoming Connections\0" - 7309 "Incoming Connections Networking Error\0" - 7310 "Incoming Connections Multilink Status Error\0" - 7311 "Incoming Connections Error\0" - 7312 "Incoming Connections Initialization Error\0" - 7313 "Incoming Connections TCP/IP Properties Error\0" - 7314 "Incoming Connections IPX Properties Error\0" - 7315 "Incoming Connections Error\0" - 7316 "Generic\0" - 7317 "Device\0" - 7318 "Miscellaneous Database\0" - 7319 "User Database\0" - 7320 "Protocol Database\0" - 7321 "You must enter a logon name for the new user or press cancel.\0" - 7322 "The password you entered was too short.\0" - 7323 "The passwords entered are not the same. Please re-enter them.\0" - 7324 "An internal error has occured. \0" - 7325 "Listview\0" - 7326 "An error has occurred while attempting to commit the changes you have made to the local user database. \0" - 7327 "You have insufficient priveleges to add a user to the local system database. \0" - 7328 "The user you are trying create already exists in the local user database.\0" - 7329 "The user was not added to the local user database because the password you entered was rejected.\0" - 7330 "Unable to reload the system user database because of an internal error.\0" - 7331 "An internal error has occurred: The local user database handle is corrupt.\0" - 7332 "Unable to load the resources neccessary to display the user tab.\0" - 7333 "An internal error occured while attempting to rollback the changes you made to the local user database. \0" - 7334 "The device database handle is corrupt.\0" - 7335 "Unable to load the resources neccessary to display the general tab.\0" - 7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made. \0" - 7337 "An internal error occured.\0" - 7338 "An internal error occurred: The networking component database handle is corrupt.\0" - 7339 "An internal error has occurred. \0" - 7340 "An error has occurred while attempting to commit the changes you have made to the networking components.\0" - 7341 "An internal error occured.\0" - 7342 "Unable to commit the changes you made to the TCP/IP protocol to the system. \0" + 1657 "GÃ¼venlik DuvarÄ± KayÄ±t KÃ¼tÃ¼kleri (*.log)\0" + 1658 "GÃ¶z At\0" + 1663 "Bir ÅahsÃ® aÄ baÄlantÄ±sÄ± seÃ§iniz.\0" + 1664 "UmÃ»mÃ® AÄ BaÄlantÄ± PaylaÅÄ±mÄ±'nÄ± etkinleÅtirmek iÃ§in bir baÄlantÄ± ÅahsÃ® aÄ iÃ§in seÃ§ilmiÅ olmalÄ±dÄ±r. LÃ¼tfen var olan baÄlantÄ±lar dizelgesinden bir baÄlantÄ± seÃ§iniz.\0" + 1665 "Bu bilgisayara gÃ¶nderilmiÅ iletiler gÃ¶ndericiye geri gÃ¶nderilecektir. Bu umÃ»miyetle sorun giderme iÃ§in kullanÄ±lÄ±r, Ã¶rneÄin, bir makineye ping atmak iÃ§in.\0" + 1666 "Bu bilgisayara gÃ¶nderilemiÅ veri, verinin alÄ±nmÄ±Å olduÄu zamÃ¢nÄ± gÃ¶steren bir doÄrulama iletisiyle doÄrulanabilir.\0" + 1667 "Bu bilgisayar, baÄlÄ± olduÄu umÃ»mÃ® aÄ Ã¼zerine daha Ã§ok bilgi iÃ§in dinleyecek ve isteklere yanÄ±t verecektir.\0" + 1668 "Bu bilgisayar, tanÄ±dÄ±ÄÄ± yÃ¶nlendirmeler Ã¼zerine bilgi iÃ§in isteklere yanÄ±t verecektir.\0" + 1669 "Bir yanlÄ±ÅlÄ±ktan dolayÄ± bu bilgisayara ulaÅmada baÅarÄ±sÄ±z olan UmÃ»mÃ® AÄ'dan gÃ¶derilen veri, gÃ¶zden Ã§Ä±karÄ±lacak ve baÅarÄ±sÄ±zlÄ±ÄÄ± anlatan bir ""ulaÅÄ±lamayan varÄ±Å"" iletisiyle doÄrulanacaktÄ±r.\0" + 1670 "Bu bilgisayarÄ±n gelen veriyi iÅleme yeteneÄi bir iletimin hÄ±zÄ±na yetiÅemediÄinde veri bÄ±rakÄ±lacak ve gÃ¶nderici yavaÅlatmak iÃ§in sorulacaktÄ±r.\0" + 1671 "Bu bilgisayar, bir sorunlu baÅlÄ±ktan dolayÄ± alÄ±nmÄ±Å veriyi gÃ¶zden Ã§Ä±kardÄ±ÄÄ±nda bir ""kÃ¶tÃ¼ baÅlÄ±k"" yanlÄ±ÅlÄ±k iletisiyle gÃ¶ndericiye yanÄ±t verecektir.\0" + 1672 "TÃ¼m iletim izin verilenden daha Ã§ok Ã§ok zaman gerektirdiÄinden dolayÄ± bu bilgisayar, bir bitmemiÅ veri iletimini gÃ¶zden Ã§Ä±kardÄ±ÄÄ±nda bir ""sÃ¼re bitti"" iletisiyle gÃ¶ndericiye yanÄ±t verecektir.\0" + 1673 "Ãn tanÄ±mlÄ± yol deÄiÅirse bu bilgisayardan gÃ¶nderilen veri yeniden yÃ¶nlendirilecektir.\0" + 1675 "KayÄ±t kÃ¼tÃ¼ÄÃ¼ bÃ¼yÃ¼klÃ¼ÄÃ¼ iÃ§in girilen deÄer geÃ§ersiz. 1 ile 32767000 arasÄ±nda bir deÄer giriniz.\0" + 1685 "KullanÄ±cÄ± hesÃ¢bÄ±nÄ±zÄ±n bu baÄlantÄ±yÄ± kullanmak iÃ§in izni yok. UmÃ»mÃ®yetle bu Konuk olarak oturum aÃ§tÄ±ÄÄ±nÄ±zdan dolayÄ± olur.\0" + 1686 "Bir hesap adÄ± ve Åifre yazÄ±nÄ±z. (Var olan bir hesap adÄ±nÄ± ya da Åifreyi unuttuysanÄ±z aÄ yÃ¶neticinizle iletiÅime geÃ§iniz.)\0" + 1687 "&Bilgisayar AdÄ±\0" + 1688 "&ISP AdÄ±\0" + 1689 "&OrtaklÄ±k AdÄ±\0" + 1690 "Bu baÄlantÄ±yÄ± yapmak iÃ§in kullanacaÄÄ±nÄ±z telefon numarasÄ± ne?\n\0" + 7301 "Gelen TCP/IP HusÃ»siyetleri\0" + 7302 "Bu alan iÃ§in %1'den %2'ye dek bir deÄer seÃ§melisiniz.\0" + 7306 "Gelen BaÄlantÄ±lar YanlÄ±ÅlÄ±ÄÄ±\0" + 7307 "Gelen BaÄlantÄ±lar UmÃ»mÃ® YanlÄ±ÅlÄ±ÄÄ±\0" + 7308 "Gelen BaÄlantÄ±lar\0" + 7309 "Gelen BaÄlantÄ±lar AÄ YanlÄ±ÅlÄ±ÄÄ±\0" + 7310 "Gelen BaÄlantÄ±lar Ãoklu BaÄlantÄ± Durumu YanlÄ±ÅlÄ±ÄÄ±\0" + 7311 "Gelen BaÄlantÄ±lar YanlÄ±ÅlÄ±ÄÄ±\0" + 7312 "Gelen BaÄlantÄ±lar BaÅlatma YanlÄ±ÅlÄ±ÄÄ±\0" + 7313 "Gelen BaÄlantÄ±lar TCP/IP HusÃ»siyetler YanlÄ±ÅlÄ±ÄÄ±\0" + 7314 "Gelen BaÄlantÄ±lar IPX HusÃ»siyetler YanlÄ±ÅlÄ±ÄÄ±\0" + 7315 "Gelen BaÄlantÄ±lar YanlÄ±ÅlÄ±ÄÄ±\0" + 7316 "UmÃ»mÃ®\0" + 7317 "AygÄ±t\0" + 7318 "TÃ¼rlÃ¼ VeritabanÄ±\0" + 7319 "KullanÄ±cÄ± VeritabanÄ±\0" + 7320 "Ä°letiÅim KÃ¢idesi VeritabanÄ±\0" + 7321 "Yeni kullanÄ±cÄ± iÃ§in bir oturum aÃ§ma adÄ± girmeli ya da Ä°ptal'e basmalÄ±sÄ±nÄ±z.\0" + 7322 "GirdiÄiniz Åifre Ã§ok kÄ±saydÄ±.\0" + 7323 "GiriÅen Åifreler aynÄ± deÄil. LÃ¼tfen onlarÄ± yeniden giriniz.\0" + 7324 "Bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu.\0" + 7325 "Dizelge GÃ¶rÃ¼nÃ¼mÃ¼\0" + 7326 "Yerli kullanÄ±cÄ± veritabanÄ± iÃ§in yaptÄ±ÄÄ±nÄ±z deÄiÅikllikleri iÅlemeye Ã§alÄ±ÅÄ±rken bir yanlÄ±ÅlÄ±k oluÅtu.\0" + 7327 "Yerli dizge veritabanÄ±na bir kullanÄ±cÄ± eklemek iÃ§in yetersiz ayrÄ±calÄ±klarÄ±nÄ±z var.\0" + 7328 "OluÅturmaya Ã§alÄ±ÅtÄ±ÄÄ±nÄ±z kullanÄ±cÄ± Ã¶nceden yerli kullanÄ±cÄ± veritabanÄ±nda var.\0" + 7329 "GirdiÄiniz Åifre geri Ã§evrilmiÅ olduÄundan dolayÄ± kullanÄ±cÄ± yerli kullanÄ±cÄ± veritabanÄ±na eklenmedi.\0" + 7330 "Bir iÃ§ yanlÄ±ÅlÄ±ktan dolayÄ± dizge kullanÄ±cÄ± veritabanÄ±nÄ± yeniden yÃ¼klemek yapÄ±lamaz.\0" + 7331 "Bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu: Yerli kullanÄ±cÄ± veritabanÄ± iÅleyicisi bozuk.\0" + 7332 "KullanÄ±cÄ± sekmesini gÃ¶rÃ¼ntÃ¼lemek iÃ§in gerekli kaynaklarÄ± yÃ¼klemek yapÄ±lamaz.\0" + 7333 "Yerli kullanÄ±cÄ± veritabanÄ±na yaptÄ±ÄÄ±nÄ±z deÄiÅiklikleri geri almaya Ã§alÄ±ÅÄ±lÄ±rken bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu.\0" + 7334 "AygÄ±t veritabanÄ± iÅleyicisi bozuk.\0" + 7335 "UmÃ»mÃ® sekmesini gÃ¶rÃ¼ntÃ¼lemek iÃ§in gerekli kaynaklarÄ± yÃ¼klemek yapÄ±lamaz.\0" + 7336 "YaptÄ±ÄÄ±nÄ±z aygÄ±t ya da VPN ile ilgili deÄiÅikliklerinin birtakÄ±mlarÄ±nÄ± iÅlemeye Ã§alÄ±ÅÄ±rken bir yalÄ±ÅlÄ±k oluÅtu.\0" + 7337 "Bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu.\0" + 7338 "Bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu: AÄ bileÅeni veritabanÄ± iÅleyicisi bozuk.\0" + 7339 "Bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu.\0" + 7340 "AÄ bileÅenlerine yaptÄ±ÄÄ±nÄ±z deÄiÅiklikleri iÅlemeye Ã§alÄ±ÅÄ±rken bir yanlÄ±ÅlÄ±k oluÅtu.\0" + 7341 "Bir iÃ§ yanlÄ±ÅlÄ±k oluÅtu.\0" + 7342 "Dizgeye, TCP/IP iletiÅim kÃ¢idesine yaptÄ±ÄÄ±nÄ±z deÄiÅiklikleri iÅlemek yapÄ±lamaz.\0" 7343 "Unable to save the changes you made to the IPX protocol to the system. \0" 7344 "Unable to display the TCP/IP properties.\0" 7345 "Unable to display the IPX properties.\0"

9 years, 10 months

[akhaldi] 66159: [SHELL32] Move some *RecycleBin*() functions to a more appropriate source file. Improve header inclusions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 4 09:13:43 2015 New Revision: 66159 URL: http://svn.reactos.org/svn/reactos?rev=66159&view=rev Log: [SHELL32] Move some *RecycleBin*() functions to a more appropriate source file. Improve header inclusions. Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Wed Feb 4 09:13:43 2015 @@ -21,6 +21,7 @@ #include <precomp.h> +#include <mmsystem.h> #include <ntquery.h> #define MAX_PROPERTY_SHEET_PAGE 32 @@ -1566,4 +1567,135 @@ ReleaseStgMedium(&medium); return hr; -} +} + +/************************************************************************* + * SHEmptyRecycleBinA (SHELL32.@) + */ +HRESULT WINAPI SHEmptyRecycleBinA(HWND hwnd, LPCSTR pszRootPath, DWORD dwFlags) +{ + LPWSTR szRootPathW = NULL; + int len; + HRESULT hr; + + TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_a(pszRootPath), dwFlags); + + if (pszRootPath) + { + len = MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, NULL, 0); + if (len == 0) + return HRESULT_FROM_WIN32(GetLastError()); + szRootPathW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!szRootPathW) + return E_OUTOFMEMORY; + if (MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, szRootPathW, len) == 0) + { + HeapFree(GetProcessHeap(), 0, szRootPathW); + return HRESULT_FROM_WIN32(GetLastError()); + } + } + + hr = SHEmptyRecycleBinW(hwnd, szRootPathW, dwFlags); + HeapFree(GetProcessHeap(), 0, szRootPathW); + + return hr; +} + +HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) +{ + WCHAR szPath[MAX_PATH] = {0}; + DWORD dwSize, dwType; + LONG ret; + + TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_w(pszRootPath), dwFlags); + + if (!(dwFlags & SHERB_NOCONFIRMATION)) + { + /* FIXME + * enumerate available files + * show confirmation dialog + */ + FIXME("show confirmation dialog\n"); + } + + if (dwFlags & SHERB_NOPROGRESSUI) + { + ret = EmptyRecycleBinW(pszRootPath); + } + else + { + /* FIXME + * show a progress dialog + */ + ret = EmptyRecycleBinW(pszRootPath); + } + + if (!ret) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(dwFlags & SHERB_NOSOUND)) + { + dwSize = sizeof(szPath); + ret = RegGetValueW(HKEY_CURRENT_USER, + L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current", + NULL, + RRF_RT_REG_EXPAND_SZ, + &dwType, + (PVOID)szPath, + &dwSize); + if (ret != ERROR_SUCCESS) + return S_OK; + + if (dwType != REG_EXPAND_SZ) /* type dismatch */ + return S_OK; + + szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; + PlaySoundW(szPath, NULL, SND_FILENAME); + } + return S_OK; +} + +HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) +{ + LPWSTR szRootPathW = NULL; + int len; + HRESULT hr; + + TRACE("%s, %p\n", debugstr_a(pszRootPath), pSHQueryRBInfo); + + if (pszRootPath) + { + len = MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, NULL, 0); + if (len == 0) + return HRESULT_FROM_WIN32(GetLastError()); + szRootPathW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!szRootPathW) + return E_OUTOFMEMORY; + if (MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, szRootPathW, len) == 0) + { + HeapFree(GetProcessHeap(), 0, szRootPathW); + return HRESULT_FROM_WIN32(GetLastError()); + } + } + + hr = SHQueryRecycleBinW(szRootPathW, pSHQueryRBInfo); + HeapFree(GetProcessHeap(), 0, szRootPathW); + + return hr; +} + +HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) +{ + FIXME("%s, %p - stub\n", debugstr_w(pszRootPath), pSHQueryRBInfo); + + if (!(pszRootPath) || (pszRootPath[0] == 0) || + !(pSHQueryRBInfo) || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO))) + { + return E_INVALIDARG; + } + + pSHQueryRBInfo->i64Size = 0; + pSHQueryRBInfo->i64NumItems = 0; + + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Wed Feb 4 09:13:43 2015 @@ -35,7 +35,6 @@ #include <commdlg.h> #include <commoncontrols.h> #include <recyclebin.h> -#include <mmsystem.h> #include <wine/debug.h> #include <wine/unicode.h> @@ -1647,6 +1646,15 @@ } /************************************************************************* + * PathIsTemporaryA [SHELL32.713] + */ +BOOL WINAPI PathIsTemporaryA(LPSTR Str) +{ + FIXME("(%s)stub\n", debugstr_a(Str)); + return FALSE; +} + +/************************************************************************* * PathIsTemporaryW [SHELL32.714] */ BOOL WINAPI PathIsTemporaryW(LPWSTR Str) @@ -2190,143 +2198,3 @@ return hRes; } - -/************************************************************************* - * PathIsTemporaryA [SHELL32.713] - */ -BOOL WINAPI PathIsTemporaryA(LPSTR Str) -{ - FIXME("(%s)stub\n", debugstr_a(Str)); - return FALSE; -} - -/************************************************************************* - * SHEmptyRecycleBinA (SHELL32.@) - */ -HRESULT WINAPI SHEmptyRecycleBinA(HWND hwnd, LPCSTR pszRootPath, DWORD dwFlags) -{ - LPWSTR szRootPathW = NULL; - int len; - HRESULT hr; - - TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_a(pszRootPath), dwFlags); - - if (pszRootPath) - { - len = MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, NULL, 0); - if (len == 0) - return HRESULT_FROM_WIN32(GetLastError()); - szRootPathW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!szRootPathW) - return E_OUTOFMEMORY; - if (MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, szRootPathW, len) == 0) - { - HeapFree(GetProcessHeap(), 0, szRootPathW); - return HRESULT_FROM_WIN32(GetLastError()); - } - } - - hr = SHEmptyRecycleBinW(hwnd, szRootPathW, dwFlags); - HeapFree(GetProcessHeap(), 0, szRootPathW); - - return hr; -} - -HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) -{ - WCHAR szPath[MAX_PATH] = {0}; - DWORD dwSize, dwType; - LONG ret; - - TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_w(pszRootPath), dwFlags); - - if (!(dwFlags & SHERB_NOCONFIRMATION)) - { - /* FIXME - * enumerate available files - * show confirmation dialog - */ - FIXME("show confirmation dialog\n"); - } - - if (dwFlags & SHERB_NOPROGRESSUI) - { - ret = EmptyRecycleBinW(pszRootPath); - } - else - { - /* FIXME - * show a progress dialog - */ - ret = EmptyRecycleBinW(pszRootPath); - } - - if (!ret) - return HRESULT_FROM_WIN32(GetLastError()); - - if (!(dwFlags & SHERB_NOSOUND)) - { - dwSize = sizeof(szPath); - ret = RegGetValueW(HKEY_CURRENT_USER, - L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current", - NULL, - RRF_RT_REG_EXPAND_SZ, - &dwType, - (PVOID)szPath, - &dwSize); - if (ret != ERROR_SUCCESS) - return S_OK; - - if (dwType != REG_EXPAND_SZ) /* type dismatch */ - return S_OK; - - szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; - PlaySoundW(szPath, NULL, SND_FILENAME); - } - return S_OK; -} - -HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) -{ - LPWSTR szRootPathW = NULL; - int len; - HRESULT hr; - - TRACE("%s, %p\n", debugstr_a(pszRootPath), pSHQueryRBInfo); - - if (pszRootPath) - { - len = MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, NULL, 0); - if (len == 0) - return HRESULT_FROM_WIN32(GetLastError()); - szRootPathW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!szRootPathW) - return E_OUTOFMEMORY; - if (MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, szRootPathW, len) == 0) - { - HeapFree(GetProcessHeap(), 0, szRootPathW); - return HRESULT_FROM_WIN32(GetLastError()); - } - } - - hr = SHQueryRecycleBinW(szRootPathW, pSHQueryRBInfo); - HeapFree(GetProcessHeap(), 0, szRootPathW); - - return hr; -} - -HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) -{ - FIXME("%s, %p - stub\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - - if (!(pszRootPath) || (pszRootPath[0] == 0) || - !(pSHQueryRBInfo) || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO))) - { - return E_INVALIDARG; - } - - pSHQueryRBInfo->i64Size = 0; - pSHQueryRBInfo->i64NumItems = 0; - - return S_OK; -}

9 years, 10 months

[tkreuzer] 66158: [GDI32_APITEST] Add simple tests for RealizePalette. CORE-8350 #comment Tests show that the patch is not correct.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 4 09:02:25 2015 New Revision: 66158 URL: http://svn.reactos.org/svn/reactos?rev=66158&view=rev Log: [GDI32_APITEST] Add simple tests for RealizePalette. CORE-8350 #comment Tests show that the patch is not correct. Added: trunk/rostests/apitests/gdi32/RealizePalette.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Wed Feb 4 09:02:25 2015 @@ -53,6 +53,7 @@ OffsetClipRgn.c PatBlt.c Rectangle.c + RealizePalette.c SelectObject.c SetBrushOrgEx.c SetDCPenColor.c Added: trunk/rostests/apitests/gdi32/RealizePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/RealizePal… ============================================================================== --- trunk/rostests/apitests/gdi32/RealizePalette.c (added) +++ trunk/rostests/apitests/gdi32/RealizePalette.c [iso-8859-1] Wed Feb 4 09:02:25 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for RealizePalette + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "init.h" + +START_TEST(RealizePalette) +{ + InitStuff(); + ok_int(RealizePalette(NULL), GDI_ERROR); + ok_int(RealizePalette((HDC)0xdeadc0de), GDI_ERROR); + ok_int(RealizePalette((HDC)0x00010001), 0); + ok_int(RealizePalette(ghdcDIB32), 0); + +} + Propchange: trunk/rostests/apitests/gdi32/RealizePalette.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Wed Feb 4 09:02:25 2015 @@ -54,6 +54,7 @@ extern void func_OffsetClipRgn(void); extern void func_PatBlt(void); extern void func_Rectangle(void); +extern void func_RealizePalette(void); extern void func_SelectObject(void); extern void func_SetBrushOrgEx(void); extern void func_SetDCPenColor(void); @@ -118,6 +119,7 @@ { "OffsetClipRgn", func_OffsetClipRgn }, { "PatBlt", func_PatBlt }, { "Rectangle", func_Rectangle }, + { "RealizePalette", func_RealizePalette }, { "SelectObject", func_SelectObject }, { "SetBrushOrgEx", func_SetBrushOrgEx }, { "SetDCPenColor", func_SetDCPenColor },

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015