Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 57677: [USER32] - Avoid casting double to int. Should fix MSC build
by jgardou＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: jgardou Date: Mon Nov 5 22:33:02 2012 New Revision: 57677 URL: http://svn.reactos.org/svn/reactos?rev=57677&view=rev Log: [USER32] - Avoid casting double to int. Should fix MSC build Modified: trunk/reactos/win32ss/user/user32/controls/edit.c trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Mon Nov 5 22:33:02 2012 @@ -435,9 +435,9 @@ old_font = SelectObject(udc, es->font); if (es->style & ES_PASSWORD) - ScriptStringAnalyse(udc, &es->password_char, length, (1.5*length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_PASSWORD, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); + ScriptStringAnalyse(udc, &es->password_char, length, (3*length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_PASSWORD, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); else - ScriptStringAnalyse(udc, es->text, length, (1.5*length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); + ScriptStringAnalyse(udc, es->text, length, (3*length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); if (es->font) SelectObject(udc, old_font); Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Mon Nov 5 22:33:02 2012 @@ -792,7 +792,7 @@ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam ) { HWND *win_array; - int i, total; + int i, total, rows, columns; BOOL has_icons = FALSE; if (ci->hwndChildMaximized) @@ -803,7 +803,7 @@ if (!(win_array = WIN_ListChildren( client ))) return; /* remove all the windows we don't want */ - for (i = total = 0; win_array[i]; i++) + for (i = total = rows = 0; win_array[i]; i++) { if (!IsWindowVisible( win_array[i] )) continue; if (GetWindow( win_array[i], GW_OWNER )) continue; /* skip owned windows (icon titles) */ @@ -813,6 +813,7 @@ continue; } if ((wParam & MDITILE_SKIPDISABLED) && !IsWindowEnabled( win_array[i] )) continue; + if(total == (rows * (rows + 2))) rows++; /* total+1 == (rows+1)*(rows+1) */ win_array[total++] = win_array[i]; } win_array[total] = 0; @@ -824,11 +825,11 @@ HWND *pWnd = win_array; RECT rect; int x, y, xsize, ysize; - int rows, columns, r, c, i; + int r, c, i; GetClientRect(client,&rect); - rows = (int) sqrt((double)total); - columns = total / rows; + columns = total/rows; + //while(total < rows*columns) rows++; if( wParam & MDITILE_HORIZONTAL ) /* version >= 3.1 */ {

1 0

[jgardou] 57676: [WIN32SS/USER] - Bake a parameter for NtUserFindExistingCursorIcon to differentiate between icons and cursors
by jgardou＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: jgardou Date: Mon Nov 5 20:23:01 2012 New Revision: 57676 URL: http://svn.reactos.org/svn/reactos?rev=57676&view=rev Log: [WIN32SS/USER] - Bake a parameter for NtUserFindExistingCursorIcon to differentiate between icons and cursors Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c 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] Mon Nov 5 20:23:01 2012 @@ -175,13 +175,15 @@ IntFindExistingCurIconObject( PUNICODE_STRING pustrModule, PUNICODE_STRING pustrRsrc, - LONG cxDesired, - LONG cyDesired) + FINDEXISTINGCURICONPARAM* param) { PCURICON_OBJECT CurIcon; LIST_FOR_EACH(CurIcon, &gCurIconList, CURICON_OBJECT, ListEntry) { + /* See if we are looking for an icon or a cursor */ + if(CurIcon->bIcon != param->bIcon) + continue; /* See if module names match */ if(RtlCompareUnicodeString(pustrModule, &CurIcon->ustrModule, TRUE) == 0) { @@ -196,7 +198,7 @@ else if(RtlCompareUnicodeString(pustrRsrc, &CurIcon->ustrRsrc, TRUE) != 0) continue; - if ((cxDesired == CurIcon->Size.cx) &&(cyDesired == CurIcon->Size.cy)) + if ((param->cx == CurIcon->Size.cx) &&(param->cy == CurIcon->Size.cy)) { if (! ReferenceCurIconByProcess(CurIcon)) { @@ -765,12 +767,12 @@ NtUserFindExistingCursorIcon( _In_ PUNICODE_STRING pustrModule, _In_ PUNICODE_STRING pustrRsrc, - _In_ LONG cxDesired, - _In_ LONG cyDesired) + _In_ FINDEXISTINGCURICONPARAM* param) { PCURICON_OBJECT CurIcon; HICON Ret = NULL; UNICODE_STRING ustrModuleSafe, ustrRsrcSafe; + FINDEXISTINGCURICONPARAM paramSafe; NTSTATUS Status; TRACE("Enter NtUserFindExistingCursorIcon\n"); @@ -782,9 +784,20 @@ Status = ProbeAndCaptureUnicodeString(&ustrModuleSafe, UserMode, pustrModule); if(!NT_SUCCESS(Status)) goto done; + + _SEH2_TRY + { + ProbeForRead(param, sizeof(*param), 1); + paramSafe = *param; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END UserEnterExclusive(); - CurIcon = IntFindExistingCurIconObject(&ustrModuleSafe, &ustrRsrcSafe, cxDesired, cyDesired); + CurIcon = IntFindExistingCurIconObject(&ustrModuleSafe, &ustrRsrcSafe, &paramSafe); if (CurIcon) Ret = CurIcon->Self; UserLeave(); 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] Mon Nov 5 20:23:01 2012 @@ -757,6 +757,7 @@ if(fuLoad & LR_SHARED) { DWORD size = MAX_PATH; + FINDEXISTINGCURICONPARAM param; TRACE("Checking for an LR_SHARED cursor/icon.\n"); /* Prepare the resource name string */ @@ -791,7 +792,10 @@ } while(TRUE); /* Ask win32k */ - hCurIcon = NtUserFindExistingCursorIcon(&ustrModule, &ustrRsrc, cxDesired, cyDesired); + param.bIcon = bIcon; + param.cx = cxDesired; + param.cy = cyDesired; + hCurIcon = NtUserFindExistingCursorIcon(&ustrModule, &ustrRsrc, &param); if(hCurIcon) { /* Woohoo, got it! */ @@ -1185,7 +1189,7 @@ } /* Call the relevant function */ - ret = CURSORICON_LoadImageW(hModule, ustrRsrc.Buffer, cxDesired, cyDesired, bIcon, fuFlags & LR_DEFAULTSIZE); + ret = CURSORICON_LoadImageW(hModule, ustrRsrc.Buffer, cxDesired, cyDesired, fuFlags & LR_DEFAULTSIZE, bIcon); FreeLibrary(hModule);

1 0

[jgardou] 57675: [WIN32SS] - Do not link gdi32.dll and user32.dll to msvcrt
by jgardou＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: jgardou Date: Mon Nov 5 20:20:49 2012 New Revision: 57675 URL: http://svn.reactos.org/svn/reactos?rev=57675&view=rev Log: [WIN32SS] - Do not link gdi32.dll and user32.dll to msvcrt Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Mon Nov 5 20:20:49 2012 @@ -48,14 +48,17 @@ add_library(gdi32 SHARED ${SOURCE}) -set_module_type(gdi32 win32dll UNICODE) +set_module_type(gdi32 + win32dll + ENTRYPOINT DllMain 12 + UNICODE) target_link_libraries(gdi32 win32ksys dxguid ${PSEH_LIB}) -add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 include/precomp.h) add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Nov 5 20:20:49 2012 @@ -71,7 +71,10 @@ endif() add_library(user32 SHARED ${SOURCE}) -set_module_type(user32 win32dll UNICODE) +set_module_type(user32 + win32dll + ENTRYPOINT DllMain 12 + UNICODE) target_link_libraries(user32 user32_wsprintf @@ -80,7 +83,7 @@ ${PSEH_LIB}) add_delay_importlibs(user32 imm32 usp10) -add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_pch(user32 include/user32.h) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Mon Nov 5 20:20:49 2012 @@ -2162,7 +2162,7 @@ result = strtol( str, &endptr, 10 ); if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; - if (((result == LONG_MIN) || (result == LONG_MAX)) && (errno == ERANGE) ) + if (((result == LONG_MIN) || (result == LONG_MAX))) return 0; } else @@ -2170,7 +2170,7 @@ result = strtoul( str, &endptr, 10 ); if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; - if ((result == ULONG_MAX) && (errno == ERANGE) ) return 0; + if (result == ULONG_MAX) return 0; } if (lpTranslated) *lpTranslated = TRUE; return (UINT)result;

1 0

[pschweitzer] 57674: [DOXYGEN] ReactOS is not C only. Enable support builtin STL.
by pschweitzer＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: pschweitzer Date: Mon Nov 5 11:13:59 2012 New Revision: 57674 URL: http://svn.reactos.org/svn/reactos?rev=57674&view=rev Log: [DOXYGEN] ReactOS is not C only. Enable support builtin STL. Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=57674&r1=5767… ============================================================================== --- trunk/reactos/Doxyfile [iso-8859-1] (original) +++ trunk/reactos/Doxyfile [iso-8859-1] Mon Nov 5 11:13:59 2012 @@ -196,7 +196,7 @@ # For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. -OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_FOR_C = NO # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java # sources only. Doxygen will then generate output that is more tailored for @@ -236,7 +236,7 @@ # func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. -BUILTIN_STL_SUPPORT = NO +BUILTIN_STL_SUPPORT = YES # If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support.

1 0

[hbelusca] 57673: [NTDLL] - Add parameter annotations. - Improve CSR buffer allocation with 4-byte align. - Simplify the capture-buffer pointers settings. [CSRSRV] - Remove last console structure f...
by hbelusca＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: hbelusca Date: Mon Nov 5 00:23:58 2012 New Revision: 57673 URL: http://svn.reactos.org/svn/reactos?rev=57673&view=rev Log: [NTDLL] - Add parameter annotations. - Improve CSR buffer allocation with 4-byte align. - Simplify the capture-buffer pointers settings. [CSRSRV] - Remove last console structure from csrsrv.h (in next commits it will be placed in a proper header). - Enable global CSR debugging (for debugging purposes... ;-) ). - api.c: Enable debugging. - api.c/.h: Remove old code and deprecated unused definitions. - Use the Win2k3-compliant version of CsrCreateThread (code from subsystems/csr/csrsrv) (TODO: correct its usage in basesrv:BaseSrvCreateThread). - init.c: Implement a helper routine, CsrInitCsrRootProcess, in order to initialize the per-process server data (see CSR_PROCESS structure) in the Root CSR process. New process inherit it from this Root process. - server.c - Add a DPRINT. Remove a hack. Correct a parameter passing. - session.c - Remove a hack (it will go to the new process initialization in consrv) - Disable the code of CsrConnectToUser while user32:ClientThreadSetup doesn't work. - Correct the implementation of CsrValidateMessageBuffer. - Basic implementation of CsrValidateMessageString using CsrValidateMessageBuffer. TODO: - Compare CsrpHandleConnectionRequest with the other one function in api.c. - Compare CsrValidateMessageBuffer with Win32CsrValidateBuffer ? Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/ntdll/csr/capture.c branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/include/reactos/subsys/csr/csr.h branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.spec branches/ros-csrss/subsystems/win32/csrsrv/include/api.h branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?r… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -50,7 +50,7 @@ NULL, CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpSetPriorityClass), sizeof(CSR_SET_PRIORITY_CLASS)); - + /* Return what we got, if requested */ if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; @@ -68,7 +68,7 @@ NTSTATUS Status; CSR_API_MESSAGE ApiMessage; PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; - + /* Set up the data for CSR */ DbgBreakPoint(); IdentifyAlertableThread = &ApiMessage.Data.IdentifyAlertableThread; Modified: branches/ros-csrss/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/capture… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -82,10 +82,10 @@ /* * @implemented */ -PVOID -NTAPI -CsrAllocateCaptureBuffer(ULONG ArgumentCount, - ULONG BufferSize) +PCSR_CAPTURE_BUFFER +NTAPI +CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, + IN ULONG BufferSize) { PCSR_CAPTURE_BUFFER CaptureBuffer; @@ -93,10 +93,13 @@ if (BufferSize >= MAXLONG) return NULL; /* Add the size of the header and for each pointer to the pointers */ - BufferSize += sizeof(CSR_CAPTURE_BUFFER) + (ArgumentCount * sizeof(PVOID)); + BufferSize += FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + (ArgumentCount * sizeof(ULONG_PTR)); + + /* Align it to a 4-byte boundary */ + BufferSize = (BufferSize + 3) & ~3; /* Allocate memory from the port heap */ - CaptureBuffer = RtlAllocateHeap(CsrPortHeap, 0, BufferSize); + CaptureBuffer = RtlAllocateHeap(CsrPortHeap, HEAP_ZERO_MEMORY, BufferSize); if (CaptureBuffer == NULL) return NULL; /* Initialize the header */ @@ -104,12 +107,12 @@ CaptureBuffer->PointerCount = 0; /* Initialize all the pointers */ - RtlZeroMemory(CaptureBuffer->PointerArray, + RtlZeroMemory(CaptureBuffer->PointerOffsetsArray, ArgumentCount * sizeof(ULONG_PTR)); - /* Point the start of the free buffer */ - CaptureBuffer->BufferEnd = (ULONG_PTR)CaptureBuffer->PointerArray + - ArgumentCount * sizeof(ULONG_PTR); + /* Point to the start of the free buffer */ + CaptureBuffer->BufferEnd = (PVOID)((ULONG_PTR)CaptureBuffer->PointerOffsetsArray + + ArgumentCount * sizeof(ULONG_PTR)); /* Return the address of the buffer */ return CaptureBuffer; @@ -120,20 +123,19 @@ */ ULONG NTAPI -CsrAllocateMessagePointer(PCSR_CAPTURE_BUFFER CaptureBuffer, - ULONG MessageLength, - PVOID *CaptureData) -{ - /* If there's no data, our job is easy. */ +CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN ULONG MessageLength, + OUT PVOID *CapturedData) +{ if (MessageLength == 0) { - *CaptureData = NULL; - CaptureData = NULL; + *CapturedData = NULL; + CapturedData = NULL; } else { /* Set the capture data at our current available buffer */ - *CaptureData = (PVOID)CaptureBuffer->BufferEnd; + *CapturedData = CaptureBuffer->BufferEnd; /* Validate the size */ if (MessageLength >= MAXLONG) return 0; @@ -142,14 +144,11 @@ MessageLength = (MessageLength + 3) & ~3; /* Move our available buffer beyond this space */ - CaptureBuffer->BufferEnd += MessageLength; - } - - /* Write down this pointer in the array */ - CaptureBuffer->PointerArray[CaptureBuffer->PointerCount] = (ULONG_PTR)CaptureData; - - /* Increase the pointer count */ - CaptureBuffer->PointerCount++; + CaptureBuffer->BufferEnd = (PVOID)((ULONG_PTR)CaptureBuffer->BufferEnd + MessageLength); + } + + /* Write down this pointer in the array and increase the count */ + CaptureBuffer->PointerOffsetsArray[CaptureBuffer->PointerCount++] = (ULONG_PTR)CapturedData; /* Return the aligned length */ return MessageLength; @@ -160,34 +159,34 @@ */ VOID NTAPI -CsrCaptureMessageBuffer(PCSR_CAPTURE_BUFFER CaptureBuffer, - PVOID MessageString, - ULONG StringLength, - PVOID *CapturedData) +CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN PVOID MessageBuffer OPTIONAL, + IN ULONG MessageLength, + OUT PVOID *CapturedData) { /* Simply allocate a message pointer in the buffer */ - CsrAllocateMessagePointer(CaptureBuffer, StringLength, CapturedData); + CsrAllocateMessagePointer(CaptureBuffer, MessageLength, CapturedData); /* Check if there was any data */ - if (!MessageString || !StringLength) return; + if (!MessageBuffer || !MessageLength) return; /* Copy the data into the buffer */ - RtlMoveMemory(*CapturedData, MessageString, StringLength); -} - -/* - * @implemented - */ -VOID -NTAPI -CsrFreeCaptureBuffer(PCSR_CAPTURE_BUFFER CaptureBuffer) + RtlMoveMemory(*CapturedData, MessageBuffer, MessageLength); +} + +/* + * @implemented + */ +VOID +NTAPI +CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer) { /* Free it from the heap */ RtlFreeHeap(CsrPortHeap, 0, CaptureBuffer); } /* - * @implemented + * @unimplemented */ NTSTATUS NTAPI @@ -206,8 +205,8 @@ */ VOID NTAPI -CsrCaptureMessageString(PCSR_CAPTURE_BUFFER CaptureBuffer, - LPSTR String, +CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN LPSTR String OPTIONAL, IN ULONG StringLength, IN ULONG MaximumLength, OUT PANSI_STRING CapturedString) @@ -256,14 +255,14 @@ */ PLARGE_INTEGER NTAPI -CsrCaptureTimeout(LONG Milliseconds, - PLARGE_INTEGER Timeout) +CsrCaptureTimeout(IN ULONG Milliseconds, + OUT PLARGE_INTEGER Timeout) { /* Validate the time */ if (Milliseconds == -1) return NULL; /* Convert to relative ticks */ - Timeout->QuadPart = Milliseconds * -100000; + Timeout->QuadPart = Int32x32To64(Milliseconds, -100000); return Timeout; } Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -51,120 +51,113 @@ IN ULONG DataLength) { NTSTATUS Status; - ULONG PointerCount; - PULONG_PTR Pointers; - ULONG_PTR CurrentPointer; - DPRINT("CsrClientCallServer\n"); - - /* Fill out the Port Message Header */ + ULONG i; + + /* Fill out the Port Message Header. */ ApiMessage->Header.u2.ZeroInit = 0; ApiMessage->Header.u1.s1.TotalLength = FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - /* Fill out the CSR Header */ + /* Fill out the CSR Header. */ ApiMessage->ApiNumber = ApiNumber; ApiMessage->CsrCaptureData = NULL; - DPRINT("API: %lx, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", + DPRINT("API: %lx, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", ApiNumber, ApiMessage->Header.u1.s1.DataLength, ApiMessage->Header.u1.s1.TotalLength); - /* Check if we are already inside a CSR Server */ + /* Check if we are already inside a CSR Server. */ if (!InsideCsrProcess) { - /* Check if we got a a Capture Buffer */ + /* Check if we got a Capture Buffer. */ if (CaptureBuffer) { - /* We have to convert from our local view to the remote view */ - ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + - CsrPortMemoryDelta); - - /* Lock the buffer */ - CaptureBuffer->BufferEnd = 0; - - /* Get the pointer information */ - PointerCount = CaptureBuffer->PointerCount; - Pointers = CaptureBuffer->PointerArray; - - /* Loop through every pointer and convert it */ - DPRINT("PointerCount: %lx\n", PointerCount); - while (PointerCount--) + /* + * We have to convert from our local (client) view + * to the remote (server) view. + */ + ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) + ((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); + + /* Lock the buffer. */ + CaptureBuffer->BufferEnd = NULL; + + /* + * Each client pointer inside the CSR message is converted into + * a server pointer, and each pointer to these message pointers + * is converted into an offset. + */ + for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) { - /* Get this pointer and check if it's valid */ - DPRINT("Array Address: %p. This pointer: %p. Data: %lx\n", - &Pointers, Pointers, *Pointers); - if ((CurrentPointer = *Pointers++)) + if (CaptureBuffer->PointerOffsetsArray[i] != 0) { - /* Update it */ - DPRINT("CurrentPointer: %lx.\n", *(PULONG_PTR)CurrentPointer); - *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; - Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; - DPRINT("CurrentPointer: %lx.\n", *(PULONG_PTR)CurrentPointer); + *(PULONG_PTR)CaptureBuffer->PointerOffsetsArray[i] += CsrPortMemoryDelta; + CaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; } } } - /* Send the LPC Message */ + /* Send the LPC Message. */ Status = NtRequestWaitReplyPort(CsrApiPort, &ApiMessage->Header, &ApiMessage->Header); - /* Check if we got a a Capture Buffer */ + /* Check if we got a Capture Buffer. */ if (CaptureBuffer) { - /* We have to convert back from the remote view to our local view */ - DPRINT("Reconverting CaptureBuffer\n"); - ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) - ApiMessage->CsrCaptureData - - CsrPortMemoryDelta); - - /* Get the pointer information */ - PointerCount = CaptureBuffer->PointerCount; - Pointers = CaptureBuffer->PointerArray; - - /* Loop through every pointer and convert it */ - while (PointerCount--) + /* + * We have to convert back from the remote (server) view + * to our local (client) view. + */ + ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) + ((ULONG_PTR)ApiMessage->CsrCaptureData - CsrPortMemoryDelta); + + /* + * Convert back the offsets into pointers to CSR message + * pointers, and convert back these message server pointers + * into client pointers. + */ + for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) { - /* Get this pointer and check if it's valid */ - if ((CurrentPointer = *Pointers++)) + if (CaptureBuffer->PointerOffsetsArray[i] != 0) { - /* Update it */ - CurrentPointer += (ULONG_PTR)ApiMessage; - Pointers[-1] = CurrentPointer; - *(PULONG_PTR)CurrentPointer -= CsrPortMemoryDelta; + CaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; + *(PULONG_PTR)CaptureBuffer->PointerOffsetsArray[i] -= CsrPortMemoryDelta; } } } - /* Check for success */ + /* Check for success. */ if (!NT_SUCCESS(Status)) { - /* We failed. Overwrite the return value with the failure */ + /* We failed. Overwrite the return value with the failure. */ DPRINT1("LPC Failed: %lx\n", Status); ApiMessage->Status = Status; } } else { - /* This is a server-to-server call. Save our CID and do a direct call */ + /* This is a server-to-server call. Save our CID and do a direct call. */ DPRINT1("Next gen server-to-server call\n"); + + /* We check this equality inside CsrValidateMessageBuffer. */ ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; + Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header); - - /* Check for success */ + + /* Check for success. */ if (!NT_SUCCESS(Status)) { - /* We failed. Overwrite the return value with the failure */ + /* We failed. Overwrite the return value with the failure. */ ApiMessage->Status = Status; } } - /* Return the CSR Result */ + /* Return the CSR Result. */ DPRINT("Got back: 0x%lx\n", ApiMessage->Status); return ApiMessage->Status; } @@ -203,7 +196,7 @@ PortName.MaximumLength = PortNameLength; /* Allocate a buffer for it */ - PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PortNameLength); + PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, PortNameLength); if (PortName.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -307,6 +300,8 @@ 0); if (CsrPortHeap == NULL) { + /* Failure */ + DPRINT1("Couldn't create heap for CSR port\n"); NtClose(CsrApiPort); CsrApiPort = NULL; return STATUS_INSUFFICIENT_RESOURCES; @@ -332,9 +327,9 @@ UNICODE_STRING CsrSrvName; HANDLE hCsrSrv; ANSI_STRING CsrServerRoutineName; - PCSR_CAPTURE_BUFFER CaptureBuffer; CSR_API_MESSAGE ApiMessage; PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.Data.CsrClientConnect; + PCSR_CAPTURE_BUFFER CaptureBuffer; /* Validate the Connection Info */ DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo); @@ -419,15 +414,11 @@ return STATUS_INSUFFICIENT_RESOURCES; } - /* Allocate a pointer for the connection info*/ - CsrAllocateMessagePointer(CaptureBuffer, - ClientConnect->ConnectionInfoSize, - &ClientConnect->ConnectionInfo); - - /* Copy the data into the buffer */ - RtlMoveMemory(ClientConnect->ConnectionInfo, - ConnectionInfo, - ClientConnect->ConnectionInfoSize); + /* Capture the connection info data */ + CsrCaptureMessageBuffer(CaptureBuffer, + ConnectionInfo, + ClientConnect->ConnectionInfoSize, + &ClientConnect->ConnectionInfo); /* Return the allocated length */ *ConnectionInfoSize = ClientConnect->ConnectionInfoSize; Modified: branches/ros-csrss/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -38,27 +38,40 @@ IN CSR_API_NUMBER ApiNumber, IN ULONG DataLength); -PVOID +PCSR_CAPTURE_BUFFER NTAPI CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, IN ULONG BufferSize); + +ULONG +NTAPI +CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN ULONG MessageLength, + OUT PVOID *CapturedData); + +VOID +NTAPI +CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN PVOID MessageBuffer OPTIONAL, + IN ULONG MessageLength, + OUT PVOID *CapturedData); + +VOID +NTAPI +CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, + IN LPSTR String OPTIONAL, + IN ULONG StringLength, + IN ULONG MaximumLength, + OUT PANSI_STRING CapturedString); VOID NTAPI CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer); -ULONG +PLARGE_INTEGER NTAPI -CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN ULONG MessageLength, - OUT PVOID* CaptureData); - -VOID -NTAPI -CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PVOID MessageString, - IN ULONG StringLength, - OUT PVOID* CapturedData); +CsrCaptureTimeout(IN ULONG Milliseconds, + OUT PLARGE_INTEGER Timeout); VOID NTAPI Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -93,8 +93,8 @@ ULONG Size; struct _CSR_CAPTURE_BUFFER *PreviousCaptureBuffer; ULONG PointerCount; - ULONG_PTR BufferEnd; - ULONG_PTR PointerArray[1]; + PVOID BufferEnd; + ULONG_PTR PointerOffsetsArray[ANYSIZE_ARRAY]; } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; /* Keep in sync with definition below. */ Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -24,7 +24,7 @@ /* TYPES **********************************************************************/ // Used in ntdll/csr/connect.c -#define CSR_CSRSS_SECTION_SIZE (65536) +#define CSR_CSRSS_SECTION_SIZE 65536 typedef struct _CSR_NT_SESSION { @@ -33,21 +33,6 @@ ULONG SessionId; } CSR_NT_SESSION, *PCSR_NT_SESSION; -/*** old thingie, remove it later... (put it in winsrv -- console) ***/ -#include <win/conmsg.h> -typedef struct _CSRSS_CON_PROCESS_DATA -{ - HANDLE ConsoleEvent; - struct tagCSRSS_CONSOLE *Console; - struct tagCSRSS_CONSOLE *ParentConsole; - BOOL bInheritHandles; - RTL_CRITICAL_SECTION HandleTableLock; - ULONG HandleTableSize; - struct _CSRSS_HANDLE *HandleTable; - PCONTROLDISPATCHER CtrlDispatcher; - LIST_ENTRY ConsoleLink; -} CSRSS_CON_PROCESS_DATA, *PCSRSS_CON_PROCESS_DATA; -/*********************************************************************/ typedef struct _CSR_PROCESS { CLIENT_ID ClientId; @@ -73,8 +58,7 @@ ULONG Reserved; ULONG ShutdownLevel; ULONG ShutdownFlags; - PVOID ServerData[ANYSIZE_ARRAY]; // ServerDllPerProcessData // One structure per CSR server. - CSRSS_CON_PROCESS_DATA; //// FIXME: Remove it after we activate the previous member. + PVOID ServerData[ANYSIZE_ARRAY]; // One structure per CSR server. } CSR_PROCESS, *PCSR_PROCESS; typedef struct _CSR_THREAD @@ -181,10 +165,10 @@ OUT PULONG Reply ); -#define CSR_API(n) NTSTATUS NTAPI n( \ - IN OUT PCSR_API_MESSAGE ApiMessage, \ - OUT PULONG Reply) - // IN OUT PCSR_REPLY_STATUS ReplyStatus) +#define CSR_API(n) \ + NTSTATUS NTAPI n(IN OUT PCSR_API_MESSAGE ApiMessage, \ + OUT PULONG Reply) + // IN OUT PCSR_REPLY_STATUS ReplyStatus) typedef NTSTATUS @@ -250,7 +234,8 @@ NTSTATUS (NTAPI *PCSR_SERVER_DLL_INIT_CALLBACK)(IN PCSR_SERVER_DLL LoadedServerDll); -#define CSR_SERVER_DLL_INIT(n) NTSTATUS NTAPI n(IN PCSR_SERVER_DLL LoadedServerDll) +#define CSR_SERVER_DLL_INIT(n) \ + NTSTATUS NTAPI n(IN PCSR_SERVER_DLL LoadedServerDll) /* PROTOTYPES ****************************************************************/ @@ -306,7 +291,8 @@ NTAPI CsrCreateThread(IN PCSR_PROCESS CsrProcess, IN HANDLE hThread, - IN PCLIENT_ID ClientId); + IN PCLIENT_ID ClientId, + IN BOOLEAN HaveClient); BOOLEAN NTAPI @@ -431,8 +417,8 @@ NTAPI CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, IN PVOID *Buffer, - IN ULONG ArgumentSize, - IN ULONG ArgumentCount); + IN ULONG ElementCount, + IN ULONG ElementSize); BOOLEAN NTAPI Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -11,13 +11,10 @@ #include "srv.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ - -static unsigned ApiDefinitionsCount = 0; -static PCSRSS_API_DEFINITION ApiDefinitions = NULL; BOOLEAN (*CsrClientThreadSetup)(VOID) = NULL; UNICODE_STRING CsrApiPortName; @@ -26,88 +23,6 @@ extern ULONG CsrMaxApiRequestThreads; /* FUNCTIONS ******************************************************************/ - -#if 0 -NTSTATUS FASTCALL -CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions) -{ - unsigned NewCount; - PCSRSS_API_DEFINITION Scan; - PCSRSS_API_DEFINITION New; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - NewCount = 0; - for (Scan = NewDefinitions; 0 != Scan->Handler; Scan++) - { - NewCount++; - } - - New = RtlAllocateHeap(CsrHeap, 0, - (ApiDefinitionsCount + NewCount) - * sizeof(CSRSS_API_DEFINITION)); - if (NULL == New) - { - DPRINT1("Unable to allocate memory\n"); - return STATUS_NO_MEMORY; - } - if (0 != ApiDefinitionsCount) - { - RtlCopyMemory(New, ApiDefinitions, - ApiDefinitionsCount * sizeof(CSRSS_API_DEFINITION)); - RtlFreeHeap(CsrHeap, 0, ApiDefinitions); - } - RtlCopyMemory(New + ApiDefinitionsCount, NewDefinitions, - NewCount * sizeof(CSRSS_API_DEFINITION)); - ApiDefinitions = New; - ApiDefinitionsCount += NewCount; - - return STATUS_SUCCESS; -} -#endif - -/* -VOID -FASTCALL -CsrApiCallHandler(PCSR_PROCESS ProcessData, - PCSR_API_MESSAGE Request) -*/ -VOID -FASTCALL -CsrApiCallHandler( - IN OUT PCSR_API_MESSAGE ApiMessage, - OUT PULONG Reply -) -{ - unsigned DefIndex; - ULONG ApiId; - - DPRINT("CSR: Calling handler for ApiNumber: %x.\n", ApiMessage->ApiNumber); - ApiId = CSR_API_NUMBER_TO_API_ID(ApiMessage->ApiNumber); - DPRINT("CSR: ApiID: %x ServerID: %x\n", ApiId, CSR_API_NUMBER_TO_SERVER_ID(ApiMessage->ApiNumber)); - - /* FIXME: Extract DefIndex instead of looping */ - for (DefIndex = 0; DefIndex < ApiDefinitionsCount; DefIndex++) - { - if (ApiDefinitions[DefIndex].ApiID == ApiId) - { - if (ApiMessage->Header.u1.s1.DataLength < ApiDefinitions[DefIndex].MinRequestSize) - { - DPRINT1("Request ApiID %d min request size %d actual %d\n", - ApiId, ApiDefinitions[DefIndex].MinRequestSize, - ApiMessage->Header.u1.s1.DataLength); - ApiMessage->Status = STATUS_INVALID_PARAMETER; - } - else - { - ApiMessage->Status = (ApiDefinitions[DefIndex].Handler)(ApiMessage, Reply); - } - return; - } - } - DPRINT1("CSR: Unknown request ApiNumber 0x%x\n", ApiMessage->ApiNumber); - ApiMessage->Status = STATUS_INVALID_SYSTEM_SERVICE; -} VOID CallHardError(IN PCSR_THREAD ThreadData, @@ -152,7 +67,6 @@ CsrCallServerFromServer(IN PCSR_API_MESSAGE ReceiveMsg, IN OUT PCSR_API_MESSAGE ReplyMsg) { -#if 1 // Real code ULONG ServerId; PCSR_SERVER_DLL ServerDll; ULONG ApiId; @@ -173,11 +87,8 @@ } else { - /* Get the API ID */ - ApiId = CSR_API_NUMBER_TO_API_ID(ReceiveMsg->ApiNumber); - - /* Normalize it with our Base ID */ - ApiId -= ServerDll->ApiBase; + /* Get the API ID, normalized with our Base ID */ + ApiId = CSR_API_NUMBER_TO_API_ID(ReceiveMsg->ApiNumber) - ServerDll->ApiBase; /* Make sure that the ID is within limits, and the entry exists */ if ((ApiId >= ServerDll->HighestApiSupported) || @@ -220,40 +131,6 @@ /* Return success */ return STATUS_SUCCESS; - -#else // Hacky reactos code - - PCSR_PROCESS ProcessData; - ULONG ReplyCode; - - /* Get the Process Data */ - CsrLockProcessByClientId(&ReceiveMsg->Header.ClientId.UniqueProcess, &ProcessData); - if (!ProcessData) - { - DPRINT1("Message: Unable to find data for process 0x%x\n", - ReceiveMsg->Header.ClientId.UniqueProcess); - return STATUS_NOT_SUPPORTED; - } - - /* Validation complete, start SEH */ - _SEH2_TRY - { - /* Call the API and get the result */ - CsrApiCallHandler(ReplyMsg, /*ProcessData*/ &ReplyCode); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* If we got an exception, return access violation */ - ReplyMsg->Status = STATUS_ACCESS_VIOLATION; - } - _SEH2_END; - - /* Release the process reference */ - CsrUnlockProcess(ProcessData); - - /* Return success */ - return STATUS_SUCCESS; -#endif } /*++ @@ -388,6 +265,107 @@ } /* Return status to caller */ + return Status; +} + +// TODO: See CsrApiHandleConnectionRequest +NTSTATUS WINAPI +CsrpHandleConnectionRequest(PPORT_MESSAGE Request) +{ + NTSTATUS Status; + HANDLE ServerPort = NULL;//, ServerThread = NULL; + PCSR_PROCESS ProcessData = NULL; + REMOTE_PORT_VIEW RemotePortView; +// CLIENT_ID ClientId; + BOOLEAN AllowConnection = FALSE; + PCSR_CONNECTION_INFO ConnectInfo; + ServerPort = NULL; + + DPRINT1("CSR: %s: Handling: %p\n", __FUNCTION__, Request); + + ConnectInfo = (PCSR_CONNECTION_INFO)(Request + 1); + + /* Save the process ID */ + RtlZeroMemory(ConnectInfo, sizeof(CSR_CONNECTION_INFO)); + + CsrLockProcessByClientId(Request->ClientId.UniqueProcess, &ProcessData); + if (!ProcessData) + { + DPRINT1("CSRSRV: Unknown process: %lx. Will be rejecting connection\n", + Request->ClientId.UniqueProcess); + } + + if ((ProcessData) && (ProcessData != CsrRootProcess)) + { + /* Attach the Shared Section */ + Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); + if (NT_SUCCESS(Status)) + { + DPRINT1("Connection ok\n"); + AllowConnection = TRUE; + } + else + { + DPRINT1("Shared section map failed: %lx\n", Status); + } + } + else if (ProcessData == CsrRootProcess) + { + AllowConnection = TRUE; + } + + /* Release the process */ + if (ProcessData) CsrUnlockProcess(ProcessData); + + /* Setup the Port View Structure */ + RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); + RemotePortView.ViewSize = 0; + RemotePortView.ViewBase = NULL; + + /* Save the Process ID */ + ConnectInfo->ProcessId = NtCurrentTeb()->ClientId.UniqueProcess; + + Status = NtAcceptConnectPort(&ServerPort, + AllowConnection ? UlongToPtr(ProcessData->SequenceNumber) : 0, + Request, + AllowConnection, + NULL, + &RemotePortView); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSS: NtAcceptConnectPort - failed. Status == %X\n", Status); + } + else if (AllowConnection) + { + if (CsrDebug & 2) + { + DPRINT1("CSRSS: ClientId: %lx.%lx has ClientView: Base=%p, Size=%lx\n", + Request->ClientId.UniqueProcess, + Request->ClientId.UniqueThread, + RemotePortView.ViewBase, + RemotePortView.ViewSize); + } + + /* Set some Port Data in the Process */ + ProcessData->ClientPort = ServerPort; + ProcessData->ClientViewBase = (ULONG_PTR)RemotePortView.ViewBase; + ProcessData->ClientViewBounds = (ULONG_PTR)((ULONG_PTR)RemotePortView.ViewBase + + (ULONG_PTR)RemotePortView.ViewSize); + + /* Complete the connection */ + Status = NtCompleteConnectPort(ServerPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSS: NtCompleteConnectPort - failed. Status == %X\n", Status); + } + } + else + { + DPRINT1("CSRSS: Rejecting Connection Request from ClientId: %lx.%lx\n", + Request->ClientId.UniqueProcess, + Request->ClientId.UniqueThread); + } + return Status; } @@ -486,7 +464,6 @@ NTSTATUS NTAPI CsrApiRequestThread(IN PVOID Parameter) -#if 1 { PTEB Teb = NtCurrentTeb(); LARGE_INTEGER TimeOut; @@ -649,7 +626,7 @@ if ((ServerDll) && (ServerDll->HardErrorCallback)) { /* Call it */ - ServerDll->HardErrorCallback(NULL, HardErrorMsg); + ServerDll->HardErrorCallback(NULL /* CsrThread */, HardErrorMsg); /* If it's handled, get out of here */ if (HardErrorMsg->Response != ResponseNotHandled) break; @@ -697,11 +674,8 @@ continue; } - /* Get the API ID */ - ApiId = CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber); - - /* Normalize it with our Base ID */ - ApiId -= ServerDll->ApiBase; + /* Get the API ID, normalized with our Base ID */ + ApiId = CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber) - ServerDll->ApiBase; /* Make sure that the ID is within limits, and the entry exists */ if (ApiId >= ServerDll->HighestApiSupported) @@ -897,11 +871,8 @@ continue; } - /* Get the API ID */ - ApiId = CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber); - - /* Normalize it with our Base ID */ - ApiId -= ServerDll->ApiBase; + /* Get the API ID, normalized with our Base ID */ + ApiId = CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber) - ServerDll->ApiBase; /* Make sure that the ID is within limits, and the entry exists */ if (ApiId >= ServerDll->HighestApiSupported) @@ -1007,357 +978,6 @@ NtTerminateThread(NtCurrentThread(), Status); return Status; } -#else -{ - PTEB Teb = NtCurrentTeb(); - LARGE_INTEGER TimeOut; - NTSTATUS Status; - BYTE RawRequest[LPC_MAX_DATA_LENGTH]; - PCSR_API_MESSAGE Request = (PCSR_API_MESSAGE)RawRequest; - PCSR_API_MESSAGE Reply; - PCSR_PROCESS CsrProcess; - PCSR_THREAD ServerThread, CsrThread; - ULONG MessageType; - HANDLE ReplyPort; - PDBGKM_MSG DebugMessage; - PHARDERROR_MSG HardErrorMsg; - PCLIENT_DIED_MSG ClientDiedMsg; - DPRINT("CSR: %s called\n", __FUNCTION__); - - /* Setup LPC loop port and message */ - Reply = NULL; - ReplyPort = CsrApiPort; - - /* Connect to user32 */ - while (!CsrConnectToUser()) - { - /* Set up the timeout for the connect (30 seconds) */ - TimeOut.QuadPart = -30 * 1000 * 1000 * 10; - - /* Keep trying until we get a response */ - Teb->Win32ClientInfo[0] = 0; - NtDelayExecution(FALSE, &TimeOut); - } - - /* Get our thread */ - ServerThread = Teb->CsrClientThread; - - /* If we got an event... */ - if (Parameter) - { - /* Set it, to let stuff waiting on us load */ - Status = NtSetEvent((HANDLE)Parameter, NULL); - ASSERT(NT_SUCCESS(Status)); - - /* Increase the Thread Counts */ - _InterlockedIncrement(&CsrpStaticThreadCount); - _InterlockedIncrement(&CsrpDynamicThreadTotal); - } - - /* Now start the loop */ - while (TRUE) - { - /* Make sure the real CID is set */ - Teb->RealClientId = Teb->ClientId; - - /* Debug check */ - if (Teb->CountOfOwnedCriticalSections) - { - DPRINT1("CSRSRV: FATAL ERROR. CsrThread is Idle while holding %lu critical sections\n", - Teb->CountOfOwnedCriticalSections); - DPRINT1("CSRSRV: Last Receive Message %lx ReplyMessage %lx\n", - Request, Reply); - DbgBreakPoint(); - } - - /* Send the reply and wait for a new request */ - DPRINT("Replying to: %lx (%lx)\n", ReplyPort, CsrApiPort); - Status = NtReplyWaitReceivePort(ReplyPort, - 0, - &Reply->Header, - &Request->Header); - /* Check if we didn't get success */ - if (Status != STATUS_SUCCESS) - { - /* Was it a failure or another success code? */ - if (!NT_SUCCESS(Status)) - { - /* Check for specific status cases */ - if ((Status != STATUS_INVALID_CID) && - (Status != STATUS_UNSUCCESSFUL) && - ((Status == STATUS_INVALID_HANDLE) || (ReplyPort == CsrApiPort))) - { - /* Notify the debugger */ - DPRINT1("CSRSS: ReceivePort failed - Status == %X\n", Status); - DPRINT1("CSRSS: ReplyPortHandle %lx CsrApiPort %lx\n", ReplyPort, CsrApiPort); - } - - /* We failed big time, so start out fresh */ - Reply = NULL; - ReplyPort = CsrApiPort; - DPRINT1("failed: %lx\n", Status); - continue; - } - else - { - /* A bizare "success" code, just try again */ - DPRINT1("NtReplyWaitReceivePort returned \"success\" status 0x%x\n", Status); - continue; - } - } - - /* Use whatever Client ID we got */ - Teb->RealClientId = Request->Header.ClientId; - - /* Get the Message Type */ - MessageType = Request->Header.u2.s2.Type; - - /* Handle connection requests */ - if (MessageType == LPC_CONNECTION_REQUEST) - { - /* Handle the Connection Request */ - DPRINT("Accepting new connection\n"); - CsrpHandleConnectionRequest((PPORT_MESSAGE)Request); - Reply = NULL; - ReplyPort = CsrApiPort; - continue; - } - - /* It's some other kind of request. Get the lock for the lookup */ - CsrAcquireProcessLock(); - - /* Now do the lookup to get the CSR_THREAD */ - CsrThread = CsrLocateThreadByClientId(&CsrProcess, - &Request->Header.ClientId); - - /* Did we find a thread? */ - if (!CsrThread) - { - /* This wasn't a CSR Thread, release lock */ - CsrReleaseProcessLock(); - - /* If this was an exception, handle it */ - if (MessageType == LPC_EXCEPTION) - { - DPRINT1("Exception from unknown thread, just continue\n"); - Reply = Request; - ReplyPort = CsrApiPort; - Reply->Status = DBG_CONTINUE; - } - else if (MessageType == LPC_PORT_CLOSED || - MessageType == LPC_CLIENT_DIED) - { - /* The Client or Port are gone, loop again */ - DPRINT("Death from unknown thread, just continue\n"); - Reply = NULL; - ReplyPort = CsrApiPort; - } - else if (MessageType == LPC_ERROR_EVENT) - { - /* If it's a hard error, handle this too */ - DPRINT1("Hard error from unknown thread, call handlers\n"); -HandleHardError: - HardErrorMsg = (PHARDERROR_MSG)Request; - - /* Default it to unhandled */ - HardErrorMsg->Response = ResponseNotHandled; - - /* Check if there are free api threads */ - CsrpCheckRequestThreads(); - if (CsrpStaticThreadCount) - { - CsrHandleHardError(CsrThread, (PHARDERROR_MSG)Request); - } - - /* If the response was 0xFFFFFFFF, we'll ignore it */ - if (HardErrorMsg->Response == 0xFFFFFFFF) - { - Reply = NULL; - ReplyPort = CsrApiPort; - } - else - { - if (CsrThread) CsrDereferenceThread(CsrThread); - Reply = Request; - ReplyPort = CsrApiPort; - } - } - else if (MessageType == LPC_REQUEST) - { - /* This is an API Message coming from a non-CSR Thread */ - DPRINT1("No thread found for request %lx and clientID %lx.%lx\n", - Request->ApiNumber & 0xFFFF, - Request->Header.ClientId.UniqueProcess, - Request->Header.ClientId.UniqueThread); - Reply = Request; - ReplyPort = CsrApiPort; - Reply->Status = STATUS_ILLEGAL_FUNCTION; - } - else if (MessageType == LPC_DATAGRAM) - { - DPRINT1("Kernel datagram: not yet supported\n"); - Reply = NULL; - ReplyPort = CsrApiPort; - } - else - { - /* Some other ignored message type */ - Reply = NULL; - ReplyPort = CsrApiPort; - } - - /* Keep going */ - continue; - } - - /* We have a valid thread, was this an LPC Request? */ - if (MessageType != LPC_REQUEST) - { - /* It's not an API, check if the client died */ - if (MessageType == LPC_CLIENT_DIED) - { - /* Get the information and check if it matches our thread */ - ClientDiedMsg = (PCLIENT_DIED_MSG)Request; - if (ClientDiedMsg->CreateTime.QuadPart == CsrThread->CreateTime.QuadPart) - { - /* Reference the thread */ - CsrLockedReferenceThread(CsrThread); - - /* Destroy the thread in the API Message */ - CsrDestroyThread(&Request->Header.ClientId); - - /* Check if the thread was actually ourselves */ - if (CsrProcess->ThreadCount == 1) - { - /* Kill the process manually here */ - DPRINT1("Last thread\n"); - CsrDestroyProcess(&CsrThread->ClientId, 0); - } - - /* Remove our extra reference */ - CsrLockedDereferenceThread(CsrThread); - } - - /* Release the lock and keep looping */ - CsrReleaseProcessLock(); - Reply = NULL; - ReplyPort = CsrApiPort; - continue; - } - - /* Reference the thread and release the lock */ - CsrLockedReferenceThread(CsrThread); - CsrReleaseProcessLock(); - - /* If this was an exception, handle it */ - if (MessageType == LPC_EXCEPTION) - { - /* Kill the process */ - DPRINT1("Exception in %lx.%lx. Killing...\n", - Request->Header.ClientId.UniqueProcess, - Request->Header.ClientId.UniqueThread); - NtTerminateProcess(CsrProcess->ProcessHandle, STATUS_ABANDONED); - - /* Destroy it from CSR */ - CsrDestroyProcess(&Request->Header.ClientId, STATUS_ABANDONED); - - /* Return a Debug Message */ - DebugMessage = (PDBGKM_MSG)Request; - DebugMessage->ReturnedStatus = DBG_CONTINUE; - Reply = Request; - ReplyPort = CsrApiPort; - - /* Remove our extra reference */ - CsrDereferenceThread(CsrThread); - } - else if (MessageType == LPC_ERROR_EVENT) - { - DPRINT1("Hard error from known CSR thread... handling\n"); - goto HandleHardError; - } - else - { - /* Something else */ - DPRINT1("Unhandled message type: %lx\n", MessageType); - CsrDereferenceThread(CsrThread); - Reply = NULL; - } - - /* Keep looping */ - continue; - } - - /* We got an API Request */ - CsrLockedReferenceThread(CsrThread); - CsrReleaseProcessLock(); - - /* Assume success */ - Reply = Request; - Request->Status = STATUS_SUCCESS; - - /* Now we reply to a particular client */ - ReplyPort = CsrThread->Process->ClientPort; - - DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", - Request->ApiNumber, - Request->Header.ClientId.UniqueThread); - - /* Validation complete, start SEH */ - _SEH2_TRY - { - ULONG ReplyCode; - - /* Make sure we have enough threads */ - CsrpCheckRequestThreads(); - - /* Set the client thread pointer */ - NtCurrentTeb()->CsrClientThread = CsrThread; - - /* Call the Handler */ - CsrApiCallHandler(Request, &ReplyCode); - - /* Increase the static thread count */ - _InterlockedIncrement(&CsrpStaticThreadCount); - - /* Restore the server thread */ - NtCurrentTeb()->CsrClientThread = ServerThread; - - /* Check if this is a dead client now */ - if (Request->ApiNumber == 0xBABE) - { - /* Reply to the death message */ - NtReplyPort(ReplyPort, &Reply->Header); - - /* Reply back to the API port now */ - ReplyPort = CsrApiPort; - Reply = NULL; - - /* Drop the reference */ - CsrDereferenceThread(CsrThread); - } - else - { - /* Drop the reference */ - CsrDereferenceThread(CsrThread); - } - } - _SEH2_EXCEPT(CsrUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) - { - Reply = NULL; - ReplyPort = CsrApiPort; - } - _SEH2_END; - } - - /* Close the port and exit the thread */ - // NtClose(ServerPort); - - DPRINT1("CSR: %s done\n", __FUNCTION__); - /* We're out of the loop for some reason, terminate! */ - NtTerminateThread(NtCurrentThread(), Status); - //return Status; -} -#endif /*++ * @name CsrApiPortInitialize @@ -1418,8 +1038,8 @@ /* Create the Port Object */ Status = NtCreatePort(&CsrApiPort, &ObjectAttributes, - LPC_MAX_DATA_LENGTH, // hack ; sizeof(CSR_CONNECTION_INFO), - LPC_MAX_MESSAGE_LENGTH, // hack ; sizeof(CSR_API_MESSAGE), + LPC_MAX_DATA_LENGTH, // HACK: the real value is: sizeof(CSR_CONNECTION_INFO), + LPC_MAX_MESSAGE_LENGTH, // HACK: the real value is: sizeof(CSR_API_MESSAGE), 16 * PAGE_SIZE); if (NT_SUCCESS(Status)) { @@ -1482,106 +1102,6 @@ return Status; } -NTSTATUS WINAPI -CsrpHandleConnectionRequest(PPORT_MESSAGE Request) -{ - NTSTATUS Status; - HANDLE ServerPort = NULL;//, ServerThread = NULL; - PCSR_PROCESS ProcessData = NULL; - REMOTE_PORT_VIEW RemotePortView; -// CLIENT_ID ClientId; - BOOLEAN AllowConnection = FALSE; - PCSR_CONNECTION_INFO ConnectInfo; - ServerPort = NULL; - - DPRINT("CSR: %s: Handling: %p\n", __FUNCTION__, Request); - - ConnectInfo = (PCSR_CONNECTION_INFO)(Request + 1); - - /* Save the process ID */ - RtlZeroMemory(ConnectInfo, sizeof(CSR_CONNECTION_INFO)); - - CsrLockProcessByClientId(Request->ClientId.UniqueProcess, &ProcessData); - if (!ProcessData) - { - DPRINT1("CSRSRV: Unknown process: %lx. Will be rejecting connection\n", - Request->ClientId.UniqueProcess); - } - - if ((ProcessData) && (ProcessData != CsrRootProcess)) - { - /* Attach the Shared Section */ - Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); - if (NT_SUCCESS(Status)) - { - DPRINT("Connection ok\n"); - AllowConnection = TRUE; - } - else - { - DPRINT1("Shared section map failed: %lx\n", Status); - } - } - else if (ProcessData == CsrRootProcess) - { - AllowConnection = TRUE; - } - - /* Release the process */ - if (ProcessData) CsrUnlockProcess(ProcessData); - - /* Setup the Port View Structure */ - RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); - RemotePortView.ViewSize = 0; - RemotePortView.ViewBase = NULL; - - /* Save the Process ID */ - ConnectInfo->ProcessId = NtCurrentTeb()->ClientId.UniqueProcess; - - Status = NtAcceptConnectPort(&ServerPort, - AllowConnection ? UlongToPtr(ProcessData->SequenceNumber) : 0, - Request, - AllowConnection, - NULL, - &RemotePortView); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSS: NtAcceptConnectPort - failed. Status == %X\n", Status); - } - else if (AllowConnection) - { - if (CsrDebug & 2) - { - DPRINT1("CSRSS: ClientId: %lx.%lx has ClientView: Base=%p, Size=%lx\n", - Request->ClientId.UniqueProcess, - Request->ClientId.UniqueThread, - RemotePortView.ViewBase, - RemotePortView.ViewSize); - } - - /* Set some Port Data in the Process */ - ProcessData->ClientPort = ServerPort; - ProcessData->ClientViewBase = (ULONG_PTR)RemotePortView.ViewBase; - ProcessData->ClientViewBounds = (ULONG_PTR)((ULONG_PTR)RemotePortView.ViewBase + - (ULONG_PTR)RemotePortView.ViewSize); - - /* Complete the connection */ - Status = NtCompleteConnectPort(ServerPort); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSS: NtCompleteConnectPort - failed. Status == %X\n", Status); - } - } - else - { - DPRINT1("CSRSS: Rejecting Connection Request from ClientId: %lx.%lx\n", - Request->ClientId.UniqueProcess, - Request->ClientId.UniqueThread); - } - - return Status; -} - /*++ * @name CsrConnectToUser * @implemented NT4 @@ -1599,6 +1119,7 @@ NTAPI CsrConnectToUser(VOID) { +#if 0 // This code is OK, however it is ClientThreadSetup which sucks. NTSTATUS Status; ANSI_STRING DllName; UNICODE_STRING TempName; @@ -1655,6 +1176,19 @@ /* Return it */ return CsrThread; + +#else + + PTEB Teb = NtCurrentTeb(); + PCSR_THREAD CsrThread; + + /* Save pointer to this thread in TEB */ + CsrThread = CsrLocateThreadInProcess(NULL, &Teb->ClientId); + if (CsrThread) Teb->CsrClientThread = CsrThread; + + /* Return it */ + return CsrThread; +#endif } /*++ @@ -1703,20 +1237,20 @@ IN PCSR_API_MESSAGE ApiMessage) { PCSR_CAPTURE_BUFFER LocalCaptureBuffer = NULL, RemoteCaptureBuffer = NULL; - ULONG LocalLength = 0, PointerCount = 0; - SIZE_T BufferDistance = 0; - ULONG_PTR **PointerOffsets = NULL, *CurrentPointer = NULL; + SIZE_T BufferDistance; + ULONG Length = 0; + ULONG i; /* Use SEH to make sure this is valid */ _SEH2_TRY { /* Get the buffer we got from whoever called NTDLL */ LocalCaptureBuffer = ApiMessage->CsrCaptureData; - LocalLength = LocalCaptureBuffer->Size; + Length = LocalCaptureBuffer->Size; /* Now check if the buffer is inside our mapped section */ if (((ULONG_PTR)LocalCaptureBuffer < CsrThread->Process->ClientViewBase) || - (((ULONG_PTR)LocalCaptureBuffer + LocalLength) >= CsrThread->Process->ClientViewBounds)) + (((ULONG_PTR)LocalCaptureBuffer + Length) >= CsrThread->Process->ClientViewBounds)) { /* Return failure */ DPRINT1("*** CSRSS: CaptureBuffer outside of ClientView\n"); @@ -1725,8 +1259,9 @@ } /* Check if the Length is valid */ - if (((LocalCaptureBuffer->PointerCount * 4 + sizeof(CSR_CAPTURE_BUFFER)) > - LocalLength) ||(LocalLength > MAXWORD)) + if ((FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + + (LocalCaptureBuffer->PointerCount * sizeof(PVOID)) > Length) || + (Length > MAXWORD)) { /* Return failure */ DPRINT1("*** CSRSS: CaptureBuffer %p has bad length\n", LocalCaptureBuffer); @@ -1743,7 +1278,7 @@ } _SEH2_END; /* We validated the incoming buffer, now allocate the remote one */ - RemoteCaptureBuffer = RtlAllocateHeap(CsrHeap, 0, LocalLength); + RemoteCaptureBuffer = RtlAllocateHeap(CsrHeap, 0, Length); if (!RemoteCaptureBuffer) { /* We're out of memory */ @@ -1752,33 +1287,27 @@ } /* Copy the client's buffer */ - RtlMoveMemory(RemoteCaptureBuffer, LocalCaptureBuffer, LocalLength); - - /* Copy the length */ - RemoteCaptureBuffer->Size = LocalLength; + RtlMoveMemory(RemoteCaptureBuffer, LocalCaptureBuffer, Length); /* Calculate the difference between our buffer and the client's */ BufferDistance = (ULONG_PTR)RemoteCaptureBuffer - (ULONG_PTR)LocalCaptureBuffer; - /* Save the pointer count and offset pointer */ - PointerCount = RemoteCaptureBuffer->PointerCount; - PointerOffsets = (ULONG_PTR**)(RemoteCaptureBuffer + 1); - - /* Start the loop */ - while (PointerCount) - { - /* Get the current pointer */ - if ((CurrentPointer = *PointerOffsets++)) - { - /* Add it to the CSR Message structure */ - CurrentPointer += (ULONG_PTR)ApiMessage; + /* + * Convert all the pointer offsets into real pointers, and make + * them point to the remote data buffer instead of the local one. + */ + for (i = 0 ; i < RemoteCaptureBuffer->PointerCount ; ++i) + { + if (RemoteCaptureBuffer->PointerOffsetsArray[i] != 0) + { + RemoteCaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; /* Validate the bounds of the current pointer */ - if ((*CurrentPointer >= CsrThread->Process->ClientViewBase) && - (*CurrentPointer < CsrThread->Process->ClientViewBounds)) + if ((*(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] >= CsrThread->Process->ClientViewBase) && + (*(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] < CsrThread->Process->ClientViewBounds)) { /* Modify the pointer to take into account its new position */ - *CurrentPointer += BufferDistance; + *(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] += BufferDistance; } else { @@ -1788,9 +1317,6 @@ ApiMessage->Status = STATUS_INVALID_PARAMETER; } } - - /* Move to the next Pointer */ - PointerCount--; } /* Check if we got success */ @@ -1833,39 +1359,33 @@ { PCSR_CAPTURE_BUFFER RemoteCaptureBuffer, LocalCaptureBuffer; SIZE_T BufferDistance; - ULONG PointerCount; - ULONG_PTR **PointerOffsets, *CurrentPointer; + ULONG i; /* Get the capture buffers */ RemoteCaptureBuffer = ApiMessage->CsrCaptureData; LocalCaptureBuffer = RemoteCaptureBuffer->PreviousCaptureBuffer; + /* Do not continue if there is no captured buffer */ + if (!RemoteCaptureBuffer) return; + /* Free the previous one */ RemoteCaptureBuffer->PreviousCaptureBuffer = NULL; - /* Find out the difference between the two buffers */ - BufferDistance = (ULONG_PTR)LocalCaptureBuffer - (ULONG_PTR)RemoteCaptureBuffer; - - /* Save the pointer count and offset pointer */ - PointerCount = RemoteCaptureBuffer->PointerCount; - PointerOffsets = (ULONG_PTR**)(RemoteCaptureBuffer + 1); - - /* Start the loop */ - while (PointerCount) - { - /* Get the current pointer */ - CurrentPointer = *PointerOffsets++; - if (CurrentPointer) - { - /* Add it to the CSR Message structure */ - CurrentPointer += (ULONG_PTR)ApiMessage; - - /* Modify the pointer to take into account its new position */ - *CurrentPointer += BufferDistance; - } - - /* Move to the next Pointer */ - PointerCount--; + /* Calculate the difference between our buffer and the client's */ + BufferDistance = (ULONG_PTR)RemoteCaptureBuffer - (ULONG_PTR)LocalCaptureBuffer; + + /* + * Convert back all the pointers into pointer offsets, and make them + * point to the local data buffer instead of the remote one (revert + * the logic of CsrCaptureArguments). + */ + for (i = 0 ; i < RemoteCaptureBuffer->PointerCount ; ++i) + { + if (RemoteCaptureBuffer->PointerOffsetsArray[i] != 0) + { + *(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] -= BufferDistance; + RemoteCaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; + } } /* Copy the data back */ @@ -1889,11 +1409,11 @@ * @param Buffer * Pointer to the message buffer to validate. * - * @param ArgumentSize - * Size of the message to check. - * - * @param ArgumentCount - * Number of messages to check. + * @param ElementCount + * Number of elements contained in the message buffer. + * + * @param ElementSize + * Size of each element. * * @return TRUE if validation suceeded, FALSE otherwise. * @@ -1904,61 +1424,96 @@ NTAPI CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, IN PVOID *Buffer, - IN ULONG ArgumentSize, - IN ULONG ArgumentCount) + IN ULONG ElementCount, + IN ULONG ElementSize) { PCSR_CAPTURE_BUFFER CaptureBuffer = ApiMessage->CsrCaptureData; - SIZE_T BufferDistance; - ULONG PointerCount, i; - ULONG_PTR **PointerOffsets, *CurrentPointer; - - /* Make sure there are some arguments */ - if (!ArgumentCount) return FALSE; + // SIZE_T BufferDistance = (ULONG_PTR)Buffer - (ULONG_PTR)ApiMessage; + ULONG i; + + /* + * Check whether we have a valid buffer pointer, elements + * of non-trivial size and that we don't overflow. + */ + if (!Buffer || ElementSize == 0 || + (ULONGLONG)ElementCount * ElementSize > (ULONGLONG)0xFFFFFFFF) + { + return FALSE; + } /* Check if didn't get a buffer and there aren't any arguments to check */ - if (!(*Buffer) && (!(ArgumentCount * ArgumentSize))) return TRUE; + // if (!*Buffer && (ElementCount * ElementSize == 0)) + if (!*Buffer && ElementCount == 0) // Here ElementSize != 0 therefore only ElementCount can be == 0 + return TRUE; /* Check if we have no capture buffer */ if (!CaptureBuffer) { - /* In this case, check only the Process ID */ + /* + * In this case, check only the Process ID + * and if there is a match, we succeed. + */ if (NtCurrentTeb()->ClientId.UniqueProcess == ApiMessage->Header.ClientId.UniqueProcess) { - /* There is a match, validation succeeded */ return TRUE; } } else { /* Make sure that there is still space left in the buffer */ - if ((CaptureBuffer->Size - (ULONG_PTR)*Buffer + (ULONG_PTR)CaptureBuffer) < - (ArgumentCount * ArgumentSize)) - { - /* Find out the difference between the two buffers */ - BufferDistance = (ULONG_PTR)Buffer - (ULONG_PTR)ApiMessage; - - /* Save the pointer count */ - PointerCount = CaptureBuffer->PointerCount; - PointerOffsets = (ULONG_PTR**)(CaptureBuffer + 1); - - /* Start the loop */ - for (i = 0; i < PointerCount; i++) - { - /* Get the current pointer */ - CurrentPointer = *PointerOffsets++; - - /* Check if its' equal to the difference */ - if (*CurrentPointer == BufferDistance) return TRUE; + if ((CaptureBuffer->Size - (ULONG_PTR)*Buffer + (ULONG_PTR)CaptureBuffer) >= + (ElementCount * ElementSize)) + { + for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) + { + /* + * If the pointer offset is in fact equal to the + * real address of the buffer then it's OK. + */ + if (CaptureBuffer->PointerOffsetsArray[i] == (ULONG_PTR)Buffer /* BufferDistance + (ULONG_PTR)ApiMessage */) + { + return TRUE; + } } } } /* Failure */ - DbgPrint("CSRSRV: Bad message buffer %p\n", ApiMessage); + DPRINT1("CSRSRV: Bad message buffer %p\n", ApiMessage); DbgBreakPoint(); return FALSE; } + +/*** This is what we have in consrv/server.c *** + +/\* Ensure that a captured buffer is safe to access *\/ +BOOL FASTCALL +Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, + SIZE_T NumElements, SIZE_T ElementSize) +{ + /\* Check that the following conditions are true: + * 1. The start of the buffer is somewhere within the process's + * shared memory section view. + * 2. The remaining space in the view is at least as large as the buffer. + * (NB: Please don't try to "optimize" this by using multiplication + * instead of division; remember that 2147483648 * 2 = 0.) + * 3. The buffer is DWORD-aligned. + *\/ + ULONG_PTR Offset = (BYTE *)Buffer - (BYTE *)ProcessData->ClientViewBase; + if (Offset >= ProcessData->ClientViewBounds + || NumElements > (ProcessData->ClientViewBounds - Offset) / ElementSize + || (Offset & (sizeof(DWORD) - 1)) != 0) + { + DPRINT1("Invalid buffer %p(%u*%u); section view is %p(%u)\n", + Buffer, NumElements, ElementSize, + ProcessData->ClientViewBase, ProcessData->ClientViewBounds); + return FALSE; + } + return TRUE; +} + +***********************************************/ /*++ * @name CsrValidateMessageString @@ -1983,8 +1538,17 @@ CsrValidateMessageString(IN PCSR_API_MESSAGE ApiMessage, IN LPWSTR *MessageString) { - DPRINT1("CSRSRV: %s called\n", __FUNCTION__); - return FALSE; + if (MessageString) + { + return CsrValidateMessageBuffer(ApiMessage, + (PVOID*)MessageString, + wcslen(*MessageString) + 1, + sizeof(WCHAR)); + } + else + { + return FALSE; + } } /* EOF */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.spec [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.spec [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -3,7 +3,7 @@ @ stdcall CsrConnectToUser() @ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) @ stdcall CsrCreateRemoteThread(ptr ptr) -@ stdcall CsrCreateThread(ptr ptr ptr) ;;; @ stdcall CsrCreateThread(ptr ptr ptr long) ?? +@ stdcall CsrCreateThread(ptr ptr ptr long) @ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) @ stdcall CsrDebugProcess(ptr) @ stdcall CsrDebugProcessStop(ptr) Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -39,37 +39,6 @@ #define CSR_SERVER_DLL_MAX 4 - - -/*** - *** Old structure. Deprecated. - ***/ -typedef struct _CSRSS_API_DEFINITION -{ - ULONG ApiID; - ULONG MinRequestSize; - PCSR_API_ROUTINE Handler; -} CSRSS_API_DEFINITION, *PCSRSS_API_DEFINITION; - -#define CSRSS_DEFINE_API(Func, Handler) \ - { Func, sizeof(CSRSS_##Func), Handler } - - - - -typedef struct _CSRSS_LISTEN_DATA -{ - HANDLE ApiPortHandle; - ULONG ApiDefinitionsCount; - PCSRSS_API_DEFINITION *ApiDefinitions; -} CSRSS_LISTEN_DATA, *PCSRSS_LISTEN_DATA; - - - - -/****************************************************************************** - ****************************************************************************** - ******************************************************************************/ extern HANDLE hBootstrapOk; @@ -154,13 +123,6 @@ IN PCSR_PROCESS CurrentProcess OPTIONAL, IN PCSR_PROCESS CsrProcess); - -#if 0 -NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions); -#endif - -VOID FASTCALL CsrApiCallHandler(IN OUT PCSR_API_MESSAGE ApiMessage, OUT PULONG Reply); - NTSTATUS NTAPI CsrApiRequestThread(IN PVOID Parameter); // HANDLE ServerPort ?? @@ -208,16 +170,6 @@ NTAPI CsrLocateThreadByClientId(OUT PCSR_PROCESS *Process OPTIONAL, IN PCLIENT_ID ClientId); - -// HACK -VOID -NTAPI -CsrProcessRefcountZero(IN PCSR_PROCESS CsrProcess); - -// HACK -VOID -NTAPI -CsrThreadRefcountZero(IN PCSR_THREAD CsrThread); NTSTATUS NTAPI Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -25,7 +25,7 @@ HANDLE CsrSmApiPort = NULL; HANDLE hSbApiPort = NULL; HANDLE CsrApiPort = NULL; -ULONG CsrDebug = 0;//0xFFFFFFFF; +ULONG CsrDebug = 0xFFFFFFFF; // 0; ULONG CsrMaxApiRequestThreads; ULONG CsrTotalPerProcessDataLength; ULONG SessionId; @@ -564,7 +564,7 @@ * *--*/ NTSTATUS -FASTCALL +NTAPI CsrParseServerCommandLine(IN ULONG ArgumentCount, IN PCHAR Arguments[]) { @@ -668,7 +668,7 @@ /* Load us */ Status = CsrLoadServerDll("CSRSS" /* "CSRSRV" */, NULL, CSRSRV_SERVERDLL_INDEX); } - else if (_stricmp(ParameterName, "ServerDLL") == 0) + else if (_stricmp(ParameterName, "ServerDll") == 0) { /* Loop the command line */ EntryPoint = NULL; @@ -729,6 +729,84 @@ } /*++ + * @name CsrInitCsrRootProcess + * + * The CsrInitCsrRootProcess routine further initializes the CSR Root Process + * created by CsrInitializeProcessStructure, by allocating and initializing + * per-process data for each Server DLL. + * + * @param None. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrInitCsrRootProcess(VOID) +{ + PVOID ProcessData; + PCSR_SERVER_DLL ServerDll; + ULONG i = 0; + + /* All Server DLLs are now loaded, allocate a heap for the Root Process */ + ProcessData = RtlAllocateHeap(CsrHeap, + HEAP_ZERO_MEMORY, + CsrTotalPerProcessDataLength); + if (!ProcessData) + { + DPRINT1("CSRSRV:%s: RtlAllocateHeap failed (Status=%08lx)\n", + __FUNCTION__, STATUS_NO_MEMORY); + return STATUS_NO_MEMORY; + } + + /* + * Our Root Process was never officially initalized, so write the data + * for each Server DLL manually. + */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server */ + ServerDll = CsrLoadedServerDll[i]; + + /* Is it loaded, and does it have per process data? */ + if (ServerDll && ServerDll->SizeOfProcessData) + { + /* It does, give it part of our allocated heap */ + CsrRootProcess->ServerData[i] = ProcessData; + + /* Move to the next heap position */ + ProcessData = (PVOID)((ULONG_PTR)ProcessData + + ServerDll->SizeOfProcessData); + } + else + { + /* Nothing for this Server DLL */ + CsrRootProcess->ServerData[i] = NULL; + } + } + + /* Now initialize the Root Process manually as well */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server */ + ServerDll = CsrLoadedServerDll[i]; + + /* Is it loaded, and does it a callback for new processes? */ + if (ServerDll && ServerDll->NewProcessCallback) + { + /* Call the callback */ + DPRINT1("Call NewProcessCallback(NULL, 0x%p) called\n", CsrRootProcess); + ServerDll->NewProcessCallback(NULL, CsrRootProcess); + } + } + + return STATUS_SUCCESS; +} + +/*++ * @name CsrCreateLocalSystemSD * * The CsrCreateLocalSystemSD routine creates a Security Descriptor for @@ -971,7 +1049,7 @@ return Status; } - /* Set up Process Support */ + /* Set up Process Support and allocate the CSR Root Process */ Status = CsrInitializeProcessStructure(); if (!NT_SUCCESS(Status)) { @@ -985,6 +1063,15 @@ if (!NT_SUCCESS(Status)) { DPRINT1("CSRSRV:%s: CsrParseServerCommandLine failed (Status=%08lx)\n", + __FUNCTION__, Status); + return Status; + } + + /* Finish to initialize the CSR Root Process */ + Status = CsrInitCsrRootProcess(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: CsrInitCsrRootProcess failed (Status=%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1068,12 +1155,12 @@ BOOL NTAPI -DllMain(IN HANDLE hDll, +DllMain(IN HINSTANCE hInstanceDll, IN DWORD dwReason, IN LPVOID lpReserved) { /* We don't do much */ - UNREFERENCED_PARAMETER(hDll); + UNREFERENCED_PARAMETER(hInstanceDll); UNREFERENCED_PARAMETER(dwReason); UNREFERENCED_PARAMETER(lpReserved); Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -341,7 +341,7 @@ * @implemented NT4 * * The CsrInitializeProcessStructure routine sets up support for CSR Processes - * and CSR Threads. + * and CSR Threads by initializing our own CSR Root Process. * * @param None. * @@ -467,9 +467,9 @@ *--*/ VOID NTAPI -CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, - IN PCSR_PROCESS CurrentProcess OPTIONAL, - IN PCSR_PROCESS CsrProcess) +CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, // ParentProcess + IN PCSR_PROCESS CurrentProcess OPTIONAL, // CallingProcess + IN PCSR_PROCESS CsrProcess) // Process { PCSR_SERVER_DLL ServerDll; ULONG i; @@ -488,7 +488,7 @@ ServerDll = CsrLoadedServerDll[i]; /* Make sure it's valid and that it has callback */ - if ((ServerDll) && (ServerDll->NewProcessCallback)) + if (ServerDll && ServerDll->NewProcessCallback) { ServerDll->NewProcessCallback(CurrentProcess, CsrProcess); } Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -119,6 +119,8 @@ PCSR_SERVER_DLL_INIT_CALLBACK ServerDllInitProcedure; ULONG Response; + DPRINT1("CsrLoadServerDll(%s, 0x%p, %lu)\n", DllString, EntryPoint, ServerId); + /* Check if it's beyond the maximum we support */ if (ServerId >= CSR_SERVER_DLL_MAX) return STATUS_TOO_MANY_NAMES; @@ -222,14 +224,6 @@ /* No, save the pointer to its shared section in our list */ CsrSrvSharedStaticServerData[ServerDll->ServerId] = ServerDll->SharedSection; } - -#if 0 /* HACK: ReactOS Specific hax. REMOVE IT. */ - if (ServerDll->HighestApiSupported == 0xDEADBABE) - { - // CSRSS_API_DEFINITIONS == Old structure. - Status = CsrApiRegisterDefinitions((PVOID)ServerDll->DispatchTable); - } -#endif } else { @@ -274,12 +268,11 @@ IN OUT PULONG Reply OPTIONAL) { NTSTATUS Status; - PCSR_CLIENT_CONNECT ClientConnect; + PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage->Data.CsrClientConnect; PCSR_SERVER_DLL ServerDll; PCSR_PROCESS CurrentProcess = CsrGetClientThread()->Process; - /* Load the Message, set default reply */ - ClientConnect = &ApiMessage->Data.CsrClientConnect; + /* Set default reply */ *Reply = 0; /* Validate the ServerID */ @@ -294,9 +287,9 @@ /* Validate the Message Buffer */ if (!(CsrValidateMessageBuffer(ApiMessage, - ClientConnect->ConnectionInfo, + &ClientConnect->ConnectionInfo, ClientConnect->ConnectionInfoSize, - 1))) + sizeof(BYTE)))) { /* Fail due to buffer overflow or other invalid buffer */ return STATUS_INVALID_PARAMETER; @@ -429,8 +422,7 @@ /* Now allocate space from the heap for the Shared Data */ CsrSrvSharedStaticServerData = RtlAllocateHeap(CsrSrvSharedSectionHeap, 0, - CSR_SERVER_DLL_MAX * - sizeof(PVOID)); + CSR_SERVER_DLL_MAX * sizeof(PVOID)); if (!CsrSrvSharedStaticServerData) return STATUS_NO_MEMORY; /* Write the values to the PEB */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -326,9 +326,6 @@ } } - /* HACK: FIXME: should go in BaseSrv part of CreateCallback done in Insert below */ - // RtlInitializeCriticalSection(&CsrProcess->HandleTableLock); - /* Insert the Process */ CsrInsertProcess(NULL, NULL, CsrProcess); Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Mon Nov 5 00:23:58 2012 @@ -659,7 +659,6 @@ *--*/ NTSTATUS NTAPI -#if 0 CsrCreateThread(IN PCSR_PROCESS CsrProcess, IN HANDLE hThread, IN PCLIENT_ID ClientId, @@ -670,12 +669,13 @@ PCSR_PROCESS CurrentProcess; CLIENT_ID CurrentCid; KERNEL_USER_TIMES KernelTimes; + DPRINT("CSRSRV: %s called\n", __FUNCTION__); if (HaveClient) { /* Get the current thread and CID */ - CurrentThread = NtCurrentTeb()->CsrClientThread; + CurrentThread = CsrGetClientThread(); CurrentCid = CurrentThread->ClientId; /* Acquire the Process Lock */ @@ -683,6 +683,8 @@ /* Get the current Process and make sure the Thread is valid with this CID */ CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, &CurrentCid); + + /* Something is wrong if we get an empty thread back */ if (!CurrentThread) { DPRINT1("CSRSRV:%s: invalid thread!\n", __FUNCTION__); @@ -729,66 +731,9 @@ /* Release the lock and return */ CsrReleaseProcessLock(); + return STATUS_SUCCESS; } -#else -CsrCreateThread(IN PCSR_PROCESS CsrProcess, - IN HANDLE hThread, - IN PCLIENT_ID ClientId) -{ - PCSR_THREAD CsrThread; - PCSR_PROCESS CurrentProcess; - PCSR_THREAD CurrentThread = CsrGetClientThread(); - CLIENT_ID CurrentCid; - KERNEL_USER_TIMES KernelTimes; - - /* Get the current thread and CID */ - CurrentCid = CurrentThread->ClientId; - - /* Acquire the Process Lock */ - CsrAcquireProcessLock(); - - /* Get the current Process and make sure the Thread is valid with this CID */ - CurrentThread = CsrLocateThreadByClientId(&CurrentProcess, - &CurrentCid); - - /* Something is wrong if we get an empty thread back */ - if (!CurrentThread) - { - DPRINT1("CSRSRV:%s: invalid thread!\n", __FUNCTION__); - CsrReleaseProcessLock(); - return STATUS_THREAD_IS_TERMINATING; - } - - /* Get the Thread Create Time */ - NtQueryInformationThread(hThread, - ThreadTimes, - (PVOID)&KernelTimes, - sizeof(KernelTimes), - NULL); - - /* Allocate a CSR Thread Structure */ - if (!(CsrThread = CsrAllocateThread(CsrProcess))) - { - DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); - CsrReleaseProcessLock(); - return STATUS_NO_MEMORY; - } - - /* Save the data we have */ - CsrThread->CreateTime = KernelTimes.CreateTime; - CsrThread->ClientId = *ClientId; - CsrThread->ThreadHandle = hThread; - CsrThread->Flags = 0; - - /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); - - /* Release the lock and return */ - CsrReleaseProcessLock(); - return STATUS_SUCCESS; -} -#endif /*++ * @name CsrDereferenceThread

1 0

[jgardou] 57672: [USER32] - Implement LookupIconIdFromDirectoryEx. - Implement CopyImage - Finish Implementing LoadImage - Implement various functions. [WIN32SS] - Add a first working implementatio...
by jgardou＠svn.reactos.org 04 Nov '12

04 Nov '12

Author: jgardou Date: Sun Nov 4 12:56:44 2012 New Revision: 57672 URL: http://svn.reactos.org/svn/reactos?rev=57672&view=rev Log: [USER32] - Implement LookupIconIdFromDirectoryEx. - Implement CopyImage - Finish Implementing LoadImage - Implement various functions. [WIN32SS] - Add a first working implementation for LR_SHARED cursors and icons.User32 support is there, but more work is needed in win32k. Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/include/ntusrtyp.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/class.h 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/simplecall.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Nov 4 12:56:44 2012 @@ -9,6 +9,10 @@ if(USE_DIBLIB) add_subdirectory(gdi/diblib) +endif() + +if(USE_NEW_CURSORICON) + add_definitions(-DNEW_CURSORICON) endif() add_subdirectory(gdi/gdi32) @@ -190,7 +194,6 @@ endif() if(USE_NEW_CURSORICON) - add_definitions(-DNEW_CURSORICON) list(APPEND SOURCE user/ntuser/cursoricon_new.c) else() list(APPEND SOURCE user/ntuser/cursoricon.c) 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] Sun Nov 4 12:56:44 2012 @@ -1659,8 +1659,8 @@ BOOL NTAPI NtUserDestroyCursor( - HANDLE Handle, - DWORD Unknown); + _In_ HANDLE Handle, + _In_ BOOL bForce); DWORD NTAPI @@ -1818,14 +1818,6 @@ HDC hDC, HBRUSH hBrush); -HICON -NTAPI -NtUserFindExistingCursorIcon( - HMODULE hModule, - HRSRC hRsrc, - LONG cx, - LONG cy); - HWND NTAPI NtUserFindWindowEx( @@ -1998,12 +1990,12 @@ BOOL NTAPI NtUserGetIconInfo( - HANDLE hCurIcon, - PICONINFO IconInfo, - PUNICODE_STRING lpInstName, - PUNICODE_STRING lpResName, - LPDWORD pbpp, - BOOL bInternal); + _In_ HANDLE hCurIcon, + _Out_opt_ PICONINFO IconInfo, + _Out_opt_ PUNICODE_STRING lpInstName, + _Out_opt_ PUNICODE_STRING lpResName, + _Out_opt_ LPDWORD pbpp, + _In_ BOOL bInternal); BOOL NTAPI @@ -2743,9 +2735,17 @@ NTAPI NtUserSetCursorIconData( _In_ HCURSOR hCursor, - _In_ HINSTANCE hinst, - _In_ HRSRC hrsrc, + _In_ PUNICODE_STRING pustrModule, + _In_ PUNICODE_STRING puSrcName, _In_ PICONINFO pii); + +HICON +NTAPI +NtUserFindExistingCursorIcon( + _In_ PUNICODE_STRING pustrModule, + _In_ PUNICODE_STRING pustrRsrc, + _In_ LONG cxDesired, + _In_ LONG cyDesired); #else BOOL NTAPI @@ -2756,6 +2756,14 @@ HMODULE hModule, HRSRC hRsrc, HRSRC hGroupRsrc); + +HICON +NTAPI +NtUserFindExistingCursorIcon( + HMODULE hModule, + HRSRC hRsrc, + LONG cx, + LONG cy); #endif DWORD Modified: trunk/reactos/win32ss/include/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntusrtyp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntusrtyp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntusrtyp.h [iso-8859-1] Sun Nov 4 12:56:44 2012 @@ -88,8 +88,9 @@ typedef struct { union - { ICONRESDIR icon; - CURSORDIR cursor; + { + ICONRESDIR icon; + CURSORDIR cursor; } ResInfo; WORD wPlanes; WORD wBitCount; 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] Sun Nov 4 12:56:44 2012 @@ -124,7 +124,7 @@ _Must_inspect_result_ NTSTATUS NTAPI -CaptureUnicodeStringOrAtom( +ProbeAndCaptureUnicodeStringOrAtom( _Out_ PUNICODE_STRING pustrOut, __in_data_source(USER_MODE) _In_ PUNICODE_STRING pustrUnsafe) { @@ -2294,7 +2294,7 @@ NTSTATUS Status; BOOL Ret; - Status = CaptureUnicodeStringOrAtom(&SafeClassName, ClassNameOrAtom); + Status = ProbeAndCaptureUnicodeStringOrAtom(&SafeClassName, ClassNameOrAtom); if (!NT_SUCCESS(Status)) { ERR("Error capturing the class name\n"); @@ -2346,7 +2346,7 @@ } _SEH2_END; - Status = CaptureUnicodeStringOrAtom(&SafeClassName, ClassName); + Status = ProbeAndCaptureUnicodeStringOrAtom(&SafeClassName, ClassName); if (!NT_SUCCESS(Status)) { ERR("Error capturing the class name\n"); @@ -2480,7 +2480,7 @@ RTL_ATOM ClassAtom = 0; NTSTATUS Status; - Status = CaptureUnicodeStringOrAtom(&SafeClassName, ClassName); + Status = ProbeAndCaptureUnicodeStringOrAtom(&SafeClassName, ClassName); if (!NT_SUCCESS(Status)) { ERR("Error capturing the class name\n"); Modified: trunk/reactos/win32ss/user/ntuser/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] Sun Nov 4 12:56:44 2012 @@ -59,4 +59,11 @@ ULONG_PTR FASTCALL UserGetCPD(PVOID,GETCPD,ULONG_PTR); +_Must_inspect_result_ +NTSTATUS +NTAPI +ProbeAndCaptureUnicodeStringOrAtom( + _Out_ PUNICODE_STRING pustrOut, + __in_data_source(USER_MODE) _In_ PUNICODE_STRING pustrUnsafe); + /* EOF */ 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] Sun Nov 4 12:56:44 2012 @@ -204,7 +204,7 @@ } PCURICON_OBJECT -IntCreateCurIconHandle() +IntCreateCurIconHandle(DWORD dwNumber) { PCURICON_OBJECT CurIcon; HANDLE hCurIcon; @@ -613,8 +613,8 @@ BOOL APIENTRY NtUserDestroyCursor( - HANDLE hCurIcon, - DWORD Unknown) + _In_ HANDLE hCurIcon, + _In_ BOOL bForce) { PCURICON_OBJECT CurIcon; BOOL ret; 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] Sun Nov 4 12:56:44 2012 @@ -22,8 +22,8 @@ LIST_ENTRY ListEntry; HANDLE Self; LIST_ENTRY ProcessList; - HMODULE hModule; - HRSRC hRsrc; + UNICODE_STRING ustrModule; + UNICODE_STRING ustrRsrc; SIZE Size; BYTE Shadow; BOOL bIcon; @@ -88,7 +88,7 @@ } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO; BOOL InitCursorImpl(VOID); -PCURICON_OBJECT IntCreateCurIconHandle(VOID); +PCURICON_OBJECT IntCreateCurIconHandle(DWORD dwNumber); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process); BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, 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] Sun Nov 4 12:56:44 2012 @@ -169,47 +169,59 @@ return TRUE; } -PCURICON_OBJECT FASTCALL -IntFindExistingCurIconObject(HMODULE hModule, - HRSRC hRsrc, LONG cx, LONG cy) +static +PCURICON_OBJECT +FASTCALL +IntFindExistingCurIconObject( + PUNICODE_STRING pustrModule, + PUNICODE_STRING pustrRsrc, + LONG cxDesired, + LONG cyDesired) { PCURICON_OBJECT CurIcon; LIST_FOR_EACH(CurIcon, &gCurIconList, CURICON_OBJECT, ListEntry) { - - // if (NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) // <- huh???? -// UserReferenceObject( CurIcon); -// { - if ((CurIcon->hModule == hModule) && (CurIcon->hRsrc == hRsrc)) - { - if (cx && ((cx != CurIcon->Size.cx) || (cy != CurIcon->Size.cy))) + /* See if module names match */ + if(RtlCompareUnicodeString(pustrModule, &CurIcon->ustrModule, TRUE) == 0) + { + /* They do. Now see if this is the same resource */ + if(IS_INTRESOURCE(CurIcon->ustrRsrc.Buffer) && IS_INTRESOURCE(pustrRsrc->Buffer)) { -// UserDereferenceObject(CurIcon); + if(CurIcon->ustrRsrc.Buffer != pustrRsrc->Buffer) + continue; + } + else if(IS_INTRESOURCE(CurIcon->ustrRsrc.Buffer) || IS_INTRESOURCE(pustrRsrc->Buffer)) continue; + else if(RtlCompareUnicodeString(pustrRsrc, &CurIcon->ustrRsrc, TRUE) != 0) + continue; + + if ((cxDesired == CurIcon->Size.cx) &&(cyDesired == CurIcon->Size.cy)) + { + if (! ReferenceCurIconByProcess(CurIcon)) + { + return NULL; + } + + return CurIcon; } - if (! ReferenceCurIconByProcess(CurIcon)) - { - return NULL; - } - - return CurIcon; - } -// } -// UserDereferenceObject(CurIcon); - + } } return NULL; } PCURICON_OBJECT -IntCreateCurIconHandle() +IntCreateCurIconHandle(DWORD dwNumber) { PCURICON_OBJECT CurIcon; + BOOLEAN bIcon = dwNumber == 0; HANDLE hCurIcon; - - CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + + if(dwNumber == 0) + dwNumber = 1; + + CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, otCursorIcon, FIELD_OFFSET(CURICON_OBJECT, aFrame[dwNumber])); if (!CurIcon) { @@ -218,6 +230,7 @@ } CurIcon->Self = hCurIcon; + CurIcon->bIcon = bIcon; InitializeListHead(&CurIcon->ProcessList); if (! ReferenceCurIconByProcess(CurIcon)) @@ -234,7 +247,7 @@ } BOOLEAN FASTCALL -IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, PPROCESSINFO ppi) +IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, PPROCESSINFO ppi, BOOLEAN bForce) { PSYSTEM_CURSORINFO CurInfo; HBITMAP bmpMask, bmpColor, bmpAlpha; @@ -261,7 +274,17 @@ { /* This object doesn't belong to this process */ EngSetLastError(ERROR_INVALID_HANDLE); + /* Caller expects us to dereference! */ + UserDereferenceObject(CurIcon); return FALSE; + } + + /* We found our process, but we're told to not destroy it in case it is shared */ + if((CurIcon->ustrModule.Buffer != NULL) && !bForce) + { + /* Tests show this is a valid call */ + UserDereferenceObject(CurIcon); + return TRUE; } ExFreeToPagedLookasideList(pgProcessLookasideList, Current); @@ -314,6 +337,11 @@ GreDeleteObject(bmpAlpha); CurIcon->aFrame[0].hbmAlpha = NULL; } + + if(!IS_INTRESOURCE(CurIcon->ustrRsrc.Buffer)) + ExFreePoolWithTag(CurIcon->ustrRsrc.Buffer, TAG_STRING); + if(CurIcon->ustrModule.Buffer) + ReleaseCapturedUnicodeString(&CurIcon->ustrModule, UserMode); /* We were given a pointer, no need to keep the reference anylonger! */ UserDereferenceObject(CurIcon); @@ -331,7 +359,7 @@ LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) { UserReferenceObject(CurIcon); - IntDestroyCurIconObject(CurIcon, Win32Process); + IntDestroyCurIconObject(CurIcon, Win32Process, TRUE); } } @@ -342,12 +370,12 @@ BOOL APIENTRY NtUserGetIconInfo( - HANDLE hCurIcon, - PICONINFO IconInfo, - PUNICODE_STRING lpInstName, // Optional - PUNICODE_STRING lpResName, // Optional - LPDWORD pbpp, // Optional - BOOL bInternal) + _In_ HANDLE hCurIcon, + _Out_opt_ PICONINFO IconInfo, + _Out_opt_ PUNICODE_STRING lpModule, // Optional + _Out_opt_ PUNICODE_STRING lpResName, // Optional + _Out_opt_ LPDWORD pbpp, // Optional + _In_ BOOL bInternal) { ICONINFO ii; PCURICON_OBJECT CurIcon; @@ -356,66 +384,145 @@ DWORD colorBpp = 0; TRACE("Enter NtUserGetIconInfo\n"); + + /* Check if something was actually asked */ + if (!IconInfo && !lpModule && !lpResName) + { + WARN("Nothing to fill.\n"); + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + UserEnterExclusive(); - if (!IconInfo) - { - EngSetLastError(ERROR_INVALID_PARAMETER); + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + WARN("UserGetIconObject(0x%08x) Failed.\n", hCurIcon); + UserLeave(); + return FALSE; + } + + /* Give back the icon information */ + if(IconInfo) + { + /* Fill data */ + ii.fIcon = CurIcon->bIcon; + ii.xHotspot = CurIcon->ptlHotspot.x; + ii.yHotspot = CurIcon->ptlHotspot.y; + + /* Copy bitmaps */ + ii.hbmMask = BITMAP_CopyBitmap(CurIcon->aFrame[0].hbmMask); + GreSetObjectOwner(ii.hbmMask, GDI_OBJ_HMGR_POWNED); + ii.hbmColor = BITMAP_CopyBitmap(CurIcon->aFrame[0].hbmColor); + GreSetObjectOwner(ii.hbmColor, GDI_OBJ_HMGR_POWNED); + + if (pbpp) + { + PSURFACE psurfBmp; + + psurfBmp = SURFACE_ShareLockSurface(CurIcon->aFrame[0].hbmColor); + if (psurfBmp) + { + colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); + SURFACE_ShareUnlockSurface(psurfBmp); + } + } + + /* Copy fields */ + _SEH2_TRY + { + ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + + if (pbpp) + { + ProbeForWrite(pbpp, sizeof(DWORD), 1); + *pbpp = colorBpp; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + } + + if (!NT_SUCCESS(Status)) + { + WARN("Status: 0x%08x.\n", Status); + SetLastNtError(Status); goto leave; } - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { + /* Give back the module name */ + if(lpModule) + { + if(!CurIcon->ustrModule.Buffer) + { + EngSetLastError(ERROR_INVALID_HANDLE); + goto leave; + } + /* Copy what we can */ + _SEH2_TRY + { + ProbeForWrite(lpModule, sizeof(UNICODE_STRING), 1); + ProbeForWrite(lpModule->Buffer, lpModule->MaximumLength, 1); + lpModule->Length = min(lpModule->MaximumLength, CurIcon->ustrModule.Length); + RtlCopyMemory(lpModule->Buffer, CurIcon->ustrModule.Buffer, lpModule->Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + } + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); goto leave; } - /* Fill data */ - ii.fIcon = CurIcon->bIcon; - ii.xHotspot = CurIcon->ptlHotspot.x; - ii.yHotspot = CurIcon->ptlHotspot.y; - - /* Copy bitmaps */ - ii.hbmMask = BITMAP_CopyBitmap(CurIcon->aFrame[0].hbmMask); - ii.hbmColor = BITMAP_CopyBitmap(CurIcon->aFrame[0].hbmColor); - - if (pbpp) - { - PSURFACE psurfBmp; - - psurfBmp = SURFACE_ShareLockSurface(CurIcon->aFrame[0].hbmColor); - if (psurfBmp) - { - colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); - SURFACE_ShareUnlockSurface(psurfBmp); - } - } - - /* Copy fields */ - _SEH2_TRY - { - ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); - RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); - - if (pbpp) - { - ProbeForWrite(pbpp, sizeof(DWORD), 1); - *pbpp = colorBpp; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (NT_SUCCESS(Status)) - Ret = TRUE; - else + if(lpResName) + { + if(!CurIcon->ustrRsrc.Buffer) + { + EngSetLastError(ERROR_INVALID_HANDLE); + goto leave; + } + /* Copy it */ + _SEH2_TRY + { + ProbeForWrite(lpResName, sizeof(UNICODE_STRING), 1); + if(IS_INTRESOURCE(CurIcon->ustrRsrc.Buffer)) + { + lpResName->Buffer = CurIcon->ustrRsrc.Buffer; + lpResName->Length = 0; + } + else + { + lpResName->Length = min(lpResName->MaximumLength, CurIcon->ustrRsrc.Length); + RtlCopyMemory(lpResName->Buffer, CurIcon->ustrRsrc.Buffer, lpResName->Length); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + } + + if (!NT_SUCCESS(Status)) + { SetLastNtError(Status); - + goto leave; + } + + Ret = TRUE; + +leave: UserDereferenceObject(CurIcon); -leave: TRACE("Leave NtUserGetIconInfo, ret=%i\n", Ret); UserLeave(); @@ -623,8 +730,8 @@ BOOL APIENTRY NtUserDestroyCursor( - HANDLE hCurIcon, - DWORD Unknown) + _In_ HANDLE hCurIcon, + _In_ BOOL bForce) { PCURICON_OBJECT CurIcon; BOOL ret; @@ -638,7 +745,7 @@ RETURN(FALSE); } - ret = IntDestroyCurIconObject(CurIcon, PsGetCurrentProcessWin32Process()); + ret = IntDestroyCurIconObject(CurIcon, PsGetCurrentProcessWin32Process(), bForce); /* Note: IntDestroyCurIconObject will remove our reference for us! */ RETURN(ret); @@ -654,36 +761,40 @@ * @implemented */ HICON -APIENTRY +NTAPI NtUserFindExistingCursorIcon( - HMODULE hModule, - HRSRC hRsrc, - LONG cx, - LONG cy) + _In_ PUNICODE_STRING pustrModule, + _In_ PUNICODE_STRING pustrRsrc, + _In_ LONG cxDesired, + _In_ LONG cyDesired) { PCURICON_OBJECT CurIcon; - HANDLE Ret = (HANDLE)0; - DECLARE_RETURN(HICON); + HICON Ret = NULL; + UNICODE_STRING ustrModuleSafe, ustrRsrcSafe; + NTSTATUS Status; TRACE("Enter NtUserFindExistingCursorIcon\n"); + + /* Capture resource name (it can be an INTRESOURCE == ATOM) */ + Status = ProbeAndCaptureUnicodeStringOrAtom(&ustrRsrcSafe, pustrRsrc); + if(!NT_SUCCESS(Status)) + return NULL; + Status = ProbeAndCaptureUnicodeString(&ustrModuleSafe, UserMode, pustrModule); + if(!NT_SUCCESS(Status)) + goto done; + UserEnterExclusive(); - - CurIcon = IntFindExistingCurIconObject(hModule, hRsrc, cx, cy); + CurIcon = IntFindExistingCurIconObject(&ustrModuleSafe, &ustrRsrcSafe, cxDesired, cyDesired); if (CurIcon) - { Ret = CurIcon->Self; - -// IntReleaseCurIconObject(CurIcon); // FIXME: Is this correct? Does IntFindExistingCurIconObject add a ref? - RETURN(Ret); - } - - EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); - RETURN((HANDLE)0); - -CLEANUP: - TRACE("Leave NtUserFindExistingCursorIcon, ret=%p\n",_ret_); UserLeave(); - END_CLEANUP; + +done: + if(!IS_INTRESOURCE(ustrRsrcSafe.Buffer)) + ExFreePoolWithTag(ustrRsrcSafe.Buffer, TAG_STRING); + ReleaseCapturedUnicodeString(&ustrModuleSafe, UserMode); + + return Ret; } @@ -920,12 +1031,6 @@ done: - if(!Ret) - { - IntDestroyCurIconObject(CurIcon, PsGetCurrentProcessWin32Process()); - CurIcon = NULL; - } - if (CurIcon) { UserDereferenceObject(CurIcon); @@ -942,32 +1047,34 @@ /* * @implemented */ -#ifdef NEW_CURSORICON BOOL APIENTRY NtUserSetCursorIconData( - _In_ HCURSOR Handle, - _In_ HINSTANCE hinst, - _In_ HRSRC hrsrc, - _In_ PICONINFO pIconInfo) + _In_ HCURSOR Handle, + _In_opt_ PUNICODE_STRING pustrModule, + _In_opt_ PUNICODE_STRING pustrRsrc, + _In_ PICONINFO pIconInfo) { PCURICON_OBJECT CurIcon; PSURFACE psurfBmp; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); ICONINFO ii; - + TRACE("Enter NtUserSetCursorIconData\n"); + + /* If a module name is provided, we need a resource name, and vice versa */ + if((pustrModule && !pustrRsrc) || (!pustrModule && pustrRsrc)) + return FALSE; + UserEnterExclusive(); if (!(CurIcon = UserGetCurIconObject(Handle))) { - RETURN(FALSE); - } - - CurIcon->hModule = hinst; - CurIcon->hRsrc =hrsrc; + UserLeave(); + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } _SEH2_TRY { @@ -1014,28 +1121,37 @@ if (CurIcon->aFrame[0].hbmColor) { - if ((psurfBmp = SURFACE_ShareLockSurface(CurIcon->aFrame[0].hbmColor))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_ShareUnlockSurface(psurfBmp); - GreSetObjectOwner(CurIcon->aFrame[0].hbmMask, GDI_OBJ_HMGR_PUBLIC); - } - else + psurfBmp = SURFACE_ShareLockSurface(CurIcon->aFrame[0].hbmColor); + if(!psurfBmp) goto done; + + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_ShareUnlockSurface(psurfBmp); + GreSetObjectOwner(CurIcon->aFrame[0].hbmColor, GDI_OBJ_HMGR_PUBLIC); } else { - if ((psurfBmp = SURFACE_ShareLockSurface(CurIcon->aFrame[0].hbmMask))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy/2; - SURFACE_ShareUnlockSurface(psurfBmp); - } - else + psurfBmp = SURFACE_ShareLockSurface(CurIcon->aFrame[0].hbmMask); + if(!psurfBmp) goto done; + + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy/2; + SURFACE_ShareUnlockSurface(psurfBmp); } GreSetObjectOwner(CurIcon->aFrame[0].hbmMask, GDI_OBJ_HMGR_PUBLIC); + + if(pustrModule) + { + /* We use this convenient function, because INTRESOURCEs and ATOMs are the same */ + Status = ProbeAndCaptureUnicodeStringOrAtom(&CurIcon->ustrRsrc, pustrRsrc); + if(!NT_SUCCESS(Status)) + goto done; + Status = ProbeAndCaptureUnicodeString(&CurIcon->ustrModule, UserMode, pustrModule); + if(!NT_SUCCESS(Status)) + goto done; + } Ret = TRUE; @@ -1055,97 +1171,17 @@ GreDeleteObject(CurIcon->aFrame[0].hbmColor); CurIcon->aFrame[0].hbmColor = NULL; } - } - RETURN(Ret); - -CLEANUP: - TRACE("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); + if(!IS_INTRESOURCE(CurIcon->ustrRsrc.Buffer)) + ExFreePoolWithTag(CurIcon->ustrRsrc.Buffer, TAG_STRING); + if(CurIcon->ustrModule.Buffer) + ReleaseCapturedUnicodeString(&CurIcon->ustrModule, UserMode); + } + + TRACE("Leave NtUserSetCursorIconData, ret=%i\n",Ret); UserLeave(); - END_CLEANUP; -} -#else -BOOL -APIENTRY -NtUserSetCursorIconData( - HANDLE hCurIcon, - PBOOL fIcon, - POINT *Hotspot, - HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc) -{ - PCURICON_OBJECT CurIcon; - NTSTATUS Status; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserSetCursorIconData\n"); - UserEnterExclusive(); - - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - RETURN(FALSE); - } - - CurIcon->hModule = hModule; - CurIcon->hRsrc = hRsrc; - CurIcon->hGroupRsrc = hGroupRsrc; - - /* Copy fields */ - if (fIcon) - { - Status = MmCopyFromCaller(&CurIcon->bIcon, fIcon, sizeof(BOOL)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - } - else - { - if (!Hotspot) - Ret = TRUE; - } - - if (Hotspot) - { - Status = MmCopyFromCaller(&CurIcon->ptlHotspot, Hotspot, sizeof(POINT)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - } - - if (!fIcon && !Hotspot) - { - Ret = TRUE; - } - -done: - if(Ret) - { - /* This icon is shared now */ - GreSetObjectOwner(CurIcon->aFrame[0].hbmMask, GDI_OBJ_HMGR_PUBLIC); - if(CurIcon->aFrame[0].hbmColor) - { - GreSetObjectOwner(CurIcon->aFrame[0].hbmColor, GDI_OBJ_HMGR_PUBLIC); - } - if(CurIcon->aFrame[0].hbmAlpha) - { - GreSetObjectOwner(CurIcon->aFrame[0].hbmAlpha, GDI_OBJ_HMGR_PUBLIC); - } - } - UserDereferenceObject(CurIcon); - RETURN(Ret); - - -CLEANUP: - TRACE("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} -#endif + + return Ret; +} /* Mostly inspired from wine code. * We use low level functions because: @@ -1167,7 +1203,7 @@ HBRUSH hbrFlickerFreeDraw, UINT diFlags) { - PSURFACE psurfDest, psurfMask, psurfColor, psurfOffScreen; + PSURFACE psurfDest, psurfMask, psurfColor; //, psurfOffScreen = NULL; PDC pdc = NULL; BOOL Ret = FALSE; HBITMAP hbmMask, hbmColor, hbmAlpha; @@ -1215,6 +1251,35 @@ return FALSE; } + pdc = DC_LockDc(hDc); + if(!pdc) + { + ERR("Could not lock the destination DC.\n"); + SURFACE_ShareUnlockSurface(psurfMask); + if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); + return FALSE; + } + /* Calculate destination rectangle */ + RECTL_vSetRect(&rcDest, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); + IntLPtoDP(pdc, (LPPOINT)&rcDest, 2); + RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); + + /* Prepare the underlying surface */ + DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); + + /* We now have our destination surface and rectangle */ + psurfDest = pdc->dclevel.pSurface; + + if(psurfDest == NULL) + { + /* Empty DC */ + DC_vFinishBlit(pdc, NULL); + DC_UnlockDc(pdc); + SURFACE_ShareUnlockSurface(psurfMask); + if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); + return FALSE; + } + /* Set source rect */ RECTL_vSetRect(&rcSrc, 0, 0, pIcon->Size.cx, pIcon->Size.cy); @@ -1239,7 +1304,8 @@ } /* Should we render off-screen? */ - bOffScreen = hbrFlickerFreeDraw && (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH); + bOffScreen = hbrFlickerFreeDraw && + (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH); if (bOffScreen) { @@ -1252,21 +1318,18 @@ if(!pbrush) { ERR("Failed to get brush object.\n"); - SURFACE_ShareUnlockSurface(psurfMask); - if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); - return FALSE; - } - + goto Cleanup; + } + +#if 0 //We lock the hdc surface during the whole function it makes no sense to use an offscreen surface for "flicker free" drawing psurfOffScreen = SURFACE_AllocSurface(STYPE_BITMAP, - cxWidth, cyHeight, psurfColor->SurfObj.iBitmapFormat, + cxWidth, cyHeight, psurfDest->SurfObj.iBitmapFormat, 0, 0, NULL); if(!psurfOffScreen) { ERR("Failed to allocate the off-screen surface.\n"); - SURFACE_ShareUnlockSurface(psurfMask); - if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); BRUSH_ShareUnlockBrush(pbrush); - return FALSE; + goto Cleanup; } /* Paint the brush */ @@ -1292,52 +1355,45 @@ if(!Ret) { ERR("Failed to paint the off-screen surface.\n"); - SURFACE_ShareUnlockSurface(psurfMask); - if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); - GDIOBJ_vDeleteObject(&psurfOffScreen->BaseObject); - return FALSE; + goto Cleanup; } /* We now have our destination surface */ psurfDest = psurfOffScreen; +#else + pdcClipObj = pdc->rosdc.CombinedClip; + /* Paint the brush */ + EBRUSHOBJ_vInit(&eboFill, pbrush, psurfDest, 0x00FFFFFF, 0, NULL); + + Ret = IntEngBitBlt(&psurfDest->SurfObj, + NULL, + NULL, + pdcClipObj, + NULL, + &rcDest, + NULL, + NULL, + &eboFill.BrushObject, + &pbrush->ptOrigin, + ROP4_PATCOPY); + + /* Clean up everything */ + EBRUSHOBJ_vCleanup(&eboFill); + BRUSH_ShareUnlockBrush(pbrush); + + if(!Ret) + { + ERR("Failed to paint the off-screen surface.\n"); + goto Cleanup; + } +#endif } else { /* We directly draw to the DC */ TRACE("Performing on screen rendering.\n"); - - psurfOffScreen = NULL; - pdc = DC_LockDc(hDc); - if(!pdc) - { - ERR("Could not lock the destination DC.\n"); - SURFACE_ShareUnlockSurface(psurfMask); - if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); - return FALSE; - } - /* Calculate destination rectangle */ - RECTL_vSetRect(&rcDest, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); - IntLPtoDP(pdc, (LPPOINT)&rcDest, 2); - RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - - /* Prepare the underlying surface */ - DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); - - /* Get the clip object */ pdcClipObj = pdc->rosdc.CombinedClip; - - /* We now have our destination surface and rectangle */ - psurfDest = pdc->dclevel.pSurface; - - if(psurfDest == NULL) - { - /* Empty DC */ - DC_vFinishBlit(pdc, NULL); - DC_UnlockDc(pdc); - SURFACE_ShareUnlockSurface(psurfMask); - if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); - return FALSE; - } + // psurfOffScreen = NULL; } /* Now do the rendering */ @@ -1460,36 +1516,23 @@ } done: +#if 0 /* We're done. Was it a double buffered draw ? */ if(bOffScreen) { /* Yes. Draw it back to our DC */ POINTL ptSrc = {0, 0}; - pdc = DC_LockDc(hDc); - if(!pdc) - { - ERR("Could not lock the destination DC.\n"); - return FALSE; - } + /* Calculate destination rectangle */ RECTL_vSetRect(&rcDest, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); IntLPtoDP(pdc, (LPPOINT)&rcDest, 2); RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - /* Prepare the underlying surface */ - DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); - /* Get the clip object */ pdcClipObj = pdc->rosdc.CombinedClip; /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; - if(!psurfDest) - { - /* So, you did all of this for an empty DC. */ - DC_UnlockDc(pdc); - goto Cleanup2; - } /* Color translation */ EXLATEOBJ_vInitialize(&exlo, psurfOffScreen->ppal, psurfDest->ppal, 0x00FFFFFF, 0x00FFFFFF, 0); @@ -1509,18 +1552,20 @@ EXLATEOBJ_vCleanup(&exlo); } +#endif Cleanup: if(pdc) { DC_vFinishBlit(pdc, NULL); DC_UnlockDc(pdc); } - -Cleanup2: + +#if 0 /* Delete off screen rendering surface */ if(psurfOffScreen) GDIOBJ_vDeleteObject(&psurfOffScreen->BaseObject); - +#endif + /* Unlock other surfaces */ SURFACE_ShareUnlockSurface(psurfMask); if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); @@ -1554,7 +1599,7 @@ if (!(pIcon = UserGetCurIconObject(hIcon))) { - ERR("UserGetCurIconObject() failed!\n"); + ERR("UserGetCurIconObject(0x%08x) failed!\n", hIcon); UserLeave(); return FALSE; } Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sun Nov 4 12:56:44 2012 @@ -248,7 +248,7 @@ PCURICON_OBJECT CurIcon; DWORD_PTR Result ; - if (!(CurIcon = IntCreateCurIconHandle())) + if (!(CurIcon = IntCreateCurIconHandle((DWORD)Param))) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); RETURN(0); 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] Sun Nov 4 12:56:44 2012 @@ -11,7 +11,7 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(cursor); -//WINE_DECLARE_DEBUG_CHANNEL(icon); +WINE_DECLARE_DEBUG_CHANNEL(icon); //WINE_DECLARE_DEBUG_CHANNEL(resource); /************* USER32 INTERNAL FUNCTIONS **********/ @@ -54,6 +54,30 @@ } /************* IMPLEMENTATION HELPERS ******************/ + +static const WCHAR DISPLAYW[] = L"DISPLAY"; + +static void *map_fileW( LPCWSTR name, LPDWORD filesize ) +{ + HANDLE hFile, hMapping; + LPVOID ptr = NULL; + + hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0 ); + if (hFile != INVALID_HANDLE_VALUE) + { + hMapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); + if (hMapping) + { + ptr = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); + CloseHandle( hMapping ); + if (filesize) + *filesize = GetFileSize( hFile, NULL ); + } + CloseHandle( hFile ); + } + return ptr; +} static int get_dib_image_size( int width, int height, int depth ) { @@ -121,6 +145,32 @@ } } +static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *bpp, DWORD *compr ) +{ + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *bpp = core->bcBitCount; + *compr = 0; + return 0; + } + else if (header->biSize == sizeof(BITMAPINFOHEADER) || + header->biSize == sizeof(BITMAPV4HEADER) || + header->biSize == sizeof(BITMAPV5HEADER)) + { + *width = header->biWidth; + *height = header->biHeight; + *bpp = header->biBitCount; + *compr = header->biCompression; + return 1; + } + ERR("(%d): unknown/wrong size for header\n", header->biSize ); + return -1; +} + /************* IMPLEMENTATION CORE ****************/ static BOOL CURSORICON_GetIconInfoFromBMI( @@ -132,28 +182,35 @@ { UINT ubmiSize = bitmap_info_size(pbmi, DIB_RGB_COLORS); BOOL monochrome = is_dib_monochrome(pbmi); + LONG width, height; + WORD bpp; + DWORD compr; + int ibmpType; HDC hdc, hdcScreen; BITMAPINFO* pbmiCopy; HBITMAP hbmpOld = NULL; BOOL bResult = FALSE; const VOID *pvColor, *pvMask; - /* Check for invalid data */ - if ( (pbmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER) && - pbmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER)) || - pbmi->bmiHeader.biCompression != BI_RGB ) - { - WARN("Invalid resource bitmap header.\n"); - return FALSE; - } + ibmpType = DIB_GetBitmapInfo(&pbmi->bmiHeader, &width, &height, &bpp, &compr); + /* Invalid data */ + if(ibmpType < 0) + return FALSE; + + /* No compression for icons */ + if(compr != BI_RGB) + return FALSE; /* Fix the hotspot coords */ - if(cxDesired != pbmi->bmiHeader.biWidth) - pii->xHotspot = (pii->xHotspot * cxDesired) / pbmi->bmiHeader.biWidth; - if(cxDesired != (pbmi->bmiHeader.biHeight/2)) - pii->yHotspot = (pii->yHotspot * cyDesired * 2) / pbmi->bmiHeader.biHeight; - - hdcScreen = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + if(!pii->fIcon) + { + if(cxDesired != pbmi->bmiHeader.biWidth) + pii->xHotspot = (pii->xHotspot * cxDesired) / pbmi->bmiHeader.biWidth; + if(cxDesired != (pbmi->bmiHeader.biHeight/2)) + pii->yHotspot = (pii->yHotspot * cyDesired * 2) / pbmi->bmiHeader.biHeight; + } + + hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); if(!hdcScreen) return FALSE; hdc = CreateCompatibleDC(hdcScreen); @@ -167,8 +224,13 @@ if(!pbmiCopy) goto done; RtlCopyMemory(pbmiCopy, pbmi, ubmiSize); - pbmiCopy->bmiHeader.biHeight /= 2; - + + /* In an icon/cursor, the BITMAPINFO holds twice the height */ + if(pbmiCopy->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + ((BITMAPCOREHEADER*)&pbmiCopy->bmiHeader)->bcHeight /= 2; + else + pbmiCopy->bmiHeader.biHeight /= 2; + pvColor = (const char*)pbmi + ubmiSize; pvMask = (const char*)pvColor + get_dib_image_size(pbmi->bmiHeader.biWidth, pbmiCopy->bmiHeader.biHeight, pbmi->bmiHeader.biBitCount ); @@ -250,7 +312,7 @@ } static -HANDLE +HBITMAP BITMAP_LoadImageW( _In_opt_ HINSTANCE hinst, _In_ LPCWSTR lpszName, @@ -259,8 +321,400 @@ _In_ UINT fuLoad ) { - UNIMPLEMENTED; - return NULL; + const BITMAPINFO* pbmi; + BITMAPINFO* pbmiScaled = NULL; + BITMAPINFO* pbmiCopy = NULL; + const VOID* pvMapping; + DWORD dwOffset = 0; + HGLOBAL hgRsrc; + int iBMISize; + PVOID pvBits; + HDC hdcScreen = NULL; + HDC hdc = NULL; + HBITMAP hbmpRet, hbmpOld; + + /* Map the bitmap info */ + if(fuLoad & LR_LOADFROMFILE) + { + const BITMAPFILEHEADER* pbmfh; + + pvMapping = map_fileW(lpszName, NULL); + if(!pvMapping) + return NULL; + pbmfh = pvMapping; + if (pbmfh->bfType != 0x4d42 /* 'BM' */) + { + WARN("Invalid/unsupported bitmap format!\n"); + goto end; + } + pbmi = (const BITMAPINFO*)(pbmfh + 1); + + /* Get the image bits */ + if(pbmfh->bfOffBits) + dwOffset = pbmfh->bfOffBits - sizeof(BITMAPFILEHEADER); + } + else + { + HRSRC hrsrc; + + /* Caller wants an OEM bitmap */ + if(!hinst) + hinst = User32Instance; + hrsrc = FindResourceW(hinst, lpszName, (LPWSTR)RT_BITMAP); + if(!hrsrc) + return NULL; + hgRsrc = LoadResource(hinst, hrsrc); + if(!hgRsrc) + return NULL; + pbmi = LockResource(hgRsrc); + if(!pbmi) + return NULL; + } + + /* See if we must scale the bitmap */ + iBMISize = bitmap_info_size(pbmi, DIB_RGB_COLORS); + + /* Get a pointer to the image data */ + pvBits = (char*)pbmi + (dwOffset ? dwOffset : iBMISize); + + /* Create a copy of the info describing the bitmap in the file */ + pbmiCopy = HeapAlloc(GetProcessHeap(), 0, iBMISize); + if(!pbmiCopy) + goto end; + CopyMemory(pbmiCopy, pbmi, iBMISize); + + /* Fix it up, if needed */ + if(fuLoad & (LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS)) + { + WORD bpp, incr, numColors; + char* pbmiColors; + RGBTRIPLE* ptr; + COLORREF crWindow, cr3DShadow, cr3DFace, cr3DLight; + BYTE pixel = *((BYTE*)pvBits); + UINT i; + + if(pbmiCopy->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + bpp = ((BITMAPCOREHEADER*)&pbmiCopy->bmiHeader)->bcBitCount; + numColors = 1 << bpp; + /* BITMAPCOREINFO holds RGBTRIPLEs */ + incr = 3; + } + else + { + bpp = pbmiCopy->bmiHeader.biBitCount; + /* BITMAPINFOHEADER holds RGBQUADs */ + incr = 4; + numColors = pbmiCopy->bmiHeader.biClrUsed; + if(numColors > 256) numColors = 256; + if (!numColors && (bpp <= 8)) numColors = 1 << bpp; + } + + if(bpp > 8) + goto create_bitmap; + + pbmiColors = (char*)pbmiCopy + pbmiCopy->bmiHeader.biSize; + + /* Get the relevant colors */ + crWindow = GetSysColor(COLOR_WINDOW); + cr3DShadow = GetSysColor(COLOR_3DSHADOW); + cr3DFace = GetSysColor(COLOR_3DFACE); + cr3DLight = GetSysColor(COLOR_3DLIGHT); + + /* Fix the transparent palette entry */ + if(fuLoad & LR_LOADTRANSPARENT) + { + switch(bpp) + { + case 1: pixel >>= 7; break; + case 4: pixel >>= 4; break; + case 8: break; + default: + FIXME("Unhandled bit depth %d.\n", bpp); + goto create_bitmap; + } + + if(pixel >= numColors) + { + ERR("Wrong pixel passed in.\n"); + goto create_bitmap; + } + + /* If both flags are set, we must use COLOR_3DFACE */ + if(fuLoad & LR_LOADMAP3DCOLORS) crWindow = cr3DFace; + + /* Define the color */ + ptr = (RGBTRIPLE*)(pbmiColors + pixel*incr); + ptr->rgbtBlue = GetBValue(crWindow); + ptr->rgbtGreen = GetGValue(crWindow); + ptr->rgbtRed = GetRValue(crWindow); + goto create_bitmap; + } + + /* If we are here, then LR_LOADMAP3DCOLORS is set without LR_TRANSPARENT */ + for(i = 0; i<numColors; i++) + { + ptr = (RGBTRIPLE*)(pbmiColors + i*incr); + if((ptr->rgbtBlue == ptr->rgbtRed) && (ptr->rgbtBlue == ptr->rgbtGreen)) + { + if(ptr->rgbtBlue == 128) + { + ptr->rgbtBlue = GetBValue(cr3DShadow); + ptr->rgbtGreen = GetGValue(cr3DShadow); + ptr->rgbtRed = GetRValue(cr3DShadow); + } + if(ptr->rgbtBlue == 192) + { + ptr->rgbtBlue = GetBValue(cr3DFace); + ptr->rgbtGreen = GetGValue(cr3DFace); + ptr->rgbtRed = GetRValue(cr3DFace); + } + if(ptr->rgbtBlue == 223) + { + ptr->rgbtBlue = GetBValue(cr3DLight); + ptr->rgbtGreen = GetGValue(cr3DLight); + ptr->rgbtRed = GetRValue(cr3DLight); + } + } + } + } + +create_bitmap: + if(fuLoad & LR_CREATEDIBSECTION) + { + /* Allocate the BMI describing the new bitmap */ + pbmiScaled = HeapAlloc(GetProcessHeap(), 0, iBMISize); + if(!pbmiScaled) + goto end; + CopyMemory(pbmiScaled, pbmiCopy, iBMISize); + + /* Fix it up */ + if(pbmiScaled->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* pbmch = (BITMAPCOREHEADER*)&pbmiScaled->bmiHeader; + if(cxDesired == 0) + cxDesired = pbmch->bcWidth; + if(cyDesired == 0) + cyDesired == pbmch->bcHeight; + else if(pbmch->bcHeight < 0) + cyDesired = -cyDesired; + + pbmch->bcWidth = cxDesired; + pbmch->bcHeight = cyDesired; + } + else + { + if ((pbmi->bmiHeader.biHeight > 65535) || (pbmi->bmiHeader.biWidth > 65535)) { + WARN("Broken BITMAPINFO!\n"); + goto end; + } + + if(cxDesired == 0) + cxDesired = pbmi->bmiHeader.biWidth; + if(cyDesired == 0) + cyDesired = pbmi->bmiHeader.biHeight; + else if(pbmi->bmiHeader.biHeight < 0) + cyDesired = -cyDesired; + + pbmiScaled->bmiHeader.biWidth = cxDesired; + pbmiScaled->bmiHeader.biHeight = cyDesired; + /* No compression for DIB sections */ + if(fuLoad & LR_CREATEDIBSECTION) + pbmiScaled->bmiHeader.biCompression = BI_RGB; + } + } + + /* Top-down image */ + if(cyDesired < 0) cyDesired = -cyDesired; + + /* We need a device context */ + hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); + if(!hdcScreen) + goto end; + hdc = CreateCompatibleDC(hdcScreen); + if(!hdc) + goto end; + + /* Now create the bitmap */ + if(fuLoad & LR_CREATEDIBSECTION) + hbmpRet = CreateDIBSection(hdc, pbmiScaled, DIB_RGB_COLORS, NULL, 0, 0); + else + { + if(is_dib_monochrome(pbmiCopy) || (fuLoad & LR_MONOCHROME)) + hbmpRet = CreateBitmap(cxDesired, cyDesired, 1, 1, NULL); + else + hbmpRet = CreateCompatibleBitmap(hdcScreen, cxDesired, cyDesired); + } + + if(!hbmpRet) + goto end; + + hbmpOld = SelectObject(hdc, hbmpRet); + if(!hbmpOld) + goto end; + if(!StretchDIBits(hdc, 0, 0, cxDesired, cyDesired, + 0, 0, pbmi->bmiHeader.biWidth, pbmi->bmiHeader.biWidth, + pvBits, pbmiCopy, DIB_RGB_COLORS, SRCCOPY)) + { + ERR("StretchDIBits failed!.\n"); + SelectObject(hdc, hbmpOld); + DeleteObject(hbmpRet); + hbmpRet = NULL; + goto end; + } + + SelectObject(hdc, hbmpOld); + +end: + if(hdcScreen) + DeleteDC(hdcScreen); + if(hdc) + DeleteDC(hdc); + if(pbmiScaled) + HeapFree(GetProcessHeap(), 0, pbmiScaled); + if(pbmiCopy) + HeapFree(GetProcessHeap(), 0, pbmiCopy); + if (fuLoad & LR_LOADFROMFILE) + UnmapViewOfFile( pvMapping ); + else + FreeResource(hgRsrc); + + return hbmpRet; +} + +#include "pshpack1.h" + +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + +#include "poppack.h" + +static +HANDLE +CURSORICON_LoadFromFileW( + _In_ LPCWSTR lpszName, + _In_ int cxDesired, + _In_ int cyDesired, + _In_ UINT fuLoad, + _In_ BOOL bIcon +) +{ + CURSORICONDIR* fakeDir; + CURSORICONDIRENTRY* fakeEntry; + CURSORICONFILEDIRENTRY *entry; + CURSORICONFILEDIR *dir; + DWORD filesize = 0; + LPBYTE bits; + HANDLE hRet = NULL; + WORD i; + ICONINFO ii; + + TRACE("loading %s\n", debugstr_w( lpszName )); + + bits = map_fileW( lpszName, &filesize ); + if (!bits) + return NULL; + + /* Check for .ani. */ + if (memcmp( bits, "RIFF", 4 ) == 0) + { + UNIMPLEMENTED; + goto end; + } + + dir = (CURSORICONFILEDIR*) bits; + if ( filesize < sizeof(*dir) ) + goto end; + + if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) + goto end; + + /* + * Cute little hack: + * We allocate a buffer, fake it as if it was a pointer to a resource in a module, + * pass it to LookupIconIdFromDirectoryEx and get back the index we have to use + */ + fakeDir = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(CURSORICONDIR, idEntries[dir->idCount])); + if(!fakeDir) + goto end; + fakeDir->idReserved = 0; + fakeDir->idType = dir->idType; + fakeDir->idCount = dir->idCount; + for(i = 0; i<dir->idCount; i++) + { + fakeEntry = &fakeDir->idEntries[i]; + entry = &dir->idEntries[i]; + /* Take this as an occasion to perform a size check */ + if((entry->dwDIBOffset + entry->dwDIBSize) > filesize) + goto end; + /* File icon/cursors are not like resource ones */ + if(bIcon) + { + fakeEntry->ResInfo.icon.bWidth = entry->bWidth; + fakeEntry->ResInfo.icon.bHeight = entry->bHeight; + fakeEntry->ResInfo.icon.bColorCount = 0; + fakeEntry->ResInfo.icon.bReserved = 0; + } + else + { + fakeEntry->ResInfo.cursor.wWidth = entry->bWidth; + fakeEntry->ResInfo.cursor.wHeight = entry->bHeight; + } + /* Let's assume there's always one plane */ + fakeEntry->wPlanes = 1; + /* We must get the bitcount from the BITMAPINFOHEADER itself */ + fakeEntry->wBitCount = ((BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset))->biBitCount; + fakeEntry->dwBytesInRes = entry->dwDIBSize; + fakeEntry->wResId = i + 1; + } + + /* Now call LookupIconIdFromResourceEx */ + i = LookupIconIdFromDirectoryEx((PBYTE)fakeDir, bIcon, cxDesired, cyDesired, fuLoad & LR_MONOCHROME); + /* We don't need this anymore */ + HeapFree(GetProcessHeap(), 0, fakeDir); + if(i == 0) + { + WARN("Unable to get a fit entry index.\n"); + goto end; + } + + /* Get our entry */ + entry = &dir->idEntries[i-1]; + /* A bit of preparation */ + ii.xHotspot = entry->xHotspot; + ii.yHotspot = entry->yHotspot; + ii.fIcon = bIcon; + + /* Do the dance */ + if(!CURSORICON_GetIconInfoFromBMI(&ii, (BITMAPINFO*)&bits[entry->dwDIBOffset], cxDesired, cyDesired)) + goto end; + + /* Create the icon. NOTE: there's no LR_SHARED icons if they are created from file */ + hRet = CreateIconIndirect(&ii); + + /* Clean up */ + DeleteObject(ii.hbmMask); + DeleteObject(ii.hbmColor); + +end: + UnmapViewOfFile(bits); + return hRet; } static @@ -274,24 +728,79 @@ _In_ BOOL bIcon ) { - HRSRC hrsrc, hrsrc2; - HANDLE handle, hCurIcon; + HRSRC hrsrc; + HANDLE handle, hCurIcon = NULL; CURSORICONDIR* dir; WORD wResId; LPBYTE bits; ICONINFO ii; 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) { - UNIMPLEMENTED; - return NULL; + 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; + + TRACE("Checking for an LR_SHARED cursor/icon.\n"); + /* Prepare the resource name string */ + if(IS_INTRESOURCE(lpszName)) + { + ustrRsrc.Buffer = (LPWSTR)lpszName; + ustrRsrc.Length = 0; + ustrRsrc.MaximumLength = 0; + } + else + RtlInitUnicodeString(&ustrRsrc, lpszName); + + /* Prepare the module name string */ + ustrModule.Buffer = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + /* Get it */ + do + { + DWORD ret = GetModuleFileName(hinst, ustrModule.Buffer, size); + if(ret == 0) + { + HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); + return NULL; + } + if(ret < size) + { + ustrModule.Length = ret; + ustrModule.MaximumLength = size; + break; + } + size *= 2; + ustrModule.Buffer = HeapReAlloc(GetProcessHeap(), 0, ustrModule.Buffer, size*sizeof(WCHAR)); + } while(TRUE); + + /* Ask win32k */ + hCurIcon = NtUserFindExistingCursorIcon(&ustrModule, &ustrRsrc, cxDesired, cyDesired); + if(hCurIcon) + { + /* Woohoo, got it! */ + TRACE("MATCH!\n"); + HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); + return hCurIcon; + } + } + /* Find resource ID */ hrsrc = FindResourceW( hinst, @@ -300,57 +809,45 @@ /* We let FindResource, LoadResource, etc. call SetLastError */ if(!hrsrc) - return 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 LR_SHARED is set, we must check for the cache */ - hCurIcon = NtUserFindExistingCursorIcon(hinst, hrsrc, cxDesired, cyDesired); - if(hCurIcon) - return hCurIcon; + goto done; handle = LoadResource(hinst, hrsrc); if(!handle) - return NULL; + goto done; dir = LockResource(handle); - if(!dir) return NULL; - - /* For now, take the first entry */ - wResId = dir->idEntries[0].wResId; + if(!dir) + goto done; + + wResId = LookupIconIdFromDirectoryEx((PBYTE)dir, bIcon, cxDesired, cyDesired, fuLoad & LR_MONOCHROME); FreeResource(handle); /* Get the relevant resource pointer */ - hrsrc2 = FindResourceW( + hrsrc = FindResourceW( hinst, MAKEINTRESOURCEW(wResId), (LPWSTR)(bIcon ? RT_ICON : RT_CURSOR)); - if(!hrsrc2) - return NULL; - - handle = LoadResource(hinst, hrsrc2); + if(!hrsrc) + goto done; + + handle = LoadResource(hinst, hrsrc); if(!handle) - return NULL; + goto done; bits = LockResource(handle); if(!bits) { FreeResource(handle); - return NULL; - } - - /* Get the hospot */ + goto done; + } + + /* Get the hotspot */ if(bIcon) { ii.xHotspot = cxDesired/2; ii.yHotspot = cyDesired/2; } - else + if(!bIcon) { SHORT* ptr = (SHORT*)bits; ii.xHotspot = ptr[0]; @@ -369,16 +866,20 @@ FreeResource( handle ); if(!bStatus) - return NULL; + goto done; /* Create the handle */ hCurIcon = NtUserxCreateEmptyCurObject(bIcon ? 0 : 1); if(!hCurIcon) - return NULL; + { + DeleteObject(ii.hbmMask); + if(ii.hbmColor) DeleteObject(ii.hbmColor); + goto done; + } /* Tell win32k */ if(fuLoad & LR_SHARED) - bStatus = NtUserSetCursorIconData(hCurIcon, hinst, hrsrc, &ii); + bStatus = NtUserSetCursorIconData(hCurIcon, &ustrModule, &ustrRsrc, &ii); else bStatus = NtUserSetCursorIconData(hCurIcon, NULL, NULL, &ii); @@ -389,9 +890,332 @@ } DeleteObject(ii.hbmMask); - DeleteObject(ii.hbmColor); - + if(ii.hbmColor) DeleteObject(ii.hbmColor); + +done: + if(ustrModule.Buffer) + HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); return hCurIcon; +} + +static +HBITMAP +BITMAP_CopyImage( + _In_ HBITMAP hbmp, + _In_ int cxDesired, + _In_ int cyDesired, + _In_ UINT fuFlags +) +{ + HBITMAP res = NULL; + DIBSECTION ds; + int objSize; + BITMAPINFO * bi; + + objSize = GetObjectW( hbmp, sizeof(ds), &ds ); + if (!objSize) return 0; + if ((cxDesired < 0) || (cyDesired < 0)) return 0; + + if (fuFlags & LR_COPYFROMRESOURCE) + { + FIXME("The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); + } + + if (fuFlags & LR_COPYRETURNORG) + { + FIXME("The flag LR_COPYRETURNORG is not implemented for bitmaps\n"); + } + + if (cxDesired == 0) cxDesired = ds.dsBm.bmWidth; + if (cyDesired == 0) cyDesired = ds.dsBm.bmHeight; + + /* Allocate memory for a BITMAPINFOHEADER structure and a + color table. The maximum number of colors in a color table + is 256 which corresponds to a bitmap with depth 8. + Bitmaps with higher depths don't have color tables. */ + bi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!bi) return 0; + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biPlanes = ds.dsBm.bmPlanes; + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + bi->bmiHeader.biCompression = BI_RGB; + + if (fuFlags & LR_CREATEDIBSECTION) + { + /* Create a DIB section. LR_MONOCHROME is ignored */ + void * bits; + HDC dc = CreateCompatibleDC(NULL); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB. + Get its attributes to create an exact copy */ + memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); + } + + /* Get the color table or the color masks */ + GetDIBits(dc, hbmp, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + + bi->bmiHeader.biWidth = cxDesired; + bi->bmiHeader.biHeight = cyDesired; + bi->bmiHeader.biSizeImage = 0; + + res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + DeleteDC(dc); + } + else + { + /* Create a device-dependent bitmap */ + + BOOL monochrome = (fuFlags & LR_MONOCHROME); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB section. + Get its attributes */ + HDC dc = CreateCompatibleDC(NULL); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + GetDIBits(dc, hbmp, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + DeleteDC(dc); + + if (!monochrome && ds.dsBm.bmBitsPixel == 1) + { + /* Look if the colors of the DIB are black and white */ + + monochrome = + (bi->bmiColors[0].rgbRed == 0xff + && bi->bmiColors[0].rgbGreen == 0xff + && bi->bmiColors[0].rgbBlue == 0xff + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0 + && bi->bmiColors[1].rgbGreen == 0 + && bi->bmiColors[1].rgbBlue == 0 + && bi->bmiColors[1].rgbReserved == 0) + || + (bi->bmiColors[0].rgbRed == 0 + && bi->bmiColors[0].rgbGreen == 0 + && bi->bmiColors[0].rgbBlue == 0 + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0xff + && bi->bmiColors[1].rgbGreen == 0xff + && bi->bmiColors[1].rgbBlue == 0xff + && bi->bmiColors[1].rgbReserved == 0); + } + } + else if (!monochrome) + { + monochrome = ds.dsBm.bmBitsPixel == 1; + } + + if (monochrome) + { + res = CreateBitmap(cxDesired, cyDesired, 1, 1, NULL); + } + else + { + HDC screenDC = GetDC(NULL); + res = CreateCompatibleBitmap(screenDC, cxDesired, cyDesired); + ReleaseDC(NULL, screenDC); + } + } + + if (res) + { + /* Only copy the bitmap if it's a DIB section or if it's + compatible to the screen */ + BOOL copyContents; + + if (objSize == sizeof(DIBSECTION)) + { + copyContents = TRUE; + } + else + { + HDC screenDC = GetDC(NULL); + int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); + ReleaseDC(NULL, screenDC); + + copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); + } + + if (copyContents) + { + /* The source bitmap may already be selected in a device context, + use GetDIBits/StretchDIBits and not StretchBlt */ + + HDC dc; + void * bits; + + dc = CreateCompatibleDC(NULL); + + bi->bmiHeader.biWidth = ds.dsBm.bmWidth; + bi->bmiHeader.biHeight = ds.dsBm.bmHeight; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biClrUsed = 0; + bi->bmiHeader.biClrImportant = 0; + + /* Fill in biSizeImage */ + GetDIBits(dc, hbmp, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); + + if (bits) + { + HBITMAP oldBmp; + + /* Get the image bits of the source bitmap */ + GetDIBits(dc, hbmp, 0, ds.dsBm.bmHeight, bits, bi, DIB_RGB_COLORS); + + /* Copy it to the destination bitmap */ + oldBmp = SelectObject(dc, res); + StretchDIBits(dc, 0, 0, cxDesired, cyDesired, + 0, 0, ds.dsBm.bmWidth, ds.dsBm.bmHeight, + bits, bi, DIB_RGB_COLORS, SRCCOPY); + SelectObject(dc, oldBmp); + + HeapFree(GetProcessHeap(), 0, bits); + } + + DeleteDC(dc); + } + + if (fuFlags & LR_COPYDELETEORG) + { + DeleteObject(hbmp); + } + } + HeapFree(GetProcessHeap(), 0, bi); + return res; +} + +static +HICON +CURSORICON_CopyImage( + _In_ HICON hicon, + _In_ BOOL bIcon, + _In_ int cxDesired, + _In_ int cyDesired, + _In_ UINT fuFlags +) +{ + HICON ret = NULL; + ICONINFO ii; + + if(fuFlags & LR_COPYFROMRESOURCE) + { + /* Get the icon module/resource names */ + UNICODE_STRING ustrModule; + UNICODE_STRING ustrRsrc; + PVOID pvBuf; + HMODULE hModule; + + ustrModule.MaximumLength = MAX_PATH; + ustrRsrc.MaximumLength = 256; + + ustrModule.Buffer = HeapAlloc(GetProcessHeap(), 0, ustrModule.MaximumLength * sizeof(WCHAR)); + if(!ustrModule.Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + /* Keep track of the buffer for the resource, NtUserGetIconInfo might overwrite it */ + pvBuf = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WCHAR)); + if(!pvBuf) + { + HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + ustrRsrc.Buffer = pvBuf; + + do + { + if(!NtUserGetIconInfo(hicon, NULL, &ustrModule, &ustrRsrc, NULL, FALSE)) + { + HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); + HeapFree(GetProcessHeap(), 0, pvBuf); + return NULL; + } + + if((ustrModule.Length < ustrModule.MaximumLength) && (ustrRsrc.Length < ustrRsrc.MaximumLength)) + { + /* Buffers were big enough */ + break; + } + + /* Find which buffer were too small */ + if(ustrModule.Length == ustrModule.MaximumLength) + { + PWSTR newBuffer; + ustrModule.MaximumLength *= 2; + newBuffer = HeapReAlloc(GetProcessHeap(), 0, ustrModule.Buffer, ustrModule.MaximumLength * sizeof(WCHAR)); + if(!ustrModule.Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto leave; + } + ustrModule.Buffer = newBuffer; + } + + if(ustrRsrc.Length == ustrRsrc.MaximumLength) + { + ustrRsrc.MaximumLength *= 2; + pvBuf = HeapReAlloc(GetProcessHeap(), 0, ustrRsrc.Buffer, ustrRsrc.MaximumLength * sizeof(WCHAR)); + if(!pvBuf) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto leave; + } + ustrRsrc.Buffer = pvBuf; + } + } while(TRUE); + + /* NULL-terminate our strings */ + ustrModule.Buffer[ustrModule.Length] = 0; + if(!IS_INTRESOURCE(ustrRsrc.Buffer)) + ustrRsrc.Buffer[ustrRsrc.Length] = 0; + + /* Get the module handle */ + if(!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) + { + /* This hould never happen */ + SetLastError(ERROR_INVALID_PARAMETER); + goto leave; + } + + /* Call the relevant function */ + ret = CURSORICON_LoadImageW(hModule, ustrRsrc.Buffer, cxDesired, cyDesired, bIcon, fuFlags & LR_DEFAULTSIZE); + + FreeLibrary(hModule); + + /* If we're here, that means that the passed icon is shared. Don't destroy it, even if LR_COPYDELETEORG is specified */ + leave: + HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); + HeapFree(GetProcessHeap(), 0, pvBuf); + + return ret; + } + + /* This is a regular copy */ + if(fuFlags & ~LR_COPYDELETEORG) + FIXME("Unimplemented flags: 0x%08x\n", fuFlags); + + if(!GetIconInfo(hicon, &ii)) + { + ERR("GetIconInfo failed.\n"); + return NULL; + } + + ret = CreateIconIndirect(&ii); + + DeleteObject(ii.hbmMask); + if(ii.hbmColor) DeleteObject(ii.hbmColor); + + if(ret && (fuFlags & LR_COPYDELETEORG)) + DestroyIcon(hicon); + + return hicon; } /************* PUBLIC FUNCTIONS *******************/ @@ -404,7 +1228,19 @@ _In_ UINT fuFlags ) { - UNIMPLEMENTED; + TRACE("hImage=%p, uType=%u, cxDesired=%d, cyDesired=%d, fuFlags=%x\n", + hImage, uType, cxDesired, cyDesired, fuFlags); + switch(uType) + { + case IMAGE_BITMAP: + return BITMAP_CopyImage(hImage, cxDesired, cyDesired, fuFlags); + case IMAGE_CURSOR: + case IMAGE_ICON: + return CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags); + default: + SetLastError(ERROR_INVALID_PARAMETER); + break; + } return NULL; } @@ -438,8 +1274,9 @@ _In_ UINT diFlags ) { - UNIMPLEMENTED; - return FALSE; + return NtUserDrawIconEx(hdc, xLeft, yTop, hIcon, cxWidth, cyWidth, + istepIfAniCur, hbrFlickerFreeDraw, diFlags, + 0, 0); } BOOL WINAPI GetIconInfo( @@ -447,16 +1284,14 @@ _Out_ PICONINFO piconinfo ) { - UNIMPLEMENTED; - return FALSE; + return NtUserGetIconInfo(hIcon, piconinfo, NULL, NULL, NULL, FALSE); } BOOL WINAPI DestroyIcon( _In_ HICON hIcon ) { - UNIMPLEMENTED; - return FALSE; + return NtUserDestroyCursor(hIcon, FALSE); } HICON WINAPI LoadIconA( @@ -631,8 +1466,9 @@ _In_ BOOL fIcon ) { - UNIMPLEMENTED; - return 0; + return LookupIconIdFromDirectoryEx( presbits, fIcon, + fIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR), + fIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), fIcon ? 0 : LR_MONOCHROME ); } int WINAPI LookupIconIdFromDirectoryEx( @@ -643,8 +1479,134 @@ _In_ UINT Flags ) { - UNIMPLEMENTED; - return 0; + WORD bppDesired; + CURSORICONDIR* dir = (CURSORICONDIR*)presbits; + CURSORICONDIRENTRY* entry; + int i, numMatch, iIndex = -1; + WORD width, height; + USHORT bitcount; + ULONG cxyDiff, cxyDiffTmp; + + TRACE("%p, %x, %i, %i, %x.\n", presbits, fIcon, cxDesired, cyDesired, Flags); + + if(!(dir && !dir->idReserved && (dir->idType & 3))) + { + WARN("Invalid resource.\n"); + return 0; + } + + /* idType == 2 is for cursors, 1 for icons */ + /*if(fIcon) + { + if(dir->idType == 2) + { + WARN("An icon was asked for a cursor resource.\n"); + return 0; + } + } + else if(dir->idType == 1) + { + WARN("A cursor was asked for an icon resource.\n"); + return 0; + }*/ + + if(Flags & LR_MONOCHROME) + bppDesired = 1; + else + { + HDC icScreen; + icScreen = CreateICW(DISPLAYW, NULL, NULL, NULL); + if(!icScreen) + return FALSE; + + bppDesired = GetDeviceCaps(icScreen, BITSPIXEL); + DeleteDC(icScreen); + } + + /* Find the best match for the desired size */ + cxyDiff = 0xFFFFFFFF; + numMatch = 0; + for(i = 0; i < dir->idCount; i++) + { + entry = &dir->idEntries[i]; + width = fIcon ? entry->ResInfo.icon.bWidth : entry->ResInfo.cursor.wWidth; + /* Height is twice as big in cursor resources */ + height = fIcon ? entry->ResInfo.icon.bHeight : entry->ResInfo.cursor.wHeight/2; + /* 0 represents 256 */ + if(!width) width = 256; + if(!height) height = 256; + /* Let it be a 1-norm */ + cxyDiffTmp = max(abs(width - cxDesired), abs(height - cyDesired)); + if( cxyDiffTmp > cxyDiff) + continue; + if( cxyDiffTmp == cxyDiff) + { + numMatch++; + continue; + } + iIndex = i; + numMatch = 1; + cxyDiff = cxyDiffTmp; + } + + if(numMatch == 1) + { + /* Only one entry fit the asked dimensions */ + return dir->idEntries[iIndex].wResId; + } + + bitcount = 0; + iIndex = -1; + /* Now find the entry with the best depth */ + for(i = 0; i < dir->idCount; i++) + { + entry = &dir->idEntries[i]; + width = fIcon ? entry->ResInfo.icon.bWidth : entry->ResInfo.cursor.wWidth; + height = fIcon ? entry->ResInfo.icon.bHeight : entry->ResInfo.cursor.wHeight/2; + /* 0 represents 256 */ + if(!width) width = 256; + if(!height) height = 256; + /* Check if this is the best match we had */ + cxyDiffTmp = max(abs(width - cxDesired), abs(height - cyDesired)); + if(cxyDiffTmp != cxyDiff) + continue; + /* Exact match? */ + if(entry->wBitCount == bppDesired) + return entry->wResId; + /* We take the highest possible but smaller than the display depth */ + if((entry->wBitCount > bitcount) && (entry->wBitCount < bppDesired)) + { + iIndex = i; + bitcount = entry->wBitCount; + } + } + + if(iIndex >= 0) + return dir->idEntries[iIndex].wResId; + + /* No inferior or equal depth available. Get the smallest one */ + bitcount = 0x7FFF; + for(i = 0; i < dir->idCount; i++) + { + entry = &dir->idEntries[i]; + width = fIcon ? entry->ResInfo.icon.bWidth : entry->ResInfo.cursor.wWidth; + height = fIcon ? entry->ResInfo.icon.bHeight : entry->ResInfo.cursor.wHeight/2; + /* 0 represents 256 */ + if(!width) width = 256; + if(!height) height = 256; + /* Check if this is the best match we had */ + cxyDiffTmp = max(abs(width - cxDesired), abs(height - cyDesired)); + if(cxyDiffTmp != cxyDiff) + continue; + /* Check the bit depth */ + if(entry->wBitCount < bitcount) + { + iIndex = i; + bitcount = entry->wBitCount; + } + } + + return dir->idEntries[iIndex].wResId; } HICON WINAPI CreateIcon( @@ -657,8 +1619,32 @@ _In_ const BYTE *lpbXORbits ) { - UNIMPLEMENTED; - return NULL; + ICONINFO iinfo; + HICON hIcon; + + TRACE_(icon)("%dx%d, planes %d, bpp %d, xor %p, and %p\n", + nWidth, nHeight, cPlanes, cBitsPixel, lpbXORbits, lpbANDbits); + + iinfo.fIcon = TRUE; + iinfo.xHotspot = nWidth / 2; + iinfo.yHotspot = nHeight / 2; + if (cPlanes * cBitsPixel > 1) + { + iinfo.hbmColor = CreateBitmap( nWidth, nHeight, cPlanes, cBitsPixel, lpbXORbits ); + iinfo.hbmMask = CreateBitmap( nWidth, nHeight, 1, 1, lpbANDbits ); + } + else + { + iinfo.hbmMask = CreateBitmap( nWidth, nHeight * 2, 1, 1, lpbANDbits ); + iinfo.hbmColor = NULL; + } + + hIcon = CreateIconIndirect( &iinfo ); + + DeleteObject( iinfo.hbmMask ); + if (iinfo.hbmColor) DeleteObject( iinfo.hbmColor ); + + return hIcon; } HICON WINAPI CreateIconFromResource( @@ -681,16 +1667,60 @@ _In_ UINT uFlags ) { - UNIMPLEMENTED; - return NULL; + ICONINFO ii; + HICON hIcon; + + if(uFlags) + FIXME("uFlags 0x%08x ignored.\n", uFlags); + + if(fIcon) + { + ii.xHotspot = cxDesired/2; + ii.yHotspot = cyDesired/2; + } + else + { + WORD* pt = (WORD*)pbIconBits; + ii.xHotspot = *pt++; + ii.yHotspot = *pt++; + pbIconBits = (PBYTE)pt; + } + ii.fIcon = fIcon; + + if(!CURSORICON_GetIconInfoFromBMI(&ii, (BITMAPINFO*)pbIconBits, cxDesired, cyDesired)) + return NULL; + + hIcon = CreateIconIndirect(&ii); + + /* Clean up */ + DeleteObject(ii.hbmMask); + if(ii.hbmColor) DeleteObject(ii.hbmColor); + + return hIcon; } HICON WINAPI CreateIconIndirect( _In_ PICONINFO piconinfo ) { - UNIMPLEMENTED; - return NULL; + /* As simple as creating a handle, and let win32k deal with the bitmaps */ + HICON hiconRet; + + TRACE("%p.\n", piconinfo); + + hiconRet = NtUserxCreateEmptyCurObject(piconinfo->fIcon ? 0 : 1); + if(!hiconRet) + return NULL; + + if(!NtUserSetCursorIconData(hiconRet, NULL, NULL, piconinfo)) + { + NtUserDestroyCursor(hiconRet, FALSE); + hiconRet = NULL; + } + + TRACE("Returning 0x%08x.\n", hiconRet); + + return hiconRet; } HCURSOR WINAPI CreateCursor( @@ -703,8 +1733,21 @@ _In_ const VOID *pvXORPlane ) { - UNIMPLEMENTED; - return NULL; + ICONINFO info; + HCURSOR hCursor; + + TRACE_(cursor)("%dx%d spot=%d,%d xor=%p and=%p\n", + nWidth, nHeight, xHotSpot, yHotSpot, pvXORPlane, pvANDPlane); + + info.fIcon = FALSE; + info.xHotspot = xHotSpot; + info.yHotspot = yHotSpot; + info.hbmMask = CreateBitmap( nWidth, nHeight, 1, 1, pvANDPlane ); + info.hbmColor = CreateBitmap( nWidth, nHeight, 1, 1, pvXORPlane ); + hCursor = CreateIconIndirect( &info ); + DeleteObject( info.hbmMask ); + DeleteObject( info.hbmColor ); + return hCursor; } BOOL WINAPI SetSystemCursor( @@ -729,8 +1772,7 @@ _Out_ LPPOINT lpPoint ) { - UNIMPLEMENTED; - return FALSE; + return NtUserxGetCursorPos(lpPoint); } int WINAPI ShowCursor( @@ -751,6 +1793,5 @@ _In_ HCURSOR hCursor ) { - UNIMPLEMENTED; - return FALSE; -} + return NtUserDestroyCursor(hCursor, FALSE); +}

1 0

[gadamopoulos] 57671: [explorer] - Implement calling IShellView_TranslateAccelerator - Fixes accelerators like Ctrl+c , Ctrl+v, etc in windows
by gadamopoulos＠svn.reactos.org 03 Nov '12

03 Nov '12

Author: gadamopoulos Date: Sat Nov 3 21:00:10 2012 New Revision: 57671 URL: http://svn.reactos.org/svn/reactos?rev=57671&view=rev Log: [explorer] - Implement calling IShellView_TranslateAccelerator - Fixes accelerators like Ctrl+c , Ctrl+v, etc in windows Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/desktop/desktop.h trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp trunk/reactos/base/shell/explorer/shell/shellbrowser.h trunk/reactos/base/shell/explorer/utility/window.cpp trunk/reactos/base/shell/explorer/utility/window.h Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sat Nov 3 21:00:10 2012 @@ -479,6 +479,26 @@ SendMessage(g_Globals._hwndShellView, nmsg, wparam, lparam); break; + case PM_TRANSLATE_MSG: + { + /* TranslateAccelerator is called for all explorer windows that are open + so we have to decide if this is the correct recipient */ + LPMSG lpmsg = (LPMSG)lparam; + HWND hwnd = lpmsg->hwnd; + + while(hwnd) + { + if(hwnd == _hwnd) + break; + + hwnd = GetParent(hwnd); + } + + if (hwnd) + return _pShellView->TranslateAccelerator(lpmsg) == S_OK; + return false; + } + default: def: return super::WndProc(nmsg, wparam, lparam); } Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] Sat Nov 3 21:00:10 2012 @@ -48,9 +48,9 @@ /// Implementation of the Explorer desktop window -struct DesktopWindow : public Window, public IShellBrowserImpl +struct DesktopWindow : public PreTranslateWindow, public IShellBrowserImpl { - typedef Window super; + typedef PreTranslateWindow super; DesktopWindow(HWND hwnd); ~DesktopWindow(); Modified: trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] Sat Nov 3 21:00:10 2012 @@ -599,6 +599,27 @@ return false; } +bool ShellBrowser::TranslateAccelerator(LPMSG lpmsg) +{ + HWND hwnd; + + /* TranslateAccelerator is called for all explorer windows that are open + so we have to decide if this is the correct recipient */ + hwnd = lpmsg->hwnd; + + while(hwnd) + { + if(hwnd == _hwnd) + break; + + hwnd = GetParent(hwnd); + } + + if (hwnd) + return _pShellView->TranslateAccelerator(lpmsg) == S_OK; + + return false; +} bool ShellBrowser::select_folder(Entry* entry, bool expand) { @@ -707,6 +728,9 @@ SendMessage(_right_hwnd, WM_SYSCOLORCHANGE, 0, 0); break; + case PM_TRANSLATE_MSG: + return _shellBrowser->TranslateAccelerator((MSG*)lparam); + default: return super::WndProc(nmsg, wparam, lparam); } Modified: trunk/reactos/base/shell/explorer/shell/shellbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellbrowser.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellbrowser.h [iso-8859-1] Sat Nov 3 21:00:10 2012 @@ -141,6 +141,8 @@ void invalidate_cache(); + bool TranslateAccelerator(LPMSG lpmsg); + protected: HWND _hwnd; HWND _hwndFrame; Modified: trunk/reactos/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] Sat Nov 3 21:00:10 2012 @@ -591,6 +591,14 @@ BOOL Window::pretranslate_msg(LPMSG pmsg) { + if ((pmsg->message != WM_KEYDOWN) && + (pmsg->message != WM_SYSKEYDOWN) && + (pmsg->message != WM_SYSCHAR) && + (pmsg->message != WM_CHAR)) + { + return FALSE; + } + for(WindowSet::const_iterator it=Window::s_pretranslate_windows.begin(); it!=s_pretranslate_windows.end(); ++it) if (SendMessage(*it, PM_TRANSLATE_MSG, 0, (LPARAM)pmsg)) return TRUE; Modified: trunk/reactos/base/shell/explorer/utility/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/window.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/window.h [iso-8859-1] Sat Nov 3 21:00:10 2012 @@ -283,12 +283,27 @@ /** + PreTranslateWindow is used to register windows to be called by Window::pretranslate_msg(). + This way you get PM_TRANSLATE_MSG messages before the message loop dispatches messages. + You can then for example use TranslateAccelerator() to implement key shortcuts. + */ +struct PreTranslateWindow : public Window +{ + typedef Window super; + + PreTranslateWindow(HWND); + ~PreTranslateWindow(); +}; + + + + /** Class ChildWindow represents MDI child windows. It is used with class MainFrame. */ -struct ChildWindow : public Window -{ - typedef Window super; +struct ChildWindow : public PreTranslateWindow +{ + typedef PreTranslateWindow super; ChildWindow(HWND hwnd, const ChildWndInfo& info); @@ -323,20 +338,6 @@ }; #define PM_SETSTATUSTEXT (WM_APP+0x1E) - - - /** - PreTranslateWindow is used to register windows to be called by Window::pretranslate_msg(). - This way you get PM_TRANSLATE_MSG messages before the message loop dispatches messages. - You can then for example use TranslateAccelerator() to implement key shortcuts. - */ -struct PreTranslateWindow : public Window -{ - typedef Window super; - - PreTranslateWindow(HWND); - ~PreTranslateWindow(); -}; /**

1 0

[ekohl] 57670: [ADVAPI32] Remove ADVAPI_GetComputerSid because it is not used any more.
by ekohl＠svn.reactos.org 03 Nov '12

03 Nov '12

Author: ekohl Date: Sat Nov 3 12:13:32 2012 New Revision: 57670 URL: http://svn.reactos.org/svn/reactos?rev=57670&view=rev Log: [ADVAPI32] Remove ADVAPI_GetComputerSid because it is not used any more. Modified: trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Sat Nov 3 12:13:32 2012 @@ -56,10 +56,6 @@ #ifndef HAS_FN_PROGRESSA #define FN_PROGRESSA FN_PROGRESS #endif - -/* sid.c */ - -BOOL ADVAPI_GetComputerSid(PSID sid); /* rpc.c */ Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sat Nov 3 12:13:32 2012 @@ -299,67 +299,6 @@ return !status; } -/************************************************************ - * ADVAPI_GetComputerSid - * - * Reads the computer SID from the registry. - */ -BOOL ADVAPI_GetComputerSid(PSID sid) -{ - HKEY key; - LONG ret; - BOOL retval = FALSE; - static const WCHAR Account[] = { 'S','E','C','U','R','I','T','Y','\\','S','A','M','\\','D','o','m','a','i','n','s','\\','A','c','c','o','u','n','t',0 }; - static const WCHAR V[] = { 'V',0 }; - - if ((ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Account, 0, - KEY_READ, &key)) == ERROR_SUCCESS) - { - DWORD size = 0; - ret = RegQueryValueExW(key, V, NULL, NULL, NULL, &size); - if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) - { - BYTE * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) - { - if ((ret = RegQueryValueExW(key, V, NULL, NULL, - data, &size)) == ERROR_SUCCESS) - { - /* the SID is in the last 24 bytes of the binary data */ - CopyMemory(sid, &data[size-24], 24); - retval = TRUE; - } - HeapFree(GetProcessHeap(), 0, data); - } - } - RegCloseKey(key); - } - - if(retval == TRUE) return retval; - - /* create a new random SID */ - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, Account, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL) == ERROR_SUCCESS) - { - PSID new_sid; - SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; - DWORD id[3]; - - if (RtlGenRandom(id, sizeof(id))) - { - if (AllocateAndInitializeSid(&identifierAuthority, 4, SECURITY_NT_NON_UNIQUE, id[0], id[1], id[2], 0, 0, 0, 0, &new_sid)) - { - if (RegSetValueExW(key, V, 0, REG_BINARY, new_sid, GetLengthSid(new_sid)) == ERROR_SUCCESS) - retval = CopySid(GetLengthSid(new_sid), sid, new_sid); - - FreeSid(new_sid); - } - } - RegCloseKey(key); - } - - return retval; -} /* Exported functions */

1 0

[ekohl] 57669: [ADVAPI32] Fix indentation and coding style. No code changes!
by ekohl＠svn.reactos.org 02 Nov '12

02 Nov '12

Author: ekohl Date: Fri Nov 2 19:29:48 2012 New Revision: 57669 URL: http://svn.reactos.org/svn/reactos?rev=57669&view=rev Log: [ADVAPI32] Fix indentation and coding style. No code changes! Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Fri Nov 2 19:29:48 2012 @@ -18,17 +18,17 @@ BOOL WINAPI AddAuditAccessAceEx(PACL pAcl, - DWORD dwAceRevision, - DWORD AceFlags, - DWORD dwAccessMask, - PSID pSid, - BOOL bAuditSuccess, - BOOL bAuditFailure); + DWORD dwAceRevision, + DWORD AceFlags, + DWORD dwAccessMask, + PSID pSid, + BOOL bAuditSuccess, + BOOL bAuditFailure); typedef struct RECORD { - LPCWSTR key; - DWORD value; + LPCWSTR key; + DWORD value; } RECORD; @@ -794,6 +794,7 @@ { LPWSTR wstr; ULONG len; + if (ConvertSecurityDescriptorToStringSecurityDescriptorW(SecurityDescriptor, SDRevision, Information, &wstr, &len)) { int lenA; @@ -971,15 +972,15 @@ while (*szAcl != '(') { if (*szAcl == 'P') - { + { flags |= SE_DACL_PROTECTED; - } + } else if (*szAcl == 'A') { szAcl++; if (*szAcl == 'R') flags |= SE_DACL_AUTO_INHERIT_REQ; - else if (*szAcl == 'I') + else if (*szAcl == 'I') flags |= SE_DACL_AUTO_INHERITED; } szAcl++; @@ -1059,7 +1060,7 @@ if (!lpaf->wstr) return 0; - flags |= lpaf->value; + flags |= lpaf->value; szAcl += len; } @@ -1081,15 +1082,15 @@ { LPCWSTR p = szAcl; - while (*p && *p != ';') + while (*p && *p != ';') p++; - if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) - { - rights = strtoulW(szAcl, NULL, 16); - szAcl = p; - } - else + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + rights = strtoulW(szAcl, NULL, 16); + szAcl = p; + } + else WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); } else @@ -1099,16 +1100,16 @@ const ACEFLAG *lpaf = AceRights; while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - { - lpaf++; - } + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + { + lpaf++; + } if (!lpaf->wstr) return 0; - rights |= lpaf->value; + rights |= lpaf->value; szAcl += len; } } @@ -1123,8 +1124,11 @@ * * dacl_flags(string_ace1)(string_ace2)... (string_acen) */ -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes) +static BOOL +ParseStringAclToAcl(LPCWSTR StringAcl, + LPDWORD lpdwFlags, + PACL pAcl, + LPDWORD cBytes) { DWORD val; DWORD sidlen; @@ -1136,7 +1140,7 @@ TRACE("%s\n", debugstr_w(StringAcl)); if (!StringAcl) - return FALSE; + return FALSE; if (pAcl) /* pAce is only useful if we're setting values */ pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); @@ -1151,23 +1155,23 @@ /* Parse ACE type */ val = ParseAceStringType(&StringAcl); - if (pAce) + if (pAce) pAce->Header.AceType = (BYTE) val; if (*StringAcl != ';') goto lerr; StringAcl++; /* Parse ACE flags */ - val = ParseAceStringFlags(&StringAcl); - if (pAce) + val = ParseAceStringFlags(&StringAcl); + if (pAce) pAce->Header.AceFlags = (BYTE) val; if (*StringAcl != ';') goto lerr; StringAcl++; /* Parse ACE rights */ - val = ParseAceStringRights(&StringAcl); - if (pAce) + val = ParseAceStringRights(&StringAcl); + if (pAce) pAce->Mask = val; if (*StringAcl != ';') goto lerr; @@ -1191,10 +1195,10 @@ /* Parse ACE account sid */ if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) - { + { while (*StringAcl && *StringAcl != ')') StringAcl++; - } + } if (*StringAcl != ')') goto lerr; @@ -1238,10 +1242,10 @@ /****************************************************************************** * ParseStringSecurityDescriptorToSecurityDescriptor */ -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes) +static BOOL +ParseStringSecurityDescriptorToSecurityDescriptor(LPCWSTR StringSecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, + LPDWORD cBytes) { BOOL bret = FALSE; WCHAR toktype; @@ -1259,21 +1263,21 @@ { toktype = *StringSecurityDescriptor; - /* Expect char identifier followed by ':' */ - StringSecurityDescriptor++; + /* Expect char identifier followed by ':' */ + StringSecurityDescriptor++; if (*StringSecurityDescriptor != ':') { SetLastError(ERROR_INVALID_PARAMETER); goto lend; } - StringSecurityDescriptor++; - - /* Extract token */ - lptoken = StringSecurityDescriptor; - while (*lptoken && *lptoken != ':') + StringSecurityDescriptor++; + + /* Extract token */ + lptoken = StringSecurityDescriptor; + while (*lptoken && *lptoken != ':') lptoken++; - if (*lptoken) + if (*lptoken) lptoken--; len = lptoken - StringSecurityDescriptor; @@ -1281,7 +1285,7 @@ tok[len] = 0; switch (toktype) - { + { case 'O': { DWORD bytes; @@ -1295,7 +1299,7 @@ lpNext += bytes; /* Advance to next token */ } - *cBytes += bytes; + *cBytes += bytes; break; } @@ -1313,13 +1317,13 @@ lpNext += bytes; /* Advance to next token */ } - *cBytes += bytes; + *cBytes += bytes; break; } case 'D': - { + { DWORD flags; DWORD bytes; @@ -1331,11 +1335,11 @@ SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; + } + + *cBytes += bytes; + + break; } case 'S': @@ -1351,18 +1355,18 @@ SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; + } + + *cBytes += bytes; + + break; } default: FIXME("Unknown token\n"); SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } + goto lend; + } StringSecurityDescriptor = lptoken; } @@ -1378,11 +1382,11 @@ * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] * @implemented */ -BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( - LPCWSTR StringSecurityDescriptor, - DWORD StringSDRevision, - PSECURITY_DESCRIPTOR* SecurityDescriptor, - PULONG SecurityDescriptorSize) +BOOL WINAPI +ConvertStringSecurityDescriptorToSecurityDescriptorW(LPCWSTR StringSecurityDescriptor, + DWORD StringSDRevision, + PSECURITY_DESCRIPTOR* SecurityDescriptor, + PULONG SecurityDescriptorSize) { DWORD cBytes; SECURITY_DESCRIPTOR* psd; @@ -1403,13 +1407,13 @@ else if (StringSDRevision != SID_REVISION) { SetLastError(ERROR_UNKNOWN_REVISION); - goto lend; + goto lend; } /* Compute security descriptor length */ if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, NULL, &cBytes)) - goto lend; + goto lend; psd = *SecurityDescriptor = LocalAlloc(GMEM_ZEROINIT, cBytes); if (!psd) goto lend; @@ -1421,14 +1425,14 @@ (SECURITY_DESCRIPTOR_RELATIVE *)psd, &cBytes)) { LocalFree(psd); - goto lend; + goto lend; } if (SecurityDescriptorSize) *SecurityDescriptorSize = cBytes; bret = TRUE; - + lend: TRACE(" ret=%d\n", bret); return bret; @@ -1440,11 +1444,12 @@ * ConvertStringSecurityDescriptorToSecurityDescriptorA [ADVAPI32.@] * @implemented */ -BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( - LPCSTR StringSecurityDescriptor, - DWORD StringSDRevision, - PSECURITY_DESCRIPTOR* SecurityDescriptor, - PULONG SecurityDescriptorSize) +BOOL +WINAPI +ConvertStringSecurityDescriptorToSecurityDescriptorA(LPCSTR StringSecurityDescriptor, + DWORD StringSDRevision, + PSECURITY_DESCRIPTOR* SecurityDescriptor, + PULONG SecurityDescriptorSize) { UINT len; BOOL ret = FALSE; @@ -1469,7 +1474,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI EqualPrefixSid(PSID pSid1, PSID pSid2) { @@ -1480,7 +1486,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI EqualSid(PSID pSid1, PSID pSid2) { @@ -1495,7 +1502,8 @@ * Docs says this function does NOT return a value * even thou it's defined to return a PVOID... */ -PVOID WINAPI +PVOID +WINAPI FreeSid(PSID pSid) { return RtlFreeSid(pSid); @@ -1505,7 +1513,8 @@ /* * @implemented */ -DWORD WINAPI +DWORD +WINAPI GetLengthSid(PSID pSid) { return (DWORD)RtlLengthSid(pSid); @@ -1515,7 +1524,8 @@ /* * @implemented */ -PSID_IDENTIFIER_AUTHORITY WINAPI +PSID_IDENTIFIER_AUTHORITY +WINAPI GetSidIdentifierAuthority(PSID pSid) { return RtlIdentifierAuthoritySid(pSid); @@ -1525,7 +1535,8 @@ /* * @implemented */ -DWORD WINAPI +DWORD +WINAPI GetSidLengthRequired(UCHAR nSubAuthorityCount) { return (DWORD)RtlLengthRequiredSid(nSubAuthorityCount); @@ -1535,7 +1546,8 @@ /* * @implemented */ -PDWORD WINAPI +PDWORD +WINAPI GetSidSubAuthority(PSID pSid, DWORD nSubAuthority) { @@ -1546,7 +1558,8 @@ /* * @implemented */ -PUCHAR WINAPI +PUCHAR +WINAPI GetSidSubAuthorityCount(PSID pSid) { return RtlSubAuthorityCountSid(pSid); @@ -1556,7 +1569,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI InitializeSid(PSID Sid, PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, BYTE nSubAuthorityCount) @@ -1579,7 +1593,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI IsValidSid(PSID pSid) { return (BOOL)RtlValidSid(pSid); @@ -1589,7 +1604,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI ConvertSidToStringSidW(PSID Sid, LPWSTR *StringSid) { @@ -1643,7 +1659,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI ConvertSidToStringSidA(PSID Sid, LPSTR *StringSid) { @@ -1687,7 +1704,8 @@ /* * @unimplemented */ -BOOL WINAPI +BOOL +WINAPI EqualDomainSid(IN PSID pSid1, IN PSID pSid2, OUT BOOL* pfEqual) @@ -1700,7 +1718,8 @@ /* * @unimplemented */ -BOOL WINAPI +BOOL +WINAPI GetWindowsAccountDomainSid(IN PSID pSid, OUT PSID ppDomainSid, IN OUT DWORD* cbSid) @@ -1713,7 +1732,8 @@ /* * @unimplemented */ -BOOL WINAPI +BOOL +WINAPI CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType, IN PSID DomainSid OPTIONAL, OUT PSID pSid, @@ -1787,7 +1807,8 @@ /* * @unimplemented */ -BOOL WINAPI +BOOL +WINAPI IsWellKnownSid(IN PSID pSid, IN WELL_KNOWN_SID_TYPE WellKnownSidType) { @@ -1810,7 +1831,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI ConvertStringSidToSidA(IN LPCSTR StringSid, OUT PSID* sid) { @@ -1879,7 +1901,8 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI ConvertStringSidToSidW(IN LPCWSTR StringSid, OUT PSID* sid) { @@ -1890,43 +1913,43 @@ TRACE("%s %p\n", debugstr_w(StringSid), sid); - if (!StringSid) - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - for (i = 0; i < sizeof(SidTable) / sizeof(SidTable[0]) - 1; i++) - { - if (wcscmp(StringSid, SidTable[i].key) == 0) - { - WELL_KNOWN_SID_TYPE knownSid = (WELL_KNOWN_SID_TYPE)SidTable[i].value; - size = SECURITY_MAX_SID_SIZE; - *sid = LocalAlloc(0, size); - if (!*sid) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - ret = CreateWellKnownSid( - knownSid, - NULL, - *sid, - &size); - if (!ret) - { - SetLastError(ERROR_INVALID_SID); - LocalFree(*sid); - } - return ret; - } - } - - /* That's probably a string S-R-I-S-S... */ - if (StringSid[0] != 'S' || StringSid[1] != '-') - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } + if (!StringSid) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + for (i = 0; i < sizeof(SidTable) / sizeof(SidTable[0]) - 1; i++) + { + if (wcscmp(StringSid, SidTable[i].key) == 0) + { + WELL_KNOWN_SID_TYPE knownSid = (WELL_KNOWN_SID_TYPE)SidTable[i].value; + size = SECURITY_MAX_SID_SIZE; + *sid = LocalAlloc(0, size); + if (!*sid) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ret = CreateWellKnownSid(knownSid, + NULL, + *sid, + &size); + if (!ret) + { + SetLastError(ERROR_INVALID_SID); + LocalFree(*sid); + } + return ret; + } + } + + /* That's probably a string S-R-I-S-S... */ + if (StringSid[0] != 'S' || StringSid[1] != '-') + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } cBytes = ComputeStringSidSize(StringSid); pisid = (SID*)LocalAlloc( 0, cBytes ); @@ -2005,5 +2028,4 @@ return ret; } - /* EOF */

1 0

[hbelusca] 57668: [KERNEL32] Use the new messaging structures...
by hbelusca＠svn.reactos.org 02 Nov '12

02 Nov '12

Author: hbelusca Date: Fri Nov 2 18:30:27 2012 New Revision: 57668 URL: http://svn.reactos.org/svn/reactos?rev=57668&view=rev Log: [KERNEL32] Use the new messaging structures... Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c branches/ros-csrss/dll/win32/kernel32/client/file/filename.c Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c [iso-8859-1] Fri Nov 2 18:30:27 2012 @@ -18,21 +18,22 @@ WINAPI NotifySoundSentry(VOID) { - CSR_API_MESSAGE ApiMessage; + BASE_API_MESSAGE ApiMessage; + PBASE_SOUND_SENTRY SoundSentryRequest = &ApiMessage.Data.SoundSentryRequest; /* Get the video mode */ - if (!GetConsoleDisplayMode(&ApiMessage.Data.SoundSentryRequest.VideoMode)) - { - ApiMessage.Data.SoundSentryRequest.VideoMode = 0; + if (!GetConsoleDisplayMode(&SoundSentryRequest->VideoMode)) + { + SoundSentryRequest->VideoMode = 0; } /* Make sure it's not fullscreen, and send the message if not */ - if (ApiMessage.Data.SoundSentryRequest.VideoMode == 0) - { - CsrClientCallServer(&ApiMessage, + if (SoundSentryRequest->VideoMode == 0) + { + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSoundSentryNotification), - sizeof(CSR_API_MESSAGE)); + sizeof(BASE_SOUND_SENTRY)); } } Modified: branches/ros-csrss/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Fri Nov 2 18:30:27 2012 @@ -1,10 +1,9 @@ -/* $Id: file.c 54310 2011-11-06 04:13:21Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/file.c * PURPOSE: Directory functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) * UPDATE HISTORY: * Created 01/11/98 @@ -92,7 +91,8 @@ UINT ID, Num = 0; CHAR IDString[5]; WCHAR * TempFileName; - CSR_API_MESSAGE ApiMessage; + BASE_API_MESSAGE ApiMessage; + PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFile; DWORD FileAttributes, LastError; UNICODE_STRING PathNameString, PrefixString; static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL }; @@ -158,17 +158,17 @@ /* If user didn't gave any ID, ask Csrss to give one */ if (!uUnique) { - CsrClientCallServer(&ApiMessage, + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetTempFile), - sizeof(CSR_API_MESSAGE)); - if (ApiMessage.Data.GetTempFile.UniqueID == 0) + sizeof(BASE_GET_TEMP_FILE)); + if (GetTempFile->UniqueID == 0) { Num++; continue; } - ID = ApiMessage.Data.GetTempFile.UniqueID; + ID = GetTempFile->UniqueID; } else {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs