Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[akhaldi] 64922: * Sync up to trunk head (r64921).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 23 12:17:44 2014 New Revision: 64922 URL: http://svn.reactos.org/svn/reactos?rev=64922&view=rev Log: * Sync up to trunk head (r64921). Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/mscutils/servman/export.c branches/shell-experiments/dll/win32/advapi32/advapi32.h branches/shell-experiments/dll/win32/advapi32/advapi32.spec branches/shell-experiments/dll/win32/advapi32/crypt/crypt.c branches/shell-experiments/dll/win32/advapi32/crypt/crypt.h branches/shell-experiments/dll/win32/advapi32/sec/cred.c branches/shell-experiments/dll/win32/kernel32/winnls/string/lang.c branches/shell-experiments/drivers/input/i8042prt/keyboard.c branches/shell-experiments/include/asm/kxarm.h branches/shell-experiments/include/ddk/wdm.h branches/shell-experiments/include/psdk/winbase.h branches/shell-experiments/include/reactos/libs/fast486/fast486.h branches/shell-experiments/include/xdk/rtlfuncs.h branches/shell-experiments/lib/fast486/fast486.c branches/shell-experiments/lib/rtl/bitmap.c branches/shell-experiments/lib/sdk/crt/except/arm/chkstk_asm.s branches/shell-experiments/lib/sdk/crt/oldnames-msvcrt.S branches/shell-experiments/lib/sdk/crt/stdlib/errno.c branches/shell-experiments/media/doc/README.WINE branches/shell-experiments/ntoskrnl/io/iomgr/driver.c branches/shell-experiments/ntoskrnl/io/iomgr/error.c branches/shell-experiments/ntoskrnl/io/iomgr/ramdisk.c branches/shell-experiments/ntoskrnl/io/iomgr/remlock.c branches/shell-experiments/ntoskrnl/io/iomgr/volume.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpinit.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpmgr.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpreport.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpres.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnputil.c branches/shell-experiments/subsystems/ntvdm/emulator.c branches/shell-experiments/subsystems/ntvdm/hardware/cmos.c branches/shell-experiments/subsystems/ntvdm/hardware/pic.c branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c branches/shell-experiments/subsystems/ntvdm/hardware/timer.c branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/subsystems/ntvdm/io.c branches/shell-experiments/subsystems/ntvdm/io.h branches/shell-experiments/win32ss/CMakeLists.txt branches/shell-experiments/win32ss/user/ntuser/class.c branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/keyboard.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/user32/windows/class.c branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/input… Modified: branches/shell-experiments/include/asm/kxarm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/asm/k… Modified: branches/shell-experiments/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ddk/w… Modified: branches/shell-experiments/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/xdk/r… Modified: branches/shell-experiments/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/bitma… Modified: branches/shell-experiments/lib/sdk/crt/except/arm/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/e… Modified: branches/shell-experiments/lib/sdk/crt/oldnames-msvcrt.S URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/o… Modified: branches/shell-experiments/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/REA… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnputil.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/CMake… Modified: branches/shell-experiments/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

10 years

[jgardou] 64921: [WIN32SS] - In an incredibly daring move, enable the long awaited new cursors & icons implementation, featuring: - Alpha channeled cursors - Animated cursors (only the first frame ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 11:46:06 2014 New Revision: 64921 URL: http://svn.reactos.org/svn/reactos?rev=64921&view=rev Log: [WIN32SS] - In an incredibly daring move, enable the long awaited new cursors & icons implementation, featuring: - Alpha channeled cursors - Animated cursors (only the first frame is displayed now) - Less leaks (tm) - Tests that pass(tm) - Copying icons and cursors from DLL resources, for beautifuler ReactOS, your turn gigaherz ;-) - A lot of other things which I am very proud of. CORE-7575 #resolve Modified: trunk/reactos/win32ss/CMakeLists.txt 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] Thu Oct 23 11:46:06 2014 @@ -1,6 +1,6 @@ set(USE_DIBLIB FALSE) -set(USE_NEW_CURSORICON FALSE) +set(USE_NEW_CURSORICON TRUE) # Give WIN32 subsystem its own project. PROJECT(WIN32SS)

10 years

[jgardou] 64920: [WIN32K] - Use shared icon handles when copying the small class icon from the larger one. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 11:46:01 2014 New Revision: 64920 URL: http://svn.reactos.org/svn/reactos?rev=64920&view=rev Log: [WIN32K] - Use shared icon handles when copying the small class icon from the larger one. CORE-7575 Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Oct 23 11:46:01 2014 @@ -248,10 +248,10 @@ #ifdef NEW_CURSORICON if (Class->spicn) UserDereferenceObject(Class->spicn); + if (Class->spcur) + UserDereferenceObject(Class->spcur); if (Class->spicnSm) UserDereferenceObject(Class->spicnSm); - if (Class->spcur) - UserDereferenceObject(Class->spcur); #else if (Class->hIconSmIntern) IntClassDestroyIcon(Class->hIconSmIntern); @@ -1976,18 +1976,31 @@ if (NewLong && !Class->spicnSm) { /* Create the new small icon from the new large(?) one */ - HICON SmallIconHandle = co_IntCopyImage( - (HICON)NewLong, - IMAGE_ICON, - UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), - 0); + HICON SmallIconHandle = NULL; + if((NewIcon->CURSORF_flags & (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + == (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + { + SmallIconHandle = co_IntCopyImage( + (HICON)NewLong, + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE | LR_SHARED); + } + if (!SmallIconHandle) + { + /* Retry without copying from resource */ + SmallIconHandle = co_IntCopyImage( + (HICON)NewLong, + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_SHARED); + } if (SmallIconHandle) { /* So use it */ NewSmallIcon = Class->spicnSm = UserGetCurIconObject(SmallIconHandle); - /* Let the handle go, we have the reference on the object */ - NtUserDestroyCursor(SmallIconHandle, FALSE); Class->CSF_flags |= CSF_CACHEDSMICON; } } Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Oct 23 11:46:01 2014 @@ -1677,17 +1677,31 @@ #ifdef NEW_CURSORICON if (Class->spicn && !Class->spicnSm) { - HICON IconSmHandle = co_IntCopyImage( - UserHMGetHandle(Class->spicn), - IMAGE_ICON, - UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), - 0); + HICON IconSmHandle = NULL; + if((Class->spicn->CURSORF_flags & (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + == (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + { + IconSmHandle = co_IntCopyImage( + UserHMGetHandle(Class->spicn), + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE | LR_SHARED); + } + if (!IconSmHandle) + { + /* Retry without copying from resource */ + IconSmHandle = co_IntCopyImage( + UserHMGetHandle(Class->spicn), + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_SHARED); + } + if (IconSmHandle) { Class->spicnSm = UserGetCurIconObject(IconSmHandle); - /* We can delete the handle, only the pointer is of interest */ - NtUserDestroyCursor(IconSmHandle, FALSE); Class->CSF_flags |= CSF_CACHEDSMICON; } }

10 years

[jgardou] 64919: [USER32] - Implement CopyImage(LR_SHARED) case. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 11:45:55 2014 New Revision: 64919 URL: http://svn.reactos.org/svn/reactos?rev=64919&view=rev Log: [USER32] - Implement CopyImage(LR_SHARED) case. CORE-7575 Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Oct 23 11:45:55 2014 @@ -1684,8 +1684,9 @@ { HICON ret = NULL; ICONINFO ii; - - if(fuFlags & LR_COPYFROMRESOURCE) + CURSORDATA CursorData; + + if (fuFlags & LR_COPYFROMRESOURCE) { /* Get the icon module/resource names */ UNICODE_STRING ustrModule; @@ -1697,14 +1698,14 @@ ustrRsrc.MaximumLength = 256; ustrModule.Buffer = HeapAlloc(GetProcessHeap(), 0, ustrModule.MaximumLength); - if(!ustrModule.Buffer) + 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, ustrRsrc.MaximumLength); - if(!pvBuf) + if (!pvBuf) { HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1745,7 +1746,7 @@ { ustrRsrc.MaximumLength *= 2; pvBuf = HeapReAlloc(GetProcessHeap(), 0, ustrRsrc.Buffer, ustrRsrc.MaximumLength); - if(!pvBuf) + if (!pvBuf) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto leave; @@ -1756,11 +1757,11 @@ /* NULL-terminate our strings */ ustrModule.Buffer[ustrModule.Length/sizeof(WCHAR)] = 0; - if(!IS_INTRESOURCE(ustrRsrc.Buffer)) + if (!IS_INTRESOURCE(ustrRsrc.Buffer)) ustrRsrc.Buffer[ustrRsrc.Length/sizeof(WCHAR)] = 0; /* Get the module handle */ - if(!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) + if (!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) { /* This should never happen */ ERR("Invalid handle?.\n"); @@ -1769,7 +1770,13 @@ } /* Call the relevant function */ - ret = CURSORICON_LoadImageW(hModule, ustrRsrc.Buffer, cxDesired, cyDesired, fuFlags & LR_DEFAULTSIZE, bIcon); + ret = CURSORICON_LoadImageW( + hModule, + ustrRsrc.Buffer, + cxDesired, + cyDesired, + fuFlags & (LR_DEFAULTSIZE | LR_SHARED), + bIcon); FreeLibrary(hModule); @@ -1784,21 +1791,37 @@ } /* This is a regular copy */ - if(fuFlags & ~LR_COPYDELETEORG) + if (fuFlags & ~(LR_COPYDELETEORG | LR_SHARED)) FIXME("Unimplemented flags: 0x%08x\n", fuFlags); - if(!GetIconInfo(hicon, &ii)) + if (!GetIconInfo(hicon, &ii)) { ERR("GetIconInfo failed.\n"); return NULL; } - - ret = CreateIconIndirect(&ii); - + + /* This is CreateIconIndirect with the LR_SHARED coat added */ + if (!CURSORICON_GetCursorDataFromIconInfo(&CursorData, &ii)) + goto Leave; + + if (fuFlags & LR_SHARED) + CursorData.CURSORF_flags |= CURSORF_LRSHARED; + + ret = NtUserxCreateEmptyCurObject(FALSE); + if (!ret) + goto Leave; + + if (!NtUserSetCursorIconData(ret, NULL, NULL, &CursorData)) + { + NtUserDestroyCursor(ret, TRUE); + goto Leave; + } + +Leave: DeleteObject(ii.hbmMask); - if(ii.hbmColor) DeleteObject(ii.hbmColor); - - if(ret && (fuFlags & LR_COPYDELETEORG)) + if (ii.hbmColor) DeleteObject(ii.hbmColor); + + if (ret && (fuFlags & LR_COPYDELETEORG)) DestroyIcon(hicon); return ret;

10 years

[jgardou] 64918: [USER32] - Cursoricon objects are allocated on the user heap, not the desktop heap. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 11:45:50 2014 New Revision: 64918 URL: http://svn.reactos.org/svn/reactos?rev=64918&view=rev Log: [USER32] - Cursoricon objects are allocated on the user heap, not the desktop heap. CORE-7575 Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Thu Oct 23 11:45:50 2014 @@ -714,15 +714,15 @@ break; #ifdef NEW_CURSORICON case GCLP_HCURSOR: - Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0; + Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spcur))->h : 0; break; case GCLP_HICON: - Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0; + Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicn))->h : 0; break; case GCLP_HICONSM: - Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0; + Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicnSm))->h : 0; break; #else case GCLP_HCURSOR: @@ -805,15 +805,15 @@ #ifdef NEW_CURSORICON case GCLP_HCURSOR: - Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0; + Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spcur))->h : 0; break; case GCLP_HICON: - Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0; + Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicn))->h : 0; break; case GCLP_HICONSM: - Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0; + Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicnSm))->h : 0; break; #else case GCLP_HCURSOR:

10 years

[aandrejevic] 64917: [FAST486][NTVDM] Arch, I/O port numbers should always be stored in USHORT variables!

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Oct 23 11:44:07 2014 New Revision: 64917 URL: http://svn.reactos.org/svn/reactos?rev=64917&view=rev Log: [FAST486][NTVDM] Arch, I/O port numbers should always be stored in USHORT variables! Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/cmos.c trunk/reactos/subsystems/ntvdm/hardware/pic.c trunk/reactos/subsystems/ntvdm/hardware/ps2.c trunk/reactos/subsystems/ntvdm/hardware/timer.c trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/io.c trunk/reactos/subsystems/ntvdm/io.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -190,7 +190,7 @@ (NTAPI *FAST486_IO_READ_PROC) ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize @@ -201,7 +201,7 @@ (NTAPI *FAST486_IO_WRITE_PROC) ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -149,7 +149,7 @@ static VOID NTAPI -Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) +Fast486IoReadCallback(PFAST486_STATE State, USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); @@ -160,7 +160,7 @@ static VOID NTAPI -Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) +Fast486IoWriteCallback(PFAST486_STATE State, USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -273,12 +273,12 @@ DebugBreak(); } -static BYTE WINAPI Port61hRead(ULONG Port) +static BYTE WINAPI Port61hRead(USHORT Port) { return Port61hState; } -static VOID WINAPI Port61hWrite(ULONG Port, BYTE Data) +static VOID WINAPI Port61hWrite(USHORT Port, BYTE Data) { // BOOLEAN SpeakerStateChange = FALSE; BYTE OldPort61hState = Port61hState; Modified: trunk/reactos/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -342,13 +342,13 @@ SelectedRegister = CMOS_REG_STATUS_D; } -BYTE WINAPI CmosReadPort(ULONG Port) +BYTE WINAPI CmosReadPort(USHORT Port) { ASSERT(Port == CMOS_DATA_PORT); return CmosReadData(); } -VOID WINAPI CmosWritePort(ULONG Port, BYTE Data) +VOID WINAPI CmosWritePort(USHORT Port, BYTE Data) { if (Port == CMOS_ADDRESS_PORT) CmosWriteAddress(Data); Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -154,7 +154,7 @@ Pic->Initialization = FALSE; } -static BYTE WINAPI PicReadPort(ULONG Port) +static BYTE WINAPI PicReadPort(USHORT Port) { switch (Port) { @@ -174,7 +174,7 @@ return 0; } -static VOID WINAPI PicWritePort(ULONG Port, BYTE Data) +static VOID WINAPI PicWritePort(USHORT Port, BYTE Data) { switch (Port) { Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -59,7 +59,7 @@ if (Port->DeviceCommand) Port->DeviceCommand(Port->Param, Command); } -static BYTE WINAPI PS2ReadPort(ULONG Port) +static BYTE WINAPI PS2ReadPort(USHORT Port) { if (Port == PS2_CONTROL_PORT) { @@ -87,7 +87,7 @@ return 0; } -static VOID WINAPI PS2WritePort(ULONG Port, BYTE Data) +static VOID WINAPI PS2WritePort(USHORT Port, BYTE Data) { if (Port == PS2_CONTROL_PORT) { Modified: trunk/reactos/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -275,7 +275,7 @@ } } -static BYTE WINAPI PitReadPort(ULONG Port) +static BYTE WINAPI PitReadPort(USHORT Port) { switch (Port) { @@ -290,7 +290,7 @@ return 0; } -static VOID WINAPI PitWritePort(ULONG Port, BYTE Data) +static VOID WINAPI PitWritePort(USHORT Port, BYTE Data) { switch (Port) { Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -1462,7 +1462,7 @@ CursorMoved = FALSE; } -static BYTE WINAPI VgaReadPort(ULONG Port) +static BYTE WINAPI VgaReadPort(USHORT Port) { DPRINT("VgaReadPort: Port 0x%X\n", Port); @@ -1554,7 +1554,7 @@ return 0; } -static VOID WINAPI VgaWritePort(ULONG Port, BYTE Data) +static VOID WINAPI VgaWritePort(USHORT Port, BYTE Data) { DPRINT("VgaWritePort: Port 0x%X, Data 0x%02X\n", Port, Data); Modified: trunk/reactos/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.c?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -58,7 +58,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ UCHAR -IOReadB(ULONG Port) +IOReadB(USHORT Port) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.InB) @@ -82,7 +82,7 @@ } VOID -IOReadStrB(ULONG Port, +IOReadStrB(USHORT Port, PUCHAR Buffer, ULONG Count) { @@ -105,7 +105,7 @@ } VOID -IOWriteB(ULONG Port, +IOWriteB(USHORT Port, UCHAR Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -127,7 +127,7 @@ } VOID -IOWriteStrB(ULONG Port, +IOWriteStrB(USHORT Port, PUCHAR Buffer, ULONG Count) { @@ -150,7 +150,7 @@ } USHORT -IOReadW(ULONG Port) +IOReadW(USHORT Port) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.InW) @@ -177,7 +177,7 @@ } VOID -IOReadStrW(ULONG Port, +IOReadStrW(USHORT Port, PUSHORT Buffer, ULONG Count) { @@ -200,7 +200,7 @@ } VOID -IOWriteW(ULONG Port, +IOWriteW(USHORT Port, USHORT Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -223,7 +223,7 @@ } VOID -IOWriteStrW(ULONG Port, +IOWriteStrW(USHORT Port, PUSHORT Buffer, ULONG Count) { @@ -246,7 +246,7 @@ } ULONG -IOReadD(ULONG Port) +IOReadD(USHORT Port) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.InD) @@ -265,7 +265,7 @@ } VOID -IOReadStrD(ULONG Port, +IOReadStrD(USHORT Port, PULONG Buffer, ULONG Count) { @@ -281,7 +281,7 @@ } VOID -IOWriteD(ULONG Port, +IOWriteD(USHORT Port, ULONG Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -298,7 +298,7 @@ } VOID -IOWriteStrD(ULONG Port, +IOWriteStrD(USHORT Port, PULONG Buffer, ULONG Count) { @@ -314,7 +314,7 @@ } -VOID RegisterIoPort(ULONG Port, +VOID RegisterIoPort(USHORT Port, EMULATOR_INB_PROC InHandler, EMULATOR_OUTB_PROC OutHandler) { @@ -332,7 +332,7 @@ IoPortProc[Port].hVdd = INVALID_HANDLE_VALUE; } -VOID UnregisterIoPort(ULONG Port) +VOID UnregisterIoPort(USHORT Port) { /* * Put automagically all the fields to zero: @@ -344,7 +344,7 @@ VOID WINAPI EmulatorReadIo(PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) @@ -419,7 +419,7 @@ VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) Modified: trunk/reactos/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.h?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.h [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -16,79 +16,79 @@ /* FUNCTIONS ******************************************************************/ -typedef UCHAR (WINAPI *EMULATOR_INB_PROC)(ULONG Port); -typedef USHORT (WINAPI *EMULATOR_INW_PROC)(ULONG Port); -typedef ULONG (WINAPI *EMULATOR_IND_PROC)(ULONG Port); +typedef UCHAR (WINAPI *EMULATOR_INB_PROC)(USHORT Port); +typedef USHORT (WINAPI *EMULATOR_INW_PROC)(USHORT Port); +typedef ULONG (WINAPI *EMULATOR_IND_PROC)(USHORT Port); -typedef VOID (WINAPI *EMULATOR_INSB_PROC)(ULONG Port, PUCHAR Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_INSW_PROC)(ULONG Port, PUSHORT Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_INSD_PROC)(ULONG Port, PULONG Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSB_PROC)(USHORT Port, PUCHAR Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSW_PROC)(USHORT Port, PUSHORT Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSD_PROC)(USHORT Port, PULONG Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_OUTB_PROC)(ULONG Port, UCHAR Data); -typedef VOID (WINAPI *EMULATOR_OUTW_PROC)(ULONG Port, USHORT Data); -typedef VOID (WINAPI *EMULATOR_OUTD_PROC)(ULONG Port, ULONG Data); +typedef VOID (WINAPI *EMULATOR_OUTB_PROC)(USHORT Port, UCHAR Data); +typedef VOID (WINAPI *EMULATOR_OUTW_PROC)(USHORT Port, USHORT Data); +typedef VOID (WINAPI *EMULATOR_OUTD_PROC)(USHORT Port, ULONG Data); -typedef VOID (WINAPI *EMULATOR_OUTSB_PROC)(ULONG Port, PUCHAR Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_OUTSW_PROC)(ULONG Port, PUSHORT Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_OUTSD_PROC)(ULONG Port, PULONG Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSB_PROC)(USHORT Port, PUCHAR Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSW_PROC)(USHORT Port, PUSHORT Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSD_PROC)(USHORT Port, PULONG Buffer, ULONG Count); UCHAR -IOReadB(ULONG Port); +IOReadB(USHORT Port); VOID -IOReadStrB(ULONG Port, +IOReadStrB(USHORT Port, PUCHAR Buffer, ULONG Count); VOID -IOWriteB(ULONG Port, +IOWriteB(USHORT Port, UCHAR Buffer); VOID -IOWriteStrB(ULONG Port, +IOWriteStrB(USHORT Port, PUCHAR Buffer, ULONG Count); USHORT -IOReadW(ULONG Port); +IOReadW(USHORT Port); VOID -IOReadStrW(ULONG Port, +IOReadStrW(USHORT Port, PUSHORT Buffer, ULONG Count); VOID -IOWriteW(ULONG Port, +IOWriteW(USHORT Port, USHORT Buffer); VOID -IOWriteStrW(ULONG Port, +IOWriteStrW(USHORT Port, PUSHORT Buffer, ULONG Count); ULONG -IOReadD(ULONG Port); +IOReadD(USHORT Port); VOID -IOReadStrD(ULONG Port, +IOReadStrD(USHORT Port, PULONG Buffer, ULONG Count); VOID -IOWriteD(ULONG Port, +IOWriteD(USHORT Port, ULONG Buffer); VOID -IOWriteStrD(ULONG Port, +IOWriteStrD(USHORT Port, PULONG Buffer, ULONG Count); -VOID RegisterIoPort(ULONG Port, +VOID RegisterIoPort(USHORT Port, EMULATOR_INB_PROC InHandler, EMULATOR_OUTB_PROC OutHandler); -VOID UnregisterIoPort(ULONG Port); +VOID UnregisterIoPort(USHORT Port); VOID WINAPI EmulatorReadIo ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize @@ -97,7 +97,7 @@ VOID WINAPI EmulatorWriteIo ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize

10 years

[jgardou] 64916: [USER32_APITEST] - Add a test showing that CopyImage accepts LR_SHARED flag. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 11:19:21 2014 New Revision: 64916 URL: http://svn.reactos.org/svn/reactos?rev=64916&view=rev Log: [USER32_APITEST] - Add a test showing that CopyImage accepts LR_SHARED flag. CORE-7575 Modified: trunk/rostests/apitests/user32/LoadImage.c Modified: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Thu Oct 23 11:19:21 2014 @@ -39,11 +39,27 @@ hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, 0); ok(hCopy != NULL, "\n"); ok(DestroyIcon(hCopy), "\n"); + /* Unlike the original, this one is not shared */ + ok(!DestroyIcon(hCopy), "\n"); hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_COPYFROMRESOURCE); ok(hCopy != NULL, "\n"); ok(DestroyIcon(hCopy), "\n"); + /* Unlike the original, this one is not shared */ + ok(!DestroyIcon(hCopy), "\n"); + + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_COPYFROMRESOURCE | LR_SHARED); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + /* This one is shared */ + ok(DestroyIcon(hCopy), "\n"); + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_SHARED); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + /* This one is shared */ + ok(DestroyIcon(hCopy), "\n"); + /* Try various usual functions */ hdcScreen = CreateDCW(L"DISPLAY", NULL, NULL, NULL); ok(hdcScreen != NULL, "\n");

10 years

[jgardou] 64915: [WIN32K] - Call IntDestroyCurIconObject instead of explicitly destroying the handle. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 09:52:57 2014 New Revision: 64915 URL: http://svn.reactos.org/svn/reactos?rev=64915&view=rev Log: [WIN32K] - Call IntDestroyCurIconObject instead of explicitly destroying the handle. CORE-7575 Modified: trunk/reactos/win32ss/user/ntuser/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] Thu Oct 23 09:52:57 2014 @@ -644,40 +644,36 @@ _In_ BOOL bForce) { BOOL ret; + PCURICON_OBJECT CurIcon = NULL; TRACE("Enter NtUserDestroyCursorIcon (%p, %u)\n", hCurIcon, bForce); UserEnterExclusive(); + CurIcon = UserGetCurIconObject(hCurIcon); + if (!CurIcon) + { + ret = FALSE; + goto leave; + } + if (!bForce) { /* Maybe we have good reasons not to destroy this object */ - PCURICON_OBJECT CurIcon = UserGetCurIconObject(hCurIcon); - ULONG Flags; - if (!CurIcon) - { + if (CurIcon->head.ppi != PsGetCurrentProcessWin32Process()) + { + /* No way, you're not touching my cursor */ ret = FALSE; goto leave; } - if (CurIcon->head.ppi != PsGetCurrentProcessWin32Process()) - { - /* No way, you're not touching my cursor */ - ret = FALSE; - UserDereferenceObject(CurIcon); - goto leave; - } - - Flags = CurIcon->CURSORF_flags; - UserDereferenceObject(CurIcon); - - if (Flags & CURSORF_CURRENT) + if (CurIcon->CURSORF_flags & CURSORF_CURRENT) { WARN("Trying to delete current cursor!\n"); ret = FALSE; goto leave; } - if (Flags & CURSORF_LRSHARED) + if (CurIcon->CURSORF_flags & CURSORF_LRSHARED) { WARN("Trying to delete shared cursor.\n"); /* This one is not an error */ @@ -687,9 +683,11 @@ } /* Destroy the handle */ - ret = UserDeleteObject(hCurIcon, TYPE_CURSOR); + ret = IntDestroyCurIconObject(CurIcon); leave: + if (CurIcon) + UserDereferenceObject(CurIcon); TRACE("Leave NtUserDestroyCursorIcon, ret=%i\n", ret); UserLeave(); return ret;

10 years

[jgardou] 64914: [WIN32K] - Reference cursor and icon objects when copying a class from one heap to another. CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 09:32:46 2014 New Revision: 64914 URL: http://svn.reactos.org/svn/reactos?rev=64914&view=rev Log: [WIN32K] - Reference cursor and icon objects when copying a class from one heap to another. CORE-7575 Modified: trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Oct 23 09:32:46 2014 @@ -838,6 +838,16 @@ NewClass->rpdeskParent = NULL; NewClass->pclsBase = NewClass; +#ifdef NEW_CURSORICON + if (NewClass->spcur) + UserReferenceObject(NewClass->spcur); + if (NewClass->spicn) + UserReferenceObject(NewClass->spicn); + if (NewClass->spicnSm) + UserReferenceObject(NewClass->spicnSm); +#endif + + /* Replace the class in the list */ (void)InterlockedExchangePointer((PVOID*)*ClassLinkPtr, NewClass);

10 years

[jgardou] 64913: [USER32] - Return the right value in CopyImage when copying cursors/icons CORE-7575

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 23 09:32:43 2014 New Revision: 64913 URL: http://svn.reactos.org/svn/reactos?rev=64913&view=rev Log: [USER32] - Return the right value in CopyImage when copying cursors/icons CORE-7575 Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Oct 23 09:32:43 2014 @@ -1801,7 +1801,7 @@ if(ret && (fuFlags & LR_COPYDELETEORG)) DestroyIcon(hicon); - return hicon; + return ret; } NTSTATUS WINAPI

10 years

← Newer
1
...
22
23
24
25
26
27
28
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014