Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[khornicek] 64882: [SERVMAN] - fix resource leaks CID 716292, 716293, 716294 - fix CID 716772 (double free), 513719 (wrong NULL check), 1206739 (cosmetic) - make line endings CR LF when exporting t...
by khornicek＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: khornicek Date: Tue Oct 21 22:58:23 2014 New Revision: 64882 URL: http://svn.reactos.org/svn/reactos?rev=64882&view=rev Log: [SERVMAN] - fix resource leaks CID 716292, 716293, 716294 - fix CID 716772 (double free), 513719 (wrong NULL check), 1206739 (cosmetic) - make line endings CR LF when exporting the services list Modified: trunk/reactos/base/applications/mscutils/servman/export.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/propsheet_general.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] Tue Oct 21 22:58:23 2014 @@ -52,7 +52,7 @@ if(hFile != INVALID_HANDLE_VALUE) { TCHAR LVText[500]; - TCHAR newl = _T('\n'); + TCHAR newl[2] = {_T('\r'), _T('\n')}; TCHAR tab = _T('\t'); DWORD dwTextLength, dwWritten; INT NumListedServ = 0; @@ -68,7 +68,7 @@ LVText, i, k); - if (LVText != NULL) + if (_tcslen(LVText)) { WriteFile(hFile, LVText, @@ -84,8 +84,8 @@ } } WriteFile(hFile, - &newl, - sizeof(TCHAR), + newl, + sizeof(newl), &dwWritten, NULL); } Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Tue Oct 21 22:58:23 2014 @@ -204,9 +204,10 @@ SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } - + } + + if(lpServiceConfig) HeapFree(GetProcessHeap(), 0, lpServiceConfig); - } if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) { Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Tue Oct 21 22:58:23 2014 @@ -167,9 +167,7 @@ 0, (LPARAM)lpProgStr); - HeapFree(GetProcessHeap(), - 0, - lpProgStr); + LocalFree(lpProgStr); } /* Finally, show and update the progress dialog */ Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] Tue Oct 21 22:58:23 2014 @@ -33,7 +33,6 @@ { hButton = GetDlgItem(hwndDlg, IDC_START); EnableWindow (hButton, TRUE); - HeapFree(GetProcessHeap(), 0, lpServiceConfig); } else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) { @@ -45,6 +44,9 @@ hButton = GetDlgItem(hwndDlg, IDC_PAUSE); EnableWindow (hButton, TRUE); } + + if(lpServiceConfig) + HeapFree(GetProcessHeap(), 0, lpServiceConfig); hButton = GetDlgItem(hwndDlg, IDC_START_PARAM); EnableWindow(hButton, (State == SERVICE_STOPPED)); Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Tue Oct 21 22:58:23 2014 @@ -270,6 +270,7 @@ HeapFree(ProcessHeap, 0, Info->pAllServices); + Info->pAllServices = NULL; } ScHandle = OpenSCManager(NULL, @@ -319,7 +320,7 @@ if (ScHandle) CloseServiceHandle(ScHandle); - if (!bRet) + if (!bRet && Info->pAllServices) { HeapFree(ProcessHeap, 0, Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Tue Oct 21 22:58:23 2014 @@ -163,6 +163,8 @@ LB_ADDSTRING, 0, (LPARAM)lpServiceConfig->lpDisplayName); + + HeapFree(GetProcessHeap(), 0, lpServiceConfig); } /* Move onto the next string */

1 0

[hbelusca] 64881: [FAST486]: Rename some 0F0x opcodes to "ExtOpcode..." to clarify what they are and where they are used.
by hbelusca＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: hbelusca Date: Tue Oct 21 21:18:23 2014 New Revision: 64881 URL: http://svn.reactos.org/svn/reactos?rev=64881&view=rev Log: [FAST486]: Rename some 0F0x opcodes to "ExtOpcode..." to clarify what they are and where they are used. Modified: trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/opgroups.c trunk/reactos/lib/fast486/opgroups.h Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Tue Oct 21 21:18:23 2014 @@ -37,8 +37,8 @@ FAST486_OPCODE_HANDLER_PROC Fast486ExtendedHandlers[FAST486_NUM_OPCODE_HANDLERS] = { - Fast486OpcodeGroup0F00, /* 0x00 - 0x01 */ - Fast486OpcodeGroup0F01, + Fast486ExtOpcodeGroup0F00, /* 0x00 - 0x01 */ + Fast486ExtOpcodeGroup0F01, Fast486ExtOpcodeLar, /* 0x02 */ Fast486ExtOpcodeLsl, /* 0x03 */ Fast486ExtOpcodeInvalid, /* 0x04 - 0x05 */ // Invalid @@ -222,8 +222,8 @@ Fast486ExtOpcodeMovzxByte, /* 0xB6 - 0xB7 */ Fast486ExtOpcodeMovzxWord, Fast486ExtOpcodeInvalid, /* 0xB8 */ // Invalid - Fast486OpcodeGroup0FB9, /* 0xB9 */ - Fast486OpcodeGroup0FBA, /* 0xBA */ + Fast486ExtOpcodeGroup0FB9, /* 0xB9 */ + Fast486ExtOpcodeGroup0FBA, /* 0xBA */ Fast486ExtOpcodeBtc, /* 0xBB */ Fast486ExtOpcodeBsf, /* 0xBC */ Fast486ExtOpcodeBsr, /* 0xBD */ Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Tue Oct 21 21:18:23 2014 @@ -1703,7 +1703,8 @@ return TRUE; } -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00) + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0F00) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -2014,7 +2015,7 @@ } } -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01) +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0F01) { // FAST486_TABLE_REG TableReg; UCHAR TableReg[6]; @@ -2230,7 +2231,7 @@ } } -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FB9) +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0FB9) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -2248,7 +2249,7 @@ return FALSE; } -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FBA) +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0FBA) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; Modified: trunk/reactos/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] Tue Oct 21 21:18:23 2014 @@ -42,10 +42,11 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroupF7); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFE); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFF); -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00); -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01); -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FB9); -FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FBA); + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0F00); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0F01); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0FB9); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0FBA); #endif // _OPGROUPS_H_

1 0

[khornicek] 64880: [USER32] - fix CID 514402 (by Christoph) [MMIXER] - fix CID 503774, 715945, 511119 [WS2_32_NEW] - fix a debug print
by khornicek＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: khornicek Date: Tue Oct 21 21:08:51 2014 New Revision: 64880 URL: http://svn.reactos.org/svn/reactos?rev=64880&view=rev Log: [USER32] - fix CID 514402 (by Christoph) [MMIXER] - fix CID 503774, 715945, 511119 [WS2_32_NEW] - fix a debug print Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/midi.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/win32ss/user/user32/misc/desktop.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Tue Oct 21 21:08:51 2014 @@ -918,7 +918,7 @@ WCHAR ServiceBuffer[17]; DWORD HostLength = 0, ServLength = 0; PWCHAR ServiceString = NULL, HostString = NULL; - DPRINT("getaddrinfo: %p, %p, %p, %lx\n", host, serv, sa, salen); + DPRINT("getnameinfo: %p, %p, %p, %lx\n", host, serv, sa, salen); /* Check for WSAStartup */ if ((ErrorCode = WsQuickProlog()) != ERROR_SUCCESS) return ErrorCode; Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Tue Oct 21 21:08:51 2014 @@ -1644,7 +1644,7 @@ IN LPMIXER_DATA MixerData, IN PULONG DeviceCount) { - MIXER_STATUS Status; + MIXER_STATUS Status = MM_STATUS_SUCCESS; PTOPOLOGY Topology; ULONG NodeIndex; LPMIXER_INFO MixerInfo = NULL; Modified: trunk/reactos/lib/drivers/sound/mmixer/midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] Tue Oct 21 21:08:51 2014 @@ -72,7 +72,7 @@ MidiInfo->PinId = PinId; /* sanity check */ - ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN); + ASSERT(!DeviceName || (wcslen(DeviceName) + 1 < MAXPNAMELEN)); /* copy device name */ if (bInput && DeviceName) Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Tue Oct 21 21:08:51 2014 @@ -328,7 +328,7 @@ if (MixerLineControls->cbmxctrl != sizeof(MIXERCONTROLW)) { - DPRINT1("Invalid MixerLineControls cbmxctrl passed %lu expected %lu\n", MixerLineControls->cbStruct, sizeof(MIXERLINECONTROLSW)); + DPRINT1("Invalid MixerLineControls cbmxctrl passed %lu expected %lu\n", MixerLineControls->cbmxctrl, sizeof(MIXERCONTROLW)); /* invalid parameter */ return MM_STATUS_INVALID_PARAMETER; } Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Tue Oct 21 21:08:51 2014 @@ -330,7 +330,10 @@ } Ret = NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, pvParam, fWinIni); - RtlFreeUnicodeString(&ustrWallpaper); + + if (pvParam) + RtlFreeUnicodeString(&ustrWallpaper); + return Ret; } }

1 0

[jgardou] 64879: [WIN32K] - Fix a few usages of UserSetCursor - Defer the actual freeing of cursor resources to when the object is freed for real. CORE-7575
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 19:57:03 2014 New Revision: 64879 URL: http://svn.reactos.org/svn/reactos?rev=64879&view=rev Log: [WIN32K] - Fix a few usages of UserSetCursor - Defer the actual freeing of cursor resources to when the object is freed for real. CORE-7575 Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h 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] Tue Oct 21 19:57:03 2014 @@ -46,6 +46,8 @@ VOID FASTCALL IntCleanupCurIconCache(PPROCESSINFO Win32Process); + +void FreeCurIconObject(PVOID Object); #else 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] Tue Oct 21 19:57:03 2014 @@ -150,7 +150,19 @@ } BOOLEAN -IntDestroyCurIconObject(PVOID Object) +IntDestroyCurIconObject( + _In_ PVOID Object) +{ + PCURICON_OBJECT CurIcon = Object; + + /* We just mark the handle as being destroyed. + * Deleting all the stuff will be deferred to the actual struct free. */ + return UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); +} + +void +FreeCurIconObject( + _In_ PVOID Object) { PCURICON_OBJECT CurIcon = Object; @@ -220,7 +232,8 @@ } } - return TRUE; + /* Finally free the thing */ + FreeProcMarkObject(CurIcon); } VOID FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Tue Oct 21 19:57:03 2014 @@ -675,13 +675,17 @@ { UserShowCursor( FALSE ); #ifdef NEW_CURSORICON - UserSetCursor(OldCursor, FALSE); + OldCursor = UserSetCursor(OldCursor, FALSE); #else IntSetCursor( hOldCursor ); #endif } #ifdef NEW_CURSORICON - UserDereferenceObject(DragCursor); + /* It could be that the cursor was already changed while we were proceeding, + * so we must unreference whatever cursor was current at the time we restored the old one. + * Maybe it is DragCursor, but maybe it is another one and DragCursor got already freed. + */ + UserDereferenceObject(OldCursor); #else IntDestroyCursor( hDragCursor, FALSE ); #endif Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Oct 21 19:57:03 2014 @@ -662,9 +662,15 @@ { return TRUE; } +#ifdef NEW_CURSORICON + pcurNew->CURSORF_flags |= CURSORF_CURRENT; +#endif pcurOld = UserSetCursor(pcurNew, FALSE); if (pcurOld) { +#ifdef NEW_CURSORICON + pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; +#endif UserDereferenceObject(pcurOld); } return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Tue Oct 21 19:57:03 2014 @@ -761,7 +761,8 @@ ulResult = PDEVOBJ_bSwitchMode(ppdev, pdm); /* Restore mouse pointer, no hooks called */ - UserSetCursor(pvOldCursor, TRUE); + pvOldCursor = UserSetCursor(pvOldCursor, TRUE); + ASSERT(pvOldCursor == NULL); /* Check for failure */ if (!ulResult) Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Tue Oct 21 19:57:03 2014 @@ -168,7 +168,7 @@ return ObjHead; } -static void FreeProcMarkObject( +void FreeProcMarkObject( _In_ PVOID Object) { PPROCESSINFO ppi = ((PPROCMARKHEAD)Object)->ppi; @@ -221,7 +221,7 @@ #ifndef NEW_CURSORICON { AllocProcMarkObject, /*UserCursorCleanup*/NULL, FreeProcMarkObject }, /* TYPE_CURSOR */ #else - { AllocProcMarkObject, IntDestroyCurIconObject, FreeProcMarkObject }, /* TYPE_CURSOR */ + { AllocProcMarkObject, IntDestroyCurIconObject, FreeCurIconObject }, /* TYPE_CURSOR */ #endif { AllocSysObject, /*UserSetWindowPosCleanup*/NULL, FreeSysObject }, /* TYPE_SETWINDOWPOS */ { AllocDeskThreadObject, IntRemoveHook, FreeDeskThreadObject }, /* TYPE_HOOK */ Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Tue Oct 21 19:57:03 2014 @@ -56,4 +56,6 @@ UserDereferenceObject(obj); } +void FreeProcMarkObject(_In_ PVOID Object); + /* EOF */

1 0

[jgardou] 64878: [I_KNEW_IT] - InterlockedDecrement(JeromesBuildFailures)
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 19:14:47 2014 New Revision: 64878 URL: http://svn.reactos.org/svn/reactos?rev=64878&view=rev Log: [I_KNEW_IT] - InterlockedDecrement(JeromesBuildFailures) Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/windc.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] Tue Oct 21 19:14:47 2014 @@ -1765,7 +1765,7 @@ return FALSE; } /* Note: IntDestroyCurIconObject will remove our reference for us! */ - Ret = IntDestroyCurIconObject(CurIcon, TRUE); + Ret = IntDestroyCurIconObject(CurIcon, GetW32ProcessInfo()); if (!Ret) { ERR("hCurIcon was not Destroyed!\n"); Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Tue Oct 21 19:14:47 2014 @@ -1052,7 +1052,7 @@ x = (ClientRect.right - ClientRect.left - UserGetSystemMetrics(SM_CXICON)) / 2; y = (ClientRect.bottom - ClientRect.top - UserGetSystemMetrics(SM_CYICON)) / 2; UserDrawIconEx( hDC, x, y, pIcon, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE ); - UserDereferenceObject(pIcon) + UserDereferenceObject(pIcon); } #endif IntEndPaint(Wnd, &Ps); @@ -1161,10 +1161,15 @@ hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); +#ifdef NEW_CURSORICON if (!hIcon && pWnd->pcls->spicnSm) return pWnd->pcls->spicnSm; if (!hIcon && pWnd->pcls->spicn) return pWnd->pcls->spicn; +#else + if (!hIcon) hIcon = pWnd->pcls->hIconSm; + if (!hIcon) hIcon = pWnd->pcls->hIcon; +#endif if (!hIcon && (pWnd->style & DS_MODALFRAME)) { Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Tue Oct 21 19:14:47 2014 @@ -403,7 +403,11 @@ Flags |= DCX_CLIPCHILDREN; } /* If minized with icon in the set, we are forced to be cheap! */ +#ifdef NEW_CURSORICON if (Wnd->style & WS_MINIMIZE && Wnd->pcls->spicn) +#else + if (Wnd->style & WS_MINIMIZE && Wnd->pcls->hIcon) +#endif { Flags |= DCX_CACHE; }

1 0

[jgardou] 64877: [WIN32K] - "Convert" new cursor & icons implementation to the new user object handle manager. - Fix a few idiosyncracies in the way cursor handles are used (only with USE_NEW_CURSO...
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 18:59:44 2014 New Revision: 64877 URL: http://svn.reactos.org/svn/reactos?rev=64877&view=rev Log: [WIN32K] - "Convert" new cursor & icons implementation to the new user object handle manager. - Fix a few idiosyncracies in the way cursor handles are used (only with USE_NEW_CURSORICON_ENABLED) [WIN32SS] - Storm out the flowers out of how classes use icon and cursor objects, with proper refcounting and all those joyous things. Handles are for the powerless, kernel mode use pointers. Only with USE_NEW_CURSORICON enabled (soon!) CORE-7575 Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/class.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] Tue Oct 21 18:59:44 2014 @@ -521,18 +521,24 @@ INT cbclsExtra; INT cbwndExtra; HINSTANCE hModule; +#ifdef NEW_CURSORICON + struct _CURICON_OBJECT* spicn; + struct _CURICON_OBJECT* spcur; +#else HANDLE hIcon; /* FIXME - Use pointer! */ - //PCURSOR spicn; HANDLE hCursor; /* FIXME - Use pointer! */ - //PCURSOR spcur; +#endif HBRUSH hbrBackground; PWSTR lpszMenuName; // kernel use PSTR lpszAnsiClassName; // " +#ifdef NEW_CURSORICON + struct _CURICON_OBJECT* spicnSm; +#else HANDLE hIconSm; /* FIXME - Use pointer! */ - //PCURSOR spicnSm; //// ReactOS dosn't suppot cache icons. HICON hIconSmIntern; /* Internal small icon, derived from hIcon */ +#endif //// UINT Unicode : 1; // !CSF_ANSIPROC UINT Global : 1; // CS_GLOBALCLASS or CSF_SERVERSIDEPROC 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] Tue Oct 21 18:59:44 2014 @@ -245,8 +245,17 @@ IntFreeClassMenuName(Class); } +#ifdef NEW_CURSORICON + if (Class->spicn) + UserDereferenceObject(Class->spicn); + if (Class->spicnSm) + UserDereferenceObject(Class->spicnSm); + if (Class->spcur) + UserDereferenceObject(Class->spcur); +#else if (Class->hIconSmIntern) IntClassDestroyIcon(Class->hIconSmIntern); +#endif pDesk = Class->rpdeskParent; Class->rpdeskParent = NULL; @@ -587,10 +596,21 @@ Class = DesktopHeapAlloc(Desktop, ClassSize); + if (Class != NULL) { /* Simply clone the class */ RtlCopyMemory( Class, BaseClass, ClassSize); + +#ifdef NEW_CURSORICON + /* Reference our objects */ + if (Class->spcur) + UserReferenceObject(Class->spcur); + if (Class->spicn) + UserReferenceObject(Class->spicn); + if (Class->spicnSm) + UserReferenceObject(Class->spicnSm); +#endif TRACE("Clone Class 0x%p hM 0x%p\n %S\n",Class, Class->hModule, Class->lpszClientUnicodeMenuName); @@ -1009,10 +1029,15 @@ Class->cbclsExtra = lpwcx->cbClsExtra; Class->cbwndExtra = lpwcx->cbWndExtra; Class->hModule = lpwcx->hInstance; - //// FIXME handles to pointers +#ifdef NEW_CURSORICON + Class->spicn = lpwcx->hIcon ? UserGetCurIconObject(lpwcx->hIcon) : NULL; + Class->spcur = lpwcx->hCursor ? UserGetCurIconObject(lpwcx->hCursor) : NULL; + Class->spicnSm = lpwcx->hIconSm ? UserGetCurIconObject(lpwcx->hIconSm) : NULL; +#else Class->hIcon = lpwcx->hIcon; Class->hIconSm = lpwcx->hIconSm; Class->hCursor = lpwcx->hCursor; +#endif //// Class->hbrBackground = lpwcx->hbrBackground; @@ -1726,13 +1751,7 @@ return Ret; } -//// Do this for now in anticipation of new cursor icon code. #ifndef NEW_CURSORICON -BOOLEAN FASTCALL IntDestroyCurIconObject(PCURICON_OBJECT, PPROCESSINFO); -#else -BOOLEAN FASTCALL IntDestroyCurIconObject(PCURICON_OBJECT, BOOLEAN); -#endif - BOOL FASTCALL IntClassDestroyIcon(HANDLE hCurIcon) { @@ -1745,19 +1764,15 @@ ERR("hCurIcon was not found!\n"); return FALSE; } -#ifndef NEW_CURSORICON - Ret = IntDestroyCurIconObject(CurIcon, PsGetCurrentProcessWin32Process()); - /* Note: IntDestroyCurIconObject will remove our reference for us! */ -#else /* Note: IntDestroyCurIconObject will remove our reference for us! */ Ret = IntDestroyCurIconObject(CurIcon, TRUE); + if (!Ret) + { + ERR("hCurIcon was not Destroyed!\n"); + } + return Ret; +} #endif - if (!Ret) - { - ERR("hCurIcon was not Destroyed!\n"); - } - return Ret; -} ULONG_PTR UserSetClassLongPtr(IN PCLS Class, @@ -1766,7 +1781,9 @@ IN BOOL Ansi) { ULONG_PTR Ret = 0; +#ifndef NEW_CURSORICON HANDLE hIconSmIntern = NULL; +#endif /* NOTE: For GCLP_MENUNAME and GCW_ATOM this function may raise an exception! */ @@ -1838,6 +1855,54 @@ } break; +#ifdef NEW_CURSORICON + case GCLP_HCURSOR: + { + PCURICON_OBJECT NewCursor = NULL; + + if (NewLong) + { + NewCursor = UserGetCurIconObject((HCURSOR)NewLong); + if (!NewCursor) + { + EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); + return 0; + } + } + + if (Class->spcur) + { + Ret = (ULONG_PTR)UserHMGetHandle(Class->spcur); + UserDereferenceObject(Class->spcur); + } + else + { + Ret = 0; + } + + if (Ret == NewLong) + { + /* It's a nop */ + return Ret; + } + + Class->spcur = NewCursor; + + /* Update the clones */ + Class = Class->pclsClone; + while (Class != NULL) + { + if (Class->spcur) + UserDereferenceObject(Class->spcur); + if (NewCursor) + UserReferenceObject(NewCursor); + Class->spcur = NewCursor; + Class = Class->pclsNext; + } + + break; + } +#else case GCLP_HCURSOR: /* FIXME: Get handle from pointer to CURSOR object */ Ret = (ULONG_PTR)Class->hCursor; @@ -1851,6 +1916,7 @@ Class = Class->pclsNext; } break; +#endif // MSDN: // hIconSm, A handle to a small icon that is associated with the window class. @@ -1858,6 +1924,88 @@ // the hIcon member for an icon of the appropriate size to use as the small icon. // case GCLP_HICON: +#ifdef NEW_CURSORICON + { + PCURICON_OBJECT NewIcon = NULL; + PCURICON_OBJECT NewSmallIcon = NULL; + + if (NewLong) + { + NewIcon = UserGetCurIconObject((HCURSOR)NewLong); + if (!NewIcon) + { + EngSetLastError(ERROR_INVALID_ICON_HANDLE); + return 0; + } + } + + if (Class->spicn) + { + Ret = (ULONG_PTR)UserHMGetHandle(Class->spicn); + UserDereferenceObject(Class->spicn); + } + else + { + Ret = 0; + } + + if (Ret == NewLong) + { + /* It's a nop */ + return Ret; + } + + if (Ret && (Class->CSF_flags & CSF_CACHEDSMICON)) + { + /* We will change the small icon */ + UserDereferenceObject(Class->spicnSm); + Class->spicnSm = NULL; + Class->CSF_flags &= ~CSF_CACHEDSMICON; + } + + 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); + 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; + } + } + + Class->spicn = NewIcon; + + /* Update the clones */ + Class = Class->pclsClone; + while (Class != NULL) + { + if (Class->spicn) + UserDereferenceObject(Class->spicn); + if (NewIcon) + UserReferenceObject(NewIcon); + Class->spicn = NewIcon; + if (NewSmallIcon) + { + if (Class->spicnSm) + UserDereferenceObject(Class->spicnSm); + UserReferenceObject(NewSmallIcon); + Class->spicnSm = NewSmallIcon; + Class->CSF_flags |= CSF_CACHEDSMICON; + } + Class = Class->pclsNext; + } + break; + } +#else /* FIXME: Get handle from pointer to ICON object */ Ret = (ULONG_PTR)Class->hIcon; if (Class->hIcon == (HANDLE)NewLong) break; @@ -1885,8 +2033,51 @@ Class = Class->pclsNext; } break; +#endif case GCLP_HICONSM: +#ifdef NEW_CURSORICON + { + PCURICON_OBJECT NewSmallIcon = NULL; + + if (NewLong) + { + NewSmallIcon = UserGetCurIconObject((HCURSOR)NewLong); + if (!NewSmallIcon) + { + EngSetLastError(ERROR_INVALID_ICON_HANDLE); + return 0; + } + } + + if (Class->spicnSm) + { + Ret = (ULONG_PTR)UserHMGetHandle(Class->spicnSm); + UserDereferenceObject(Class->spicnSm); + } + else + { + Ret = 0; + } + + Class->CSF_flags &= ~CSF_CACHEDSMICON; + Class->spicnSm = NewSmallIcon; + + /* Update the clones */ + Class = Class->pclsClone; + while (Class != NULL) + { + if (Class->spicnSm) + UserDereferenceObject(Class->spicnSm); + if (NewSmallIcon) + UserReferenceObject(NewSmallIcon); + Class->CSF_flags &= ~CSF_CACHEDSMICON; + Class->spicnSm = NewSmallIcon; + Class = Class->pclsNext; + } + } + break; +#else /* FIXME: Get handle from pointer to ICON object */ Ret = (ULONG_PTR)Class->hIconSm; if (Class->hIconSm == (HANDLE)NewLong) break; @@ -1920,6 +2111,7 @@ Class = Class->pclsNext; } break; +#endif case GCLP_HMODULE: Ret = (ULONG_PTR)Class->hModule; @@ -2011,8 +2203,16 @@ lpwcx->cbClsExtra = Class->cbclsExtra; lpwcx->cbWndExtra = Class->cbwndExtra; +#ifdef NEW_CURSORICON + lpwcx->hIcon = Class->spicn ? UserHMGetHandle(Class->spicn) : NULL; + lpwcx->hCursor = Class->spcur ? UserHMGetHandle(Class->spcur) : NULL; + lpwcx->hIconSm = Class->spicnSm ? UserHMGetHandle(Class->spicnSm) : NULL; +#else lpwcx->hIcon = Class->hIcon; /* FIXME: Get handle from pointer */ lpwcx->hCursor = Class->hCursor; /* FIXME: Get handle from pointer */ + /* FIXME: Get handle from pointer */ + lpwcx->hIconSm = Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern; +#endif lpwcx->hbrBackground = Class->hbrBackground; /* Copy non-string to user first. */ @@ -2041,9 +2241,6 @@ /* FIXME: Return the string? Okay! This is performed in User32! */ //lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->atomClassName); - - /* FIXME: Get handle from pointer */ - lpwcx->hIconSm = Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern; return TRUE; } 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] Tue Oct 21 18:59:44 2014 @@ -41,6 +41,12 @@ C_ASSERT(FIELD_OFFSET(ACON, cpcur) == FIELD_OFFSET(CURICON_OBJECT, xHotspot)); +BOOLEAN +IntDestroyCurIconObject(PVOID Object); + +VOID FASTCALL +IntCleanupCurIconCache(PPROCESSINFO Win32Process); + #else typedef struct tagCURICON_PROCESS @@ -62,6 +68,9 @@ BYTE Shadow; ICONINFO IconInfo; } CURICON_OBJECT, *PCURICON_OBJECT; +BOOLEAN FASTCALL IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, PPROCESSINFO ppi); +BOOL FASTCALL IntDestroyCursor(HANDLE hCurIcon, BOOL bForce); +HCURSOR FASTCALL IntSetCursor(HCURSOR hCursor); #endif typedef struct _CURSORACCELERATION_INFO @@ -112,9 +121,6 @@ BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); BOOL APIENTRY UserClipCursor(RECTL *prcl); PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID); -HCURSOR FASTCALL IntSetCursor(HCURSOR hCursor); -BOOL FASTCALL IntDestroyCursor(HANDLE hCurIcon, BOOL bForce); -BOOLEAN FASTCALL IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, PPROCESSINFO ppi); #define IntReleaseCurIconObject(CurIconObj) \ UserDereferenceObject(CurIconObj) 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] Tue Oct 21 18:59:44 2014 @@ -133,7 +133,7 @@ CurIcon = UserCreateObject( gHandleTable, NULL, - NULL, + GetW32ThreadInfo(), &hCurIcon, TYPE_CURSOR, Animated ? sizeof(ACON) : sizeof(CURICON_OBJECT)); @@ -149,35 +149,11 @@ return hCurIcon; } -BOOLEAN FASTCALL -IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, BOOLEAN bForce) -{ - if(CurIcon->CURSORF_flags & CURSORF_CURRENT) - { - /* Mark the object as destroyed, and fail, as per tests */ - TRACE("Cursor is current, marking as destroyed.\n"); - UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); - return FALSE; - } - - if(CurIcon->head.ppi != PsGetCurrentProcessWin32Process()) - { - /* This object doesn't belong to the current process */ - WARN("Trying to delete foreign cursor!\n"); - UserDereferenceObject(CurIcon); - EngSetLastError(ERROR_DESTROY_OBJECT_OF_OTHER_THREAD); - return FALSE; - } - - /* Do not destroy it if it is shared. (And we're not forced to) */ - if((CurIcon->CURSORF_flags & CURSORF_LRSHARED) && !bForce) - { - /* Tests show this is a valid call */ - WARN("Trying to destroy shared cursor!\n"); - UserDereferenceObject(CurIcon); - return TRUE; - } - +BOOLEAN +IntDestroyCurIconObject(PVOID Object) +{ + PCURICON_OBJECT CurIcon = Object; + if(!(CurIcon->CURSORF_flags & CURSORF_ACON)) { HBITMAP bmpMask = CurIcon->hbmMask; @@ -210,101 +186,55 @@ UINT i; for(i = 0; i < AniCurIcon->cpcur; i++) - IntDestroyCurIconObject(AniCurIcon->aspcur[i], TRUE); + IntDestroyCurIconObject(AniCurIcon->aspcur[i]); ExFreePoolWithTag(AniCurIcon->aspcur, USERTAG_CURSOR); } if (CurIcon->CURSORF_flags & CURSORF_LRSHARED) { + PPROCESSINFO ppi; + if (!IS_INTRESOURCE(CurIcon->strName.Buffer)) ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING); if (CurIcon->atomModName) RtlDeleteAtomFromAtomTable(gAtomTable, CurIcon->atomModName); CurIcon->strName.Buffer = NULL; CurIcon->atomModName = 0; - } - - /* We were given a pointer, no need to keep the reference any longer! */ - UserDereferenceObject(CurIcon); - return UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); + + /* Try finding it in its process cache */ + ppi = CurIcon->head.ppi; + if (ppi->pCursorCache == CurIcon) + ppi->pCursorCache = CurIcon->pcurNext; + else + { + PCURICON_OBJECT CacheCurIcon= ppi->pCursorCache; + while (CacheCurIcon) + { + if (CacheCurIcon->pcurNext == CurIcon) + { + CacheCurIcon->pcurNext = CurIcon->pcurNext; + break; + } + CacheCurIcon = CacheCurIcon->pcurNext; + } + } + } + + return TRUE; } VOID FASTCALL -IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process) +IntCleanupCurIconCache(PPROCESSINFO Win32Process) { PCURICON_OBJECT CurIcon; /* Run through the list of icon objects */ - while(Win32Process->pCursorCache) + while (Win32Process->pCursorCache) { CurIcon = Win32Process->pCursorCache; Win32Process->pCursorCache = CurIcon->pcurNext; - /* One ref for the handle, one for the list, - * and potentially one from an other process via SetCursor */ - ASSERT(CurIcon->head.cLockObj <= 3); - IntDestroyCurIconObject(CurIcon, TRUE); - } -} - -HCURSOR FASTCALL -IntSetCursor( - HCURSOR hCursor) -{ - PCURICON_OBJECT pcurOld, pcurNew; - HCURSOR hOldCursor = NULL; - - if (hCursor) - { - pcurNew = UserGetCurIconObject(hCursor); - if (!pcurNew) - { - EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); - goto leave; - } - pcurNew->CURSORF_flags |= CURSORF_CURRENT; - } - else - { - pcurNew = NULL; - } - - pcurOld = UserSetCursor(pcurNew, FALSE); - if (pcurOld) - { - hOldCursor = pcurOld->head.h; - pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; - if(UserObjectInDestroy(hOldCursor)) - { - /* Destroy it once and for all */ - IntDestroyCurIconObject(pcurOld, TRUE); - hOldCursor = NULL; - } - else - { - UserDereferenceObject(pcurOld); - } - } -leave: - return hOldCursor; -} - -BOOL FASTCALL -IntDestroyCursor( - HANDLE hCurIcon, - BOOL bForce) -{ - PCURICON_OBJECT CurIcon; - BOOL ret; - - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - return(FALSE); - } - - ret = IntDestroyCurIconObject(CurIcon, bForce); - /* Note: IntDestroyCurIconObject will remove our reference for us! */ - - return ret; + UserDereferenceObject(CurIcon); + } } /* @@ -690,27 +620,56 @@ _In_ HANDLE hCurIcon, _In_ BOOL bForce) { - PCURICON_OBJECT CurIcon; BOOL ret; - DECLARE_RETURN(BOOL); TRACE("Enter NtUserDestroyCursorIcon\n"); UserEnterExclusive(); - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - RETURN(FALSE); - } - - ret = IntDestroyCurIconObject(CurIcon, bForce); - /* Note: IntDestroyCurIconObject will remove our reference for us! */ - - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserDestroyCursorIcon, ret=%i\n",_ret_); + if (!bForce) + { + /* Maybe we have good reasons not to destroy this object */ + PCURICON_OBJECT CurIcon = UserGetCurIconObject(hCurIcon); + ULONG Flags; + if (!CurIcon) + { + 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) + { + WARN("Trying to delete current cursor!\n"); + ret = FALSE; + goto leave; + } + + if (Flags & CURSORF_LRSHARED) + { + WARN("Trying to delete shared cursor.\n"); + /* This one is not an error */ + ret = TRUE; + goto leave; + } + } + + /* Destroy the handle */ + ret = UserDeleteObject(hCurIcon, TYPE_CURSOR); + +leave: + TRACE("Leave NtUserDestroyCursorIcon, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } @@ -891,18 +850,8 @@ pcurOld = UserSetCursor(pcurNew, FALSE); if (pcurOld) { - hOldCursor = pcurOld->head.h; pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; - if(UserObjectInDestroy(hOldCursor)) - { - /* Destroy it once and for all */ - IntDestroyCurIconObject(pcurOld, TRUE); - hOldCursor = NULL; - } - else - { - UserDereferenceObject(pcurOld); - } + UserDereferenceObject(pcurOld); } leave: @@ -1088,7 +1037,7 @@ for(i = 0; i < numFrames; i++) { if(AniCurIcon->aspcur[i]) - IntDestroyCurIconObject(AniCurIcon->aspcur[i], TRUE); + IntDestroyCurIconObject(AniCurIcon->aspcur[i]); } AniCurIcon->cicur = 0; AniCurIcon->cpcur = 0; Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -387,7 +387,11 @@ RECT sizingRect, mouseRect, origRect, unmodRect; HDC hdc; LONG hittest = (LONG)(wParam & 0x0f); +#ifdef NEW_CURSORICON + PCURICON_OBJECT DragCursor = NULL, OldCursor = NULL; +#else HCURSOR hDragCursor = 0, hOldCursor = 0; +#endif POINT minTrack, maxTrack; POINT capturePoint, pt; ULONG Style, ExStyle; @@ -495,13 +499,35 @@ } hdc = UserGetDCEx( pWndParent, 0, DCX_CACHE ); - +#ifdef NEW_CURSORICON + if (iconic) + { + DragCursor = pwnd->pcls->spicn; + if (DragCursor) + { + UserReferenceObject(DragCursor); + } + else + { + HCURSOR CursorHandle = (HCURSOR)co_IntSendMessage( UserHMGetHandle(pwnd), WM_QUERYDRAGICON, 0, 0 ); + if (CursorHandle) + { + DragCursor = UserGetCurIconObject(CursorHandle); + } + else + { + iconic = FALSE; + } + } + } +#else if ( iconic ) /* create a cursor for dragging */ { - hDragCursor = pwnd->pcls->hIcon;; + hDragCursor = pwnd->pcls->hIcon; if ( !hDragCursor ) hDragCursor = (HCURSOR)co_IntSendMessage( UserHMGetHandle(pwnd), WM_QUERYDRAGICON, 0, 0 ); if ( !hDragCursor ) iconic = FALSE; } +#endif /* repaint the window before moving it around */ co_UserRedrawWindow( pwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN); @@ -558,14 +584,17 @@ if ( !moved ) { moved = TRUE; - - if ( iconic ) /* ok, no system popup tracking */ - { - hOldCursor = IntSetCursor(hDragCursor); - UserShowCursor( TRUE ); - } - else if(!DragFullWindows) - UserDrawMovingFrame( hdc, &sizingRect, thickframe ); + if ( iconic ) /* ok, no system popup tracking */ + { +#ifdef NEW_CURSORICON + OldCursor = UserSetCursor(DragCursor, FALSE); +#else + hOldCursor = IntSetCursor(hDragCursor); +#endif + UserShowCursor( TRUE ); + } + else if(!DragFullWindows) + UserDrawMovingFrame( hdc, &sizingRect, thickframe ); } if (msg.message == WM_KEYDOWN) UserSetCursorPos(pt.x, pt.y, 0, 0, FALSE); @@ -644,10 +673,18 @@ { if ( moved ) /* restore cursors, show icon title later on */ { - UserShowCursor( FALSE ); - IntSetCursor( hOldCursor ); - } + UserShowCursor( FALSE ); +#ifdef NEW_CURSORICON + UserSetCursor(OldCursor, FALSE); +#else + IntSetCursor( hOldCursor ); +#endif + } +#ifdef NEW_CURSORICON + UserDereferenceObject(DragCursor); +#else IntDestroyCursor( hDragCursor, FALSE ); +#endif } else if ( moved && !DragFullWindows ) UserDrawMovingFrame( hdc, &sizingRect, thickframe ); @@ -990,6 +1027,19 @@ hDC = IntBeginPaint(Wnd, &Ps); if (hDC) { +#ifdef NEW_CURSORICON + if (((Wnd->style & WS_MINIMIZE) != 0) && (Wnd->pcls->spicn)) + { + RECT ClientRect; + INT x, y; + + ERR("Doing Paint and Client area is empty!\n"); + IntGetClientRect(Wnd, &ClientRect); + x = (ClientRect.right - ClientRect.left - UserGetSystemMetrics(SM_CXICON)) / 2; + y = (ClientRect.bottom - ClientRect.top - UserGetSystemMetrics(SM_CYICON)) / 2; + UserDrawIconEx(hDC, x, y, Wnd->pcls->spicn, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE); + } +#else HICON hIcon; if (((Wnd->style & WS_MINIMIZE) != 0) && (hIcon = Wnd->pcls->hIcon)) { @@ -1002,7 +1052,9 @@ x = (ClientRect.right - ClientRect.left - UserGetSystemMetrics(SM_CXICON)) / 2; y = (ClientRect.bottom - ClientRect.top - UserGetSystemMetrics(SM_CYICON)) / 2; UserDrawIconEx( hDC, x, y, pIcon, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE ); + UserDereferenceObject(pIcon) } +#endif IntEndPaint(Wnd, &Ps); } return (0); @@ -1096,23 +1148,38 @@ return lResult; } -HICON FASTCALL NC_IconForWindow( PWND pWnd ) +PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd ) { - HICON hIcon = 0; + PCURICON_OBJECT pIcon = NULL; + HICON hIcon; // First thing to do, init the Window Logo icons. if (!gpsi->hIconSmWindows) co_IntSetWndIcons(); - if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); + //FIXME: Some callers use this function as if it returns a boolean saying "this window has an icon". + //FIXME: Hence we must return a pointer with no reference count. + //FIXME: This is bad and we should feel bad. + + hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); - if (!hIcon) hIcon = pWnd->pcls->hIconSm; - if (!hIcon) hIcon = pWnd->pcls->hIcon; - - if (!hIcon && pWnd->style & DS_MODALFRAME) + if (!hIcon && pWnd->pcls->spicnSm) + return pWnd->pcls->spicnSm; + if (!hIcon && pWnd->pcls->spicn) + return pWnd->pcls->spicn; + + if (!hIcon && (pWnd->style & DS_MODALFRAME)) { if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size. } - return hIcon; + if (hIcon) + { + pIcon = UserGetCurIconObject(hIcon); + if (pIcon) + { + UserDereferenceObject(pIcon); + } + } + return pIcon; } DWORD FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -238,6 +238,11 @@ ppiCurrent->hdeskStartup = NULL; } +#ifdef NEW_CURSORICON + /* Clean up the process icon cache */ + IntCleanupCurIconCache(ppiCurrent); +#endif + /* The process is dying */ PsSetProcessWin32Process(Process, NULL, ppiCurrent); ppiCurrent->peProcess = NULL; Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -218,7 +218,11 @@ { NULL, NULL, NULL }, /* TYPE_FREE */ { AllocDeskThreadObject, co_UserDestroyWindow, FreeDeskThreadObject }, /* TYPE_WINDOW */ { AllocDeskProcObject, UserDestroyMenuObject, FreeDeskProcObject }, /* TYPE_MENU */ +#ifndef NEW_CURSORICON { AllocProcMarkObject, /*UserCursorCleanup*/NULL, FreeProcMarkObject }, /* TYPE_CURSOR */ +#else + { AllocProcMarkObject, IntDestroyCurIconObject, FreeProcMarkObject }, /* TYPE_CURSOR */ +#endif { AllocSysObject, /*UserSetWindowPosCleanup*/NULL, FreeSysObject }, /* TYPE_SETWINDOWPOS */ { AllocDeskThreadObject, IntRemoveHook, FreeDeskThreadObject }, /* TYPE_HOOK */ { AllocSysObject, /*UserClipDataCleanup*/NULL,FreeSysObject }, /* TYPE_CLIPDATA */ @@ -686,6 +690,7 @@ return object; } +#ifndef NEW_CURSORICON VOID FASTCALL UserSetObjectOwner(PVOID obj, HANDLE_TYPE type, PVOID owner) @@ -720,6 +725,7 @@ ppi->UserHandleCount++; IntReferenceProcessInfo(ppi); } +#endif BOOLEAN UserDestroyObjectsForOwner(PUSER_HANDLE_TABLE Table, PVOID Owner) @@ -740,6 +746,7 @@ if (Entry->flags & HANDLEENTRY_INDESTROY) continue; +#ifndef NEW_CURSORICON /* Spcial case for cursors until cursoricon_new is there */ if (Entry->type == TYPE_CURSOR) { @@ -750,6 +757,7 @@ } continue; } +#endif /* Call destructor */ if (!ObjectCallbacks[Entry->type].ObjectDestroy(Entry->ptr)) Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -17,7 +17,9 @@ BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); void DbgUserDumpHandleTable(); +#ifndef NEW_CURSORICON VOID FASTCALL UserSetObjectOwner(PVOID obj, HANDLE_TYPE type, PVOID owner); +#endif PVOID FASTCALL ValidateHandle(HANDLE handle, HANDLE_TYPE type); BOOLEAN UserDestroyObjectsForOwner(PUSER_HANDLE_TABLE Table, PVOID Owner); Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -2122,13 +2122,17 @@ { PCURICON_OBJECT pIcon = NULL; - if (!hIcon && pWnd) - { - hIcon = NC_IconForWindow( pWnd ); - } - if (hIcon) - pIcon = UserGetCurIconObject(hIcon); + { + pIcon = UserGetCurIconObject(hIcon); + } + else if (pWnd) + { + pIcon = NC_IconForWindow(pWnd); + // FIXME: NC_IconForWindow should reference it for us */ + if (pIcon) + UserReferenceObject(pIcon); + } if (pIcon) { Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -10,4 +10,4 @@ BOOL FASTCALL IntIsWindowDirty(PWND); BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); -HICON FASTCALL NC_IconForWindow( PWND ); +PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND ); Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Tue Oct 21 18:59:44 2014 @@ -403,8 +403,7 @@ Flags |= DCX_CLIPCHILDREN; } /* If minized with icon in the set, we are forced to be cheap! */ - if (Wnd->style & WS_MINIMIZE && - Wnd->pcls->hIcon) + if (Wnd->style & WS_MINIMIZE && Wnd->pcls->spicn) { Flags |= DCX_CACHE; } 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] Tue Oct 21 18:59:44 2014 @@ -1674,7 +1674,24 @@ } pWnd->head.pti->cWindows++; - +#ifdef NEW_CURSORICON + if (Class->spicn && !Class->spicnSm) + { + HICON IconSmHandle = co_IntCopyImage( + UserHMGetHandle(Class->spicn), + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + 0); + 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; + } + } +#else if (Class->hIcon && !Class->hIconSm) { Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON, @@ -1683,6 +1700,7 @@ TRACE("IntCreateWindow hIconSmIntern %p\n",Class->hIconSmIntern); Class->CSF_flags |= CSF_CACHEDSMICON; } +#endif if (pWnd->pcls->CSF_flags & CSF_SERVERSIDEPROC) pWnd->state |= WNDS_SERVERSIDEWINDOWPROC; 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] Tue Oct 21 18:59:44 2014 @@ -712,7 +712,19 @@ case GCW_ATOM: Ret = (ULONG_PTR)Class->atomClassName; break; - +#ifdef NEW_CURSORICON + case GCLP_HCURSOR: + Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0; + break; + + case GCLP_HICON: + Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0; + break; + + case GCLP_HICONSM: + Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0; + break; +#else case GCLP_HCURSOR: /* FIXME - get handle from pointer to CURSOR object */ Ret = (ULONG_PTR)Class->hCursor; @@ -727,6 +739,7 @@ /* FIXME - get handle from pointer to ICON object */ Ret = (ULONG_PTR)(Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern); break; +#endif case GCLP_WNDPROC: Ret = IntGetClsWndProc(Wnd, Class, TRUE); @@ -790,6 +803,19 @@ Ret = (ULONG_PTR)Class->atomClassName; break; +#ifdef NEW_CURSORICON + case GCLP_HCURSOR: + Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0; + break; + + case GCLP_HICON: + Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0; + break; + + case GCLP_HICONSM: + Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0; + break; +#else case GCLP_HCURSOR: /* FIXME - get handle from pointer to CURSOR object */ Ret = (ULONG_PTR)Class->hCursor; @@ -804,6 +830,7 @@ /* FIXME - get handle from pointer to ICON object */ Ret = (ULONG_PTR)(Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern); break; +#endif case GCLP_WNDPROC: Ret = IntGetClsWndProc(Wnd, Class, FALSE);

1 0

[jgardou] 64876: [WIN32K] - Use the first frame of an animated cursor in case we're trying to use one.
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 18:59:39 2014 New Revision: 64876 URL: http://svn.reactos.org/svn/reactos?rev=64876&view=rev Log: [WIN32K] - Use the first frame of an animated cursor in case we're trying to use one. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Oct 21 18:59:39 2014 @@ -146,14 +146,20 @@ { /* Call GDI to set the new screen cursor */ #ifdef NEW_CURSORICON + PCURICON_OBJECT CursorFrame = NewCursor; + if(NewCursor->CURSORF_flags & CURSORF_ACON) + { + FIXME("Should animate the cursor, using only the first frame now.\n"); + CursorFrame = ((PACON)NewCursor)->aspcur[0]; + } GreSetPointerShape(hdcScreen, - NewCursor->hbmAlpha ? NULL : NewCursor->hbmMask, - NewCursor->hbmAlpha ? NewCursor->hbmAlpha : NewCursor->hbmColor, - NewCursor->xHotspot, - NewCursor->yHotspot, + CursorFrame->hbmAlpha ? NULL : NewCursor->hbmMask, + CursorFrame->hbmAlpha ? NewCursor->hbmAlpha : NewCursor->hbmColor, + CursorFrame->xHotspot, + CursorFrame->yHotspot, gpsi->ptCursor.x, gpsi->ptCursor.y, - NewCursor->hbmAlpha ? SPS_ALPHA : 0); + CursorFrame->hbmAlpha ? SPS_ALPHA : 0); #else GreSetPointerShape(hdcScreen, NewCursor->IconInfo.hbmMask,

1 0

[jgardou] 64875: [WIN32K] - Refcount++ the process info when we're adding it to a cursor process list. CORE-8661
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 18:59:34 2014 New Revision: 64875 URL: http://svn.reactos.org/svn/reactos?rev=64875&view=rev Log: [WIN32K] - Refcount++ the process info when we're adding it to a cursor process list. CORE-8661 Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c 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] Tue Oct 21 18:59:34 2014 @@ -169,6 +169,7 @@ } InsertHeadList(&CurIcon->ProcessList, &Current->ListEntry); Current->Process = Win32Process; + IntReferenceProcessInfo(Win32Process); return TRUE; } @@ -273,6 +274,7 @@ { bFound = TRUE; bListEmpty = RemoveEntryList(&Current->ListEntry); + IntDereferenceProcessInfo(ppi); break; } }

1 0

[akhaldi] 64874: [KERNEL32] * Sync casemap.c with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: akhaldi Date: Tue Oct 21 18:42:12 2014 New Revision: 64874 URL: http://svn.reactos.org/svn/reactos?rev=64874&view=rev Log: [KERNEL32] * Sync casemap.c with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c [iso-8859-1] Tue Oct 21 18:42:12 2014 @@ -3,7 +3,7 @@ #include <wine/unicode.h> -const WCHAR wine_casemap_lower[3802] = +const WCHAR wine_casemap_lower[3807] = { /* index */ 0x01bf, 0x02bf, 0x03bf, 0x044f, 0x054f, 0x064f, 0x0100, 0x0100, @@ -26,18 +26,18 @@ 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0c1d, 0x0cfb, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0dda, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0c22, 0x0d00, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0ddf, /* defaults */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -164,7 +164,7 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0370 .. 0x03ff */ 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0074, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0026, 0x0000, 0x0025, 0x0025, 0x0025, 0x0000, 0x0040, 0x0000, 0x003f, 0x003f, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, @@ -219,8 +219,8 @@ 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, @@ -252,8 +252,8 @@ 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, - 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x0000, 0x1c60, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1c60, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -408,39 +408,40 @@ 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - /* 0xa612 .. 0xa6ff */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xa60d .. 0xa6ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, /* 0xa722 .. 0xa7ff */ 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, @@ -455,11 +456,11 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x75fc, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0000, 0x5ad8, 0x0000, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x5abc, 0x5ab1, 0x5ab5, 0x5abf, 0x0000, 0x0000, 0x5aee, 0x5ad6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -634,15 +635,15 @@ 0x2a3f, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x2a1f, 0x2a1c, 0x2a1e, 0xff2e, 0xff32, 0x0000, 0xff33, 0xff33, - 0x0000, 0xff36, 0x0000, 0xff35, 0x0000, 0x0000, 0x0000, 0x0000, - 0xff33, 0x0000, 0x0000, 0xff31, 0x0000, 0x0000, 0x0000, 0x0000, - 0xff2f, 0xff2d, 0x0000, 0x29f7, 0x0000, 0x0000, 0x0000, 0xff2d, + 0x0000, 0xff36, 0x0000, 0xff35, 0xa54f, 0x0000, 0x0000, 0x0000, + 0xff33, 0xa54b, 0x0000, 0xff31, 0x0000, 0xa528, 0xa544, 0x0000, + 0xff2f, 0xff2d, 0x0000, 0x29f7, 0xa541, 0x0000, 0x0000, 0xff2d, 0x0000, 0x29fd, 0xff2b, 0x0000, 0x0000, 0xff2a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x29e7, 0x0000, 0x0000, - 0xff26, 0x0000, 0x0000, 0xff26, 0x0000, 0x0000, 0x0000, 0x0000, + 0xff26, 0x0000, 0x0000, 0xff26, 0x0000, 0x0000, 0x0000, 0xa52a, 0xff26, 0xffbb, 0xff27, 0xff27, 0xffb9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff25, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa512, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -677,7 +678,7 @@ 0xffd1, 0xffca, 0xfff8, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, - 0xffff, 0x0000, 0xffff, 0xffaa, 0xffb0, 0x0007, 0x0000, 0x0000, + 0xffff, 0x0000, 0xffff, 0xffaa, 0xffb0, 0x0007, 0xff8c, 0x0000, 0xffa0, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0404 .. 0x04ff */ @@ -718,8 +719,8 @@ 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, - 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -908,7 +909,7 @@ 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, - 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2d00 .. 0x2dff */ @@ -916,8 +917,8 @@ 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, - 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0x0000, 0xe3a0, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xe3a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -949,14 +950,14 @@ 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, - 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -983,10 +984,10 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, - 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1024,41 +1025,41 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const WCHAR wine_digitmap[5837] = +const WCHAR wine_digitmap[5933] = { /* index */ 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x028a, 0x0384, - 0x0100, 0x044e, 0x053e, 0x062e, 0x071e, 0x080e, 0x08be, 0x099e, - 0x0a5e, 0x0100, 0x0100, 0x0af8, 0x0100, 0x0100, 0x0100, 0x0b6a, - 0x0c5a, 0x0d14, 0x0def, 0x0e9f, 0x0f5f, 0x0100, 0x0100, 0x0100, - 0x0fef, 0x0100, 0x0100, 0x0100, 0x108f, 0x0100, 0x0100, 0x118f, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x126f, 0x0100, - 0x129f, 0x139f, 0x1479, 0x14d3, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x15cd, + 0x0100, 0x044e, 0x053e, 0x062e, 0x071e, 0x080e, 0x08fe, 0x09de, + 0x0a9e, 0x0100, 0x0100, 0x0b38, 0x0100, 0x0100, 0x0100, 0x0baa, + 0x0c9a, 0x0d54, 0x0e2f, 0x0edf, 0x0f9f, 0x0100, 0x0100, 0x0100, + 0x102f, 0x0100, 0x0100, 0x0100, 0x10cf, 0x0100, 0x0100, 0x11cf, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x12af, 0x0100, + 0x12df, 0x13df, 0x14d9, 0x1533, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x162d, /* defaults */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1324,11 +1325,19 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - /* 0x0e50 .. 0x0eff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf24a, 0xf24a, + 0xf24a, 0xf24a, 0xf24a, 0xf24a, 0xf24a, 0xf24a, 0xf24a, 0xf24a, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0e10 .. 0x0eff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1715,9 +1724,13 @@ 0x5660, 0x5660, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - /* 0xaa26 .. 0xaaff */ + 0x5640, 0x5640, 0x5640, 0x5640, 0x5640, 0x5640, 0x5640, 0x5640, + 0x5640, 0x5640, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xaa06 .. 0xaaff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1900,7 +1913,7 @@ 0x5e4a, 0x0000, 0x6c62, 0x0000, 0x0000, 0x57c9, 0x7914, 0x7cb3, 0x7f24, 0x7f45, 0x7f4b, 0x7f74, 0x9d3a, 0x82a1, 0x859f, 0x0000, 0x8bf2, 0x0000, 0x90d6, 0x0000, 0x0000, 0x9613, 0x96d7, 0x0000, - 0x0000, 0x0000, 0x9ec5, 0x9ed1, 0x9efc, 0xa387, 0x0000, 0x0000, + 0x0000, 0x0000, 0x9ec5, 0x9ed1, 0x9efc, 0xa387, 0x96b0, 0x9c88, 0x557e, 0x56b6, 0x571b, 0x5896, 0x58b0, 0x591c, 0x5b67, 0x5bcf, 0x5c30, 0x5e07, 0x5e6e, 0x6229, 0x6232, 0x6657, 0x672a, 0x674f, 0x67b2, 0x6b0e, 0x6ba0, 0x6c4e, 0x6e41, 0x7332, 0x73d4, 0x74db, Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Oct 21 18:42:12 2014 @@ -269,7 +269,7 @@ reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 reactos/dll/win32/kernel32/wine/profile.c # Synced in r52754 reactos/dll/win32/kernel32/wine/res.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to Wine-1.7.27 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/collation.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to Wine-1.7.27

1 0

[akhaldi] 64873: [IP] * Zap tcp_state_str.
by akhaldi＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: akhaldi Date: Tue Oct 21 18:39:22 2014 New Revision: 64873 URL: http://svn.reactos.org/svn/reactos?rev=64873&view=rev Log: [IP] * Zap tcp_state_str. Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Tue Oct 21 18:39:22 2014 @@ -15,20 +15,6 @@ #include "lwip/api.h" #include "rosip.h" - -static const char * const tcp_state_str[] = { - "CLOSED", - "LISTEN", - "SYN_SENT", - "SYN_RCVD", - "ESTABLISHED", - "FIN_WAIT_1", - "FIN_WAIT_2", - "CLOSE_WAIT", - "CLOSING", - "LAST_ACK", - "TIME_WAIT" -}; extern NPAGED_LOOKASIDE_LIST TdiBucketLookasideList;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014