Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[gvg] 15839: Revert r15838 since it breaks the build

by gvg＠svn.reactos.com

Revert r15838 since it breaks the build Modified: trunk/reactos/w32api/include/ws2tcpip.h _____ Modified: trunk/reactos/w32api/include/ws2tcpip.h --- trunk/reactos/w32api/include/ws2tcpip.h 2005-06-07 22:04:54 UTC (rev 15838) +++ trunk/reactos/w32api/include/ws2tcpip.h 2005-06-07 23:11:35 UTC (rev 15839) @@ -306,15 +306,8 @@ #define gai_strerror gai_strerrorA #endif /* UNICODE */ -int WSAAPI getnameinfoA(const struct sockaddr*,socklen_t,char*,DWORD, - char*,DWORD,int); -int WSAAPI getnameinfoW(const struct sockaddr*,socklen_t,WCHAR*,DWORD, - WCHAR*,DWORD,int); -#ifdef UNICODE -#define getnameinfo getnameinfoW -#else -#define getnameinfo getnameinfoA -#endif /* UNICODE */ +int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD, + char*,DWORD,int); /* Some older IPv4/IPv6 compatability stuff */

19 years, 6 months

[gvg] 15838: Add getnameinfoA/W

by gvg＠svn.reactos.com

Add getnameinfoA/W Modified: trunk/reactos/w32api/include/ws2tcpip.h _____ Modified: trunk/reactos/w32api/include/ws2tcpip.h --- trunk/reactos/w32api/include/ws2tcpip.h 2005-06-07 21:23:30 UTC (rev 15837) +++ trunk/reactos/w32api/include/ws2tcpip.h 2005-06-07 22:04:54 UTC (rev 15838) @@ -306,8 +306,15 @@ #define gai_strerror gai_strerrorA #endif /* UNICODE */ -int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD, - char*,DWORD,int); +int WSAAPI getnameinfoA(const struct sockaddr*,socklen_t,char*,DWORD, + char*,DWORD,int); +int WSAAPI getnameinfoW(const struct sockaddr*,socklen_t,WCHAR*,DWORD, + WCHAR*,DWORD,int); +#ifdef UNICODE +#define getnameinfo getnameinfoW +#else +#define getnameinfo getnameinfoA +#endif /* UNICODE */ /* Some older IPv4/IPv6 compatability stuff */

19 years, 6 months

[navaraf] 15837: Fix prototypes for non-GDI_DEBUG case.

by navaraf＠svn.reactos.com

Fix prototypes for non-GDI_DEBUG case. Modified: trunk/reactos/include/win32k/gdiobj.h _____ Modified: trunk/reactos/include/win32k/gdiobj.h --- trunk/reactos/include/win32k/gdiobj.h 2005-06-07 20:15:16 UTC (rev 15836) +++ trunk/reactos/include/win32k/gdiobj.h 2005-06-07 21:23:30 UTC (rev 15837) @@ -103,6 +103,7 @@ HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(ULONG ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObj (HGDIOBJ hObj, DWORD ObjectType); +PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType); #endif /* GDI_DEBUG */

19 years, 6 months

[hbirr] 15836: Changed back to the GPL.

by hbirr＠svn.reactos.com

Changed back to the GPL. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-07 20:10:16 UTC (rev 15835) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-07 20:15:16 UTC (rev 15836) @@ -2,19 +2,19 @@ * * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programmers section) * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * PROJECT: ReactOS kernel @@ -26,10 +26,10 @@ * Hartmut Birr * Ge van Geldorp * Eric Kohl - * silverblade + * Andrew Greenwood * James Tabor * Alex Ionescu - * tamlin + * Mike Nordell * Thomas Weidenmueller * Filip Navara * KJK::Hyperion _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-06-07 20:10:16 UTC (rev 15835) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-06-07 20:15:16 UTC (rev 15836) @@ -2,19 +2,19 @@ * * Copyright (C) 2002-2005 ReactOS Team (and the authors from the programmers section) * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * PROJECT: ReactOS kernel _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-06-07 20:10:16 UTC (rev 15835) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-06-07 20:15:16 UTC (rev 15836) @@ -2,19 +2,19 @@ * * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programmers section) * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * PROJECT: ReactOS kernel @@ -34,7 +34,7 @@ * Jason Filby * Thomas Weidenmueller * Gunnar Andre' Dalsnes - * tamlin + * Mike Nordell * Alex Ionescu * Filip Navara * Herve Poussineau _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-06-07 20:10:16 UTC (rev 15835) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-06-07 20:15:16 UTC (rev 15836) @@ -2,19 +2,19 @@ * * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programmers section) * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * PROJECT: ReactOS kernel @@ -37,7 +37,7 @@ * Jason Filby * Thomas Weidenmueller * Gunnar Andre' Dalsnes - * tamlin + * Mike Nordell * Alex Ionescu * Gregor Anich * Steven Edwards

19 years, 6 months

[navaraf] 15835: Fix a cut & paste mistake.

by navaraf＠svn.reactos.com

Fix a cut & paste mistake. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-06-07 20:02:22 UTC (rev 15834) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-06-07 20:10:16 UTC (rev 15835) @@ -2577,7 +2577,7 @@ hFont = Dc->w.hFont; DC_UnlockDc(Dc); - TextObj = TEXTOBJ_LockText(Dc->w.hFont); + TextObj = TEXTOBJ_LockText(hFont); ASSERT(TextObj != NULL); Count = min(Count, wcslen(TextObj->logfont.lfFaceName)); Status = MmCopyToCaller(FaceName, TextObj->logfont.lfFaceName, Count * sizeof(WCHAR));

19 years, 6 months

[navaraf] 15834: - Repair GDI handle debugging functionality.

by navaraf＠svn.reactos.com

- Repair GDI handle debugging functionality. - Fix locking in NtGdiGetTextFace. Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-07 17:13:38 UTC (rev 15833) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-07 20:02:22 UTC (rev 15834) @@ -559,6 +559,9 @@ * The object is currently locked, so freeing is forbidden! */ DPRINT1("GdiHdr->Locks: %d\n", GdiHdr->Locks); +#ifdef GDI_DEBUG + DPRINT1("Locked from: %s:%d\n", GdiHdr->lockfile, GdiHdr->lockline); +#endif ASSERT(FALSE); } } @@ -781,6 +784,10 @@ { GdiHdr->LockingThread = Thread; GdiHdr->Locks = 1; +#ifdef GDI_DEBUG + GdiHdr->lockfile = file; + GdiHdr->lockline = line; +#endif Object = HandleEntry->KernelData; } else @@ -925,7 +932,15 @@ { PGDIOBJHDR GdiHdr = GDIBdyToHdr(HandleEntry->KernelData); +#ifdef GDI_DEBUG + if (InterlockedIncrement(&GdiHdr->Locks) == 1) + { + GdiHdr->lockfile = file; + GdiHdr->lockline = line; + } +#else InterlockedIncrement(&GdiHdr->Locks); +#endif Object = HandleEntry->KernelData; } else _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-06-07 17:13:38 UTC (rev 15833) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-06-07 20:02:22 UTC (rev 15834) @@ -2564,6 +2564,7 @@ NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName) { PDC Dc; + HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; @@ -2573,11 +2574,14 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - TextObj = TEXTOBJ_LockText(Dc->w.hFont); + hFont = Dc->w.hFont; DC_UnlockDc(Dc); + TextObj = TEXTOBJ_LockText(Dc->w.hFont); + ASSERT(TextObj != NULL); Count = min(Count, wcslen(TextObj->logfont.lfFaceName)); Status = MmCopyToCaller(FaceName, TextObj->logfont.lfFaceName, Count * sizeof(WCHAR)); + TEXTOBJ_UnlockText(TextObj); if (!NT_SUCCESS(Status)) { SetLastNtError(Status);

19 years, 6 months

[mf] 15833: sync winefile resource wcripts with WINE and adjust INFO entries

by mf＠svn.reactos.com

sync winefile resource wcripts with WINE and adjust INFO entries Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -143,11 +143,7 @@ MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "Information om &Winefile...", ID_ABOUT -/* POPUP "Info..." { - MENUITEM "Info about &Wine..." , ID_ABOUT_WINE - MENUITEM "&License..." ID_LICENSE - MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - } */ + MENUITEM "Info about &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -140,12 +140,8 @@ MENUITEM "HledßnÝ v &nßpovýdý...\tF1" , ID_HELP MENUITEM "&Jak pou×Ývat nßpovýdu\tF1" , ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "Informace o &Winefile..." , ID_ABOUT -/* POPUP "Info..." { - MENUITEM "Informace o &Wine..." , ID_ABOUT_WINE -// MENUITEM "&Licence..." ID_LICENSE -// MENUITEM "&BEZ Z?RUKY" ID_NO_WARRANTY - } */ + MENUITEM "&Informace o Winefile..." , ID_ABOUT + MENUITEM "Informace o &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -139,12 +139,7 @@ MENUITEM "Hilfe &verwenden\tF1" , ID_HELP_USING MENUITEM SEPARATOR MENUITEM "&Info ³ber Winefile..." , ID_ABOUT -/* POPUP "Inf&o..." { - MENUITEM "Info ³ber &Wine..." , ID_ABOUT_WINE - MENUITEM "&Lizenz" ID_LICENSE - MENUITEM "&KEINE GARANTIE" ID_NO_WARRANTY - } -*/ + MENUITEM "Info ³ber &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -142,12 +142,8 @@ MENUITEM "Help &Search...\tF1" , ID_HELP MENUITEM "&Using Help\tF1" , ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "Info about &Winefile..." , ID_ABOUT -/* POPUP "Info..." { - MENUITEM "Info about &Wine..." , ID_ABOUT_WINE -// MENUITEM "&License..." ID_LICENSE -// MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - } */ + MENUITEM "&Info about Winefile..." , ID_ABOUT + MENUITEM "Info about &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -58,7 +58,7 @@ MENUITEM SEPARATOR MENUITEM "&Formatear disco..." , ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Hacer disco de sistema...", -1 /*@@ */ + MENUITEM "&Hacer disco de sistema...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "C&onectar unidad de red" , ID_CONNECT_NETWORK_DRIVE @@ -138,13 +138,8 @@ MENUITEM "&Buscar en la ayuda...\tF1" , ID_HELP MENUITEM "&Usando la ayuda\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "&Informaci¾n..." { - MENUITEM "Acerca de &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&Licencia..." ID_LICENSE - * MENUITEM "&SIN GARANT?A" ID_NO_WARRANTY - */ - } + MENUITEM "&Acerca de Winefile..." , ID_ABOUT + MENUITEM "Acerca de &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -141,13 +141,8 @@ MENUITEM "&Rechercher dans l'aide\tF1" , ID_HELP MENUITEM "&Utiliser l'aide\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "Info..." { - MENUITEM "A propos de &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&Licence..." ID_LICENSE - * MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - */ - } + MENUITEM "&A propos de Winefile..." , ID_ABOUT + MENUITEM "A propos de &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -141,13 +141,8 @@ MENUITEM "S·g¾ &keresÚs...\tF1" , ID_HELP MENUITEM "&Hasznßlat\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "Informßci¾..." { - MENUITEM "&Wine-r¾l..." , ID_ABOUT_WINE -/* - * MENUITEM "&License..." ID_LICENSE - * MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - */ - } + MENUITEM "&Winefile-r¾l..." , ID_ABOUT + MENUITEM "W&ine-r¾l..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -141,13 +141,8 @@ MENUITEM "&Cerca nella Guida...\tF1" , ID_HELP MENUITEM "&Uso dell Guida\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "Info..." { - MENUITEM "Informazioni su &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&Licenza..." ID_LICENSE - * MENUITEM "&Garanzia" ID_NO_WARRANTY - */ - } + MENUITEM "&Informazioni su Winefile..." , ID_ABOUT + MENUITEM "Informazioni su &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -137,13 +137,8 @@ MENUITEM "&Zoeken...\tF1" , ID_HELP MENUITEM "&Instructie\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "Info..." { - MENUITEM "Over &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&Licentie..." ID_LICENSE - * MENUITEM "&GEEN GARANTIE" ID_NO_WARRANTY - */ - } + MENUITEM "&Over Winefile..." , ID_ABOUT + MENUITEM "Over &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -141,13 +141,8 @@ MENUITEM "&Szukaj..." , ID_HELP MENUITEM "&U?ywanie pomocy" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "O programie..." { - MENUITEM "&Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&Licencja..." ID_LICENSE - * MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - */ - } + MENUITEM "&Winefile..." , ID_ABOUT + MENUITEM "W&ine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -113,7 +113,7 @@ #endif MENUITEM SEPARATOR MENUITEM "&Minimizar durante o uso" , 504 - MENUITEM "&Salvar configuraþ§es ao sair" , 511 /* FIXME */ + MENUITEM "&Salvar configuraþ§es ao sair" , 511 } @@ -140,13 +140,8 @@ MENUITEM "Pesquisar..." , ID_HELP MENUITEM "&Usando a ajuda" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "&Informaþ§es..." { - MENUITEM "Sobre o &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&License..." ID_LICENSE - * MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - */ - } + MENUITEM "&Sobre o Winefile..." , ID_ABOUT + MENUITEM "Sobre o &Wine..." , ID_ABOUT_WINE } } @@ -268,13 +263,7 @@ MENUITEM "Pesquisar..." , ID_HELP MENUITEM "&Usando a ajuda" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "&Informaþ§es..." { - MENUITEM "Acerca do &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&Licenþa..." ID_LICENSE - * MENUITEM "&SEM GARANTIA" ID_NO_WARRANTY - */ - } + MENUITEM "Acerca do &Wine..." , ID_ABOUT_WINE } } @@ -340,3 +329,4 @@ IDS_COL_ATTR "Atributos" IDS_COL_SEC "Seguranþa" } + _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -137,13 +137,8 @@ MENUITEM "&¤¯Þ±Û...\tF1" , ID_HELP MENUITEM "&?±´¯Ù³þ¯ÔÓÝÞÕ ±´ÓÔÛÞ\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "&ÐÔÕõÕÝÞ ..." { - MENUITEM "&? Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&?Þ÷ÕÝþÞ ..." ID_LICENSE - * MENUITEM "&??Ã ??ð??Ê??" ID_NO_WARRANTY - */ - } + MENUITEM "&? Winefile..." , ID_ABOUT + MENUITEM "? &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -138,13 +138,8 @@ MENUITEM "Help &Search...\tF1" , ID_HELP MENUITEM "&Using Help\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "Info..." { - MENUITEM "Info about &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "&License..." ID_LICENSE - * MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - */ - } + MENUITEM "&Info about Winefile..." , ID_ABOUT + MENUITEM "Info about &Wine..." , ID_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-06-07 17:07:34 UTC (rev 15832) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-06-07 17:13:38 UTC (rev 15833) @@ -111,7 +111,7 @@ #endif MENUITEM SEPARATOR MENUITEM "&Minimize on run" , 504 - MENUITEM "&Einstellungen beim Beenden speichern" , 511 + MENUITEM "&Save settings on exit" , 511 } @@ -138,13 +138,8 @@ MENUITEM "?Ð?¸?´Í·ú¿&Sú®...\tF1" , ID_HELP MENUITEM "??Ë??´Í·ú¿&Uú®\tF1" , ID_HELP_USING MENUITEM SEPARATOR - POPUP "Î??¤ð?¤ó..." { - MENUITEM "?ÏË? &Wine..." , ID_ABOUT_WINE -/* - * MENUITEM "Ë??ºðÝ??ð¡ÊÚú¿&Lú®..." ID_LICENSE - * MENUITEM "È???Ì?Ïú¿&Nú®" ID_NO_WARRANTY - */ - } + MENUITEM "&?ÏË? Winefile..." , ID_ABOUT + MENUITEM "?ÏË? &Wine..." , ID_ABOUT_WINE } }

19 years, 6 months

[hbirr] 15832: - Removed the process member from the memory area structure.

by hbirr＠svn.reactos.com

- Removed the process member from the memory area structure. - Add the copyright notice and all programmers. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-07 16:54:15 UTC (rev 15831) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-07 17:07:34 UTC (rev 15832) @@ -1,5 +1,40 @@ -/* - * Higher level memory managment definitions +/* $Id$ + * + * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programmers section) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/include/internal/mm.h + * PURPOSE: level memory managment definitions + * + * PROGRAMMERS: David Welch + * Casper Hornstrup + * Hartmut Birr + * Ge van Geldorp + * Eric Kohl + * silverblade + * James Tabor + * Alex Ionescu + * tamlin + * Thomas Weidenmueller + * Filip Navara + * KJK::Hyperion + * Gregor Anich + * Steven Edwards */ #ifndef __INCLUDE_INTERNAL_MM_H @@ -218,7 +253,6 @@ ULONG Type; ULONG Attributes; ULONG LockCount; - struct _EPROCESS* Process; /* FIXME: We don't need this! */ BOOLEAN DeleteInProgress; ULONG PageOpCount; union _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-06-07 16:54:15 UTC (rev 15831) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-06-07 17:07:34 UTC (rev 15832) @@ -1,11 +1,42 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory + * Copyright (C) 2002-2005 ReactOS Team (and the authors from the programmers section) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/anonmem.c * PURPOSE: Implementing anonymous memory. * * PROGRAMMERS: David Welch + * Hartmut Birr + * Casper Hornstrup + * KJK::Hyperion + * Ge van Geldorp + * Eric Kohl + * Royce Mitchell III + * Aleksey Bragin + * Jason Filby + * Art Yerkes + * Gunnar Andre' Dalsnes + * Filip Navara + * Thomas Weidenmueller + * Alex Ionescu + * Trevor McCort + * Steven Edwards */ /* INCLUDE *****************************************************************/ @@ -42,7 +73,7 @@ /* * Get that the page actually is dirty. */ - if (!MmIsDirtyPage(MemoryArea->Process, Address)) + if (!MmIsDirtyPage(AddressSpace->Process, Address)) { PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -53,7 +84,7 @@ /* * Speculatively set the mapping to clean. */ - MmSetCleanPage(MemoryArea->Process, Address); + MmSetCleanPage(AddressSpace->Process, Address); /* * If necessary, allocate an entry in the paging file for this page @@ -64,7 +95,7 @@ SwapEntry = MmAllocSwapPage(); if (SwapEntry == 0) { - MmSetDirtyPage(MemoryArea->Process, Address); + MmSetDirtyPage(AddressSpace->Process, Address); PageOp->Status = STATUS_PAGEFILE_QUOTA_EXCEEDED; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -80,7 +111,7 @@ { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - MmSetDirtyPage(MemoryArea->Process, Address); + MmSetDirtyPage(AddressSpace->Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -125,7 +156,7 @@ /* * Disable the virtual mapping. */ - MmDisableVirtualMapping(MemoryArea->Process, Address, + MmDisableVirtualMapping(AddressSpace->Process, Address, &WasDirty, &Page); if (Page == 0) @@ -138,11 +169,11 @@ */ if (!WasDirty) { - MmDeleteVirtualMapping(MemoryArea->Process, Address, FALSE, NULL, NULL); + MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); MmDeleteAllRmaps(Page, NULL, NULL); if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) { - MmCreatePageFileMapping(MemoryArea->Process, Address, SwapEntry); + MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); MmSetSavedSwapEntryPage(Page, 0); } MmReleasePageMemoryConsumer(MC_USER, Page); @@ -162,7 +193,7 @@ if (SwapEntry == 0) { MmShowOutOfSpaceMessagePagingFile(); - MmEnableVirtualMapping(MemoryArea->Process, Address); + MmEnableVirtualMapping(AddressSpace->Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -178,7 +209,7 @@ { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - MmEnableVirtualMapping(MemoryArea->Process, Address); + MmEnableVirtualMapping(AddressSpace->Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -189,8 +220,8 @@ * Otherwise we have succeeded, free the page */ DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); - MmDeleteVirtualMapping(MemoryArea->Process, Address, FALSE, NULL, NULL); - MmCreatePageFileMapping(MemoryArea->Process, Address, SwapEntry); + MmDeleteVirtualMapping(AddressSpace->Process, Address, FALSE, NULL, NULL); + MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); MmDeleteAllRmaps(Page, NULL, NULL); MmSetSavedSwapEntryPage(Page, 0); MmReleasePageMemoryConsumer(MC_USER, Page); @@ -256,7 +287,7 @@ /* * Get or create a page operation */ - PageOp = MmGetPageOp(MemoryArea, MemoryArea->Process->UniqueProcessId, + PageOp = MmGetPageOp(MemoryArea, AddressSpace->Process->UniqueProcessId, (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) @@ -344,7 +375,7 @@ { SWAPENTRY SwapEntry; - MmDeletePageFileMapping(MemoryArea->Process, Address, &SwapEntry); + MmDeletePageFileMapping(AddressSpace->Process, Address, &SwapEntry); Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { @@ -357,7 +388,7 @@ * Set the page. If we fail because we are out of memory then * try again */ - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, (PVOID)PAGE_ROUND_DOWN(Address), Region->Protect, &Page, @@ -365,7 +396,7 @@ while (Status == STATUS_NO_MEMORY) { MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, Address, Region->Protect, &Page, @@ -382,7 +413,7 @@ /* * Add the page to the process's working set */ - MmInsertRmap(Page, MemoryArea->Process, (PVOID)PAGE_ROUND_DOWN(Address)); + MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAGE_ROUND_DOWN(Address)); /* * Finish the operation _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-06-07 16:54:15 UTC (rev 15831) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-06-07 17:07:34 UTC (rev 15832) @@ -1,11 +1,44 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory + * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programmers section) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/marea.c * PURPOSE: Implements memory areas * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Rex Jolliff + * David Welch + * Eric Kohl + * Philip Susi + * Casper Hornstrup + * Hartmut Birr + * Eric Kohl + * Ge van Geldorp + * Royce Mitchell III + * Aleksey Bragin + * Jason Filby + * Thomas Weidenmueller + * Gunnar Andre' Dalsnes + * tamlin + * Alex Ionescu + * Filip Navara + * Herve Poussineau + * Steven Edwards */ /* INCLUDES *****************************************************************/ @@ -974,7 +1007,6 @@ MemoryArea->EndingAddress = (PVOID)((ULONG_PTR)*BaseAddress + tmpLength); MemoryArea->Attributes = Attributes; MemoryArea->LockCount = 0; - MemoryArea->Process = Process; MemoryArea->PageOpCount = 0; MemoryArea->DeleteInProgress = FALSE; _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-06-07 16:54:15 UTC (rev 15831) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-06-07 17:07:34 UTC (rev 15832) @@ -1,11 +1,47 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory + * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programmers section) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/section.c * PURPOSE: Implements section objects * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Rex Jolliff + * David Welch + * Eric Kohl + * Emanuele Aliberti + * Eugene Ingerman + * Hartmut Birr + * Casper Hornstrup + * KJK::Hyperion + * Guido de Jong + * Ge van Geldorp + * Royce Mitchell III + * Filip Navara + * Aleksey Bragin + * Jason Filby + * Thomas Weidenmueller + * Gunnar Andre' Dalsnes + * tamlin + * Alex Ionescu + * Gregor Anich + * Steven Edwards + * Herve Poussineau */ /* INCLUDES *****************************************************************/ @@ -727,7 +763,7 @@ /* FIXME: Should we call MmCreateVirtualMappingUnsafe if * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? */ - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, Address, Attributes, &Page, @@ -737,7 +773,7 @@ DbgPrint("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Page, MemoryArea->Process, (PVOID)PAddress); + MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); } if (Locked) { @@ -1540,14 +1576,14 @@ */ if (Context.Private) { - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, Address, MemoryArea->Attributes, &Page, 1); - MmSetDirtyPage(MemoryArea->Process, Address); + MmSetDirtyPage(AddressSpace->Process, Address); MmInsertRmap(Page, - MemoryArea->Process, + AddressSpace->Process, Address); } else @@ -1557,14 +1593,14 @@ * set it back into the section segment entry so we don't loose * our copy. Otherwise it will be handled by the cache manager. */ - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, Address, MemoryArea->Attributes, &Page, 1); - MmSetDirtyPage(MemoryArea->Process, Address); + MmSetDirtyPage(AddressSpace->Process, Address); MmInsertRmap(Page, - MemoryArea->Process, + AddressSpace->Process, Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); @@ -1589,26 +1625,26 @@ */ if (Context.Private) { - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, Address, MemoryArea->Attributes, &Page, 1); - MmSetDirtyPage(MemoryArea->Process, Address); + MmSetDirtyPage(AddressSpace->Process, Address); MmInsertRmap(Page, - MemoryArea->Process, + AddressSpace->Process, Address); } else { - Status = MmCreateVirtualMapping(MemoryArea->Process, + Status = MmCreateVirtualMapping(AddressSpace->Process, Address, MemoryArea->Attributes, &Page, 1); - MmSetDirtyPage(MemoryArea->Process, Address); + MmSetDirtyPage(AddressSpace->Process, Address); MmInsertRmap(Page, - MemoryArea->Process, + AddressSpace->Process, Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); @@ -1635,7 +1671,7 @@ if (Context.Private) { - Status = MmCreatePageFileMapping(MemoryArea->Process, + Status = MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); if (!NT_SUCCESS(Status)) @@ -3641,7 +3677,6 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { - PMEMORY_AREA MArea; ULONG Entry; PFILE_OBJECT FileObject; PBCB Bcb; @@ -3651,23 +3686,24 @@ NTSTATUS Status; PSECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; + PMADDRESS_SPACE AddressSpace; - MArea = (PMEMORY_AREA)Context; + AddressSpace = (PMADDRESS_SPACE)Context; Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = ((ULONG_PTR)Address - (ULONG_PTR)MArea->StartingAddress) + + Offset = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + MemoryArea->Data.SectionData.ViewOffset; - Section = MArea->Data.SectionData.Section; - Segment = MArea->Data.SectionData.Segment; + Section = MemoryArea->Data.SectionData.Section; + Segment = MemoryArea->Data.SectionData.Segment; - PageOp = MmCheckForPageOp(MArea, NULL, NULL, Segment, Offset); + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset); while (PageOp) { MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(&MArea->Process->AddressSpace); + MmUnlockAddressSpace(AddressSpace); Status = MmspWaitForPageOpCompletionEvent(PageOp); if (Status != STATUS_SUCCESS) @@ -3676,10 +3712,10 @@ KEBUGCHECK(0); } - MmLockAddressSpace(&MArea->Process->AddressSpace); + MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MArea, NULL, NULL, Segment, Offset); + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset); } Entry = MmGetPageEntrySectionSegment(Segment, Offset); @@ -3733,12 +3769,12 @@ MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); } - MmDeleteRmap(Page, MArea->Process, Address); + MmDeleteRmap(Page, AddressSpace->Process, Address); MmReleasePageMemoryConsumer(MC_USER, Page); } else { - MmDeleteRmap(Page, MArea->Process, Address); + MmDeleteRmap(Page, AddressSpace->Process, Address); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE); } } @@ -3789,7 +3825,7 @@ Status = MmFreeMemoryArea(AddressSpace, MemoryArea, MmFreeSectionPage, - MemoryArea); + AddressSpace); } MmUnlockSectionSegment(Segment); ObDereferenceObject(Section);

19 years, 6 months

by navaraf＠svn.reactos.com

Implementation of DragDetect. Based on Wine code (C) 1993, 1994 Alexandre Julliard. Modified: trunk/reactos/lib/user32/windows/input.c _____ Modified: trunk/reactos/lib/user32/windows/input.c --- trunk/reactos/lib/user32/windows/input.c 2005-06-07 16:34:07 UTC (rev 15830) +++ trunk/reactos/lib/user32/windows/input.c 2005-06-07 16:54:15 UTC (rev 15831) @@ -44,7 +44,46 @@ HWND hWnd, POINT pt) { +#if 0 return NtUserDragDetect(hWnd, pt.x, pt.y); +#else + MSG msg; + RECT rect; + POINT tmp; + ULONG dx = NtUserGetSystemMetrics(SM_CXDRAG); + ULONG dy = NtUserGetSystemMetrics(SM_CYDRAG); + + rect.left = pt.x - dx; + rect.right = pt.x + dx; + rect.top = pt.y - dy; + rect.bottom = pt.y + dy; + + SetCapture(hWnd); + + for (;;) + { + while (PeekMessageW(&msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE)) + { + if (msg.message == WM_LBUTTONUP) + { + ReleaseCapture(); + return 0; + } + if (msg.message == WM_MOUSEMOVE) + { + tmp.x = LOWORD(msg.lParam); + tmp.y = HIWORD(msg.lParam); + if (!PtInRect(&rect, tmp)) + { + ReleaseCapture(); + return 1; + } + } + } + WaitMessage(); + } + return 0; +#endif }

19 years, 6 months

[navaraf] 15830: - Unlock GDI objects by pointer, not by handle.

by navaraf＠svn.reactos.com

- Unlock GDI objects by pointer, not by handle. - Fix a few invalid lock cases. - Add support for shared GDI object locks and use it for locking surfaces. Modified: trunk/reactos/include/win32k/bitmaps.h Modified: trunk/reactos/include/win32k/brush.h Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/include/win32k/gdiobj.h Modified: trunk/reactos/include/win32k/pen.h Modified: trunk/reactos/include/win32k/region.h Modified: trunk/reactos/include/win32k/text.h Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/misc.c Modified: trunk/reactos/subsys/win32k/eng/surface.c Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/include/dce.h Modified: trunk/reactos/subsys/win32k/include/palette.h Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c Modified: trunk/reactos/subsys/win32k/objects/color.c Modified: trunk/reactos/subsys/win32k/objects/coord.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/palette.c Modified: trunk/reactos/subsys/win32k/objects/path.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/print.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/include/win32k/bitmaps.h --- trunk/reactos/include/win32k/bitmaps.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/bitmaps.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -29,8 +29,9 @@ ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP)) #define BITMAPOBJ_FreeBitmap(hBMObj) \ GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) -#define BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) -#define BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObj((HGDIOBJ) hBMObj) +/* NOTE: Use shared locks! */ +#define BITMAPOBJ_LockBitmap(hBMObj) (PBITMAPOBJ)EngLockSurface((HSURF)hBMObj) +#define BITMAPOBJ_UnlockBitmap(pBMObj) EngUnlockSurface(&pBMObj->SurfObj) BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); _____ Modified: trunk/reactos/include/win32k/brush.h --- trunk/reactos/include/win32k/brush.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/brush.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -71,7 +71,7 @@ #define BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BRUSH)) #define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) #define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) -#define BRUSHOBJ_UnlockBrush(hBrush) GDIOBJ_UnlockObj((HGDIOBJ)hBrush) +#define BRUSHOBJ_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr(pBrush) BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); #ifdef __USE_W32API _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/dc.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -151,8 +151,8 @@ #define DC_LockDc(hDC) \ ((PDC) GDIOBJ_LockObj ((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) -#define DC_UnlockDc(hDC) \ - GDIOBJ_UnlockObj ((HGDIOBJ) hDC) +#define DC_UnlockDc(pDC) \ + GDIOBJ_UnlockObjByPtr (pDC) HDC FASTCALL RetrieveDisplayHDC(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); _____ Modified: trunk/reactos/include/win32k/gdiobj.h --- trunk/reactos/include/win32k/gdiobj.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/gdiobj.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -81,6 +81,7 @@ void INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); void INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); BOOL INTERNAL_CALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); +VOID INTERNAL_CALL GDIOBJ_UnlockObjByPtr(PGDIOBJ Object); #define GDIOBJ_GetObjectType(Handle) \ GDI_HANDLE_GET_TYPE(Handle) @@ -91,19 +92,18 @@ #define GDIOBJ_AllocObj(ty) GDIOBJ_AllocObjDbg(__FILE__,__LINE__,ty) #define GDIOBJ_FreeObj(obj,ty) GDIOBJ_FreeObjDbg(__FILE__,__LINE__,obj,ty) #define GDIOBJ_LockObj(obj,ty) GDIOBJ_LockObjDbg(__FILE__,__LINE__,obj,ty) -#define GDIOBJ_UnlockObj(obj) GDIOBJ_UnlockObjDbg(__FILE__,__LINE__,obj) +#define GDIOBJ_ShareLockObj(obj,ty) GDIOBJ_ShareLockObjDbg(__FILE__,__LINE__,obj,ty) HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDbg(const char* file, int line, ULONG ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); -BOOL INTERNAL_CALL GDIOBJ_UnlockObjDbg (const char* file, int line, HGDIOBJ hObj); +PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); #else /* !GDI_DEBUG */ HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(ULONG ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObj (HGDIOBJ hObj, DWORD ObjectType); -PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); -BOOL INTERNAL_CALL GDIOBJ_UnlockObj (HGDIOBJ hObj); +PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType); #endif /* GDI_DEBUG */ _____ Modified: trunk/reactos/include/win32k/pen.h --- trunk/reactos/include/win32k/pen.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/pen.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -9,7 +9,7 @@ #define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PEN)) #define PENOBJ_FreePen(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) #define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_UnlockPen(hBMObj) GDIOBJ_UnlockObj((HGDIOBJ) hBMObj) +#define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr(pPenObj) HPEN STDCALL NtGdiCreatePen( _____ Modified: trunk/reactos/include/win32k/region.h --- trunk/reactos/include/win32k/region.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/region.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -13,7 +13,7 @@ #define RGNDATA_FreeRgn(hRgn) GDIOBJ_FreeObj((HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION) #define RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION)) -#define RGNDATA_UnlockRgn(hRgn) GDIOBJ_UnlockObj((HGDIOBJ)hRgn) +#define RGNDATA_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr(pRgn) HRGN FASTCALL RGNDATA_AllocRgn(INT n); BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody); _____ Modified: trunk/reactos/include/win32k/text.h --- trunk/reactos/include/win32k/text.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/include/win32k/text.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -16,7 +16,7 @@ ((HFONT) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_FONT)) #define TEXTOBJ_FreeText(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT) #define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT)) -#define TEXTOBJ_UnlockText(hBMObj) GDIOBJ_UnlockObj ((HGDIOBJ) hBMObj) +#define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_UnlockObjByPtr (pBMObj) NTSTATUS FASTCALL TextIntRealizeFont(HFONT FontHandle); NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont); _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -89,7 +89,6 @@ static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; /* Pattern brushes */ PGDIBRUSHINST GdiBrush = NULL; - HBITMAP PatternSurface = NULL; SURFOBJ *PatternObj = NULL; PBITMAPOBJ PatternBitmap; ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; @@ -109,7 +108,6 @@ GDIBRUSHINST, BrushObject); - PatternSurface = GdiBrush->GdiBrushObject->hbmPattern; PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern); if(PatternBitmap != NULL) { @@ -157,7 +155,7 @@ } if (PatternBitmap != NULL) - BITMAPOBJ_UnlockBitmap(PatternSurface); + BITMAPOBJ_UnlockBitmap(PatternBitmap); return TRUE; } @@ -245,7 +243,7 @@ /* Pattern brush */ if (bmPattern != NULL) { - BITMAPOBJ_UnlockBitmap(BltInfo.PatternSurface->hsurf); + BITMAPOBJ_UnlockBitmap(bmPattern); } return Result; _____ Modified: trunk/reactos/subsys/win32k/eng/misc.c --- trunk/reactos/subsys/win32k/eng/misc.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/eng/misc.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -106,6 +106,7 @@ { EngDeleteClip(EnterLeave->TrivialClipObj); EngFreeMem((*OutputObj)->pvBits); + EngUnlockSurface(*OutputObj); EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); return FALSE; } _____ Modified: trunk/reactos/subsys/win32k/eng/surface.c --- trunk/reactos/subsys/win32k/eng/surface.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/eng/surface.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -281,7 +281,7 @@ } if (SurfObj->pvBits == NULL) { - BITMAPOBJ_UnlockBitmap(NewBitmap); + BITMAPOBJ_UnlockBitmap(BitmapObj); BITMAPOBJ_FreeBitmap(NewBitmap); return 0; } @@ -315,7 +315,7 @@ BitmapObj->dimension.cy = 0; BitmapObj->dib = NULL; - BITMAPOBJ_UnlockBitmap(NewBitmap); + BITMAPOBJ_UnlockBitmap(BitmapObj); return NewBitmap; } @@ -372,7 +372,7 @@ BitmapObj->flHooks = 0; - BITMAPOBJ_UnlockBitmap(NewSurface); + BITMAPOBJ_UnlockBitmap(BitmapObj); return NewSurface; } @@ -414,7 +414,7 @@ /* Hook up specified functions */ BitmapObj->flHooks = Hooks; - BITMAPOBJ_UnlockBitmap(Surface); + BITMAPOBJ_UnlockBitmap(BitmapObj); return TRUE; } @@ -481,19 +481,21 @@ return FillSolid(Surface, Rect, iColor); } +#define GDIBdyToHdr(body) \ + ((PGDIOBJHDR)(body) - 1) + /* * @implemented */ SURFOBJ * STDCALL EngLockSurface(IN HSURF Surface) { - BITMAPOBJ *bmp = (BITMAPOBJ*)BITMAPOBJ_LockBitmap(Surface); - if(bmp != NULL) - { - return &bmp->SurfObj; - } + BITMAPOBJ *bmp = GDIOBJ_ShareLockObj(Surface, GDI_OBJECT_TYPE_BITMAP); - return NULL; + if (bmp != NULL) + return &bmp->SurfObj; + + return NULL; } /* @@ -502,7 +504,7 @@ VOID STDCALL EngUnlockSurface(IN SURFOBJ *Surface) { - ASSERT (Surface); - BITMAPOBJ_UnlockBitmap (Surface->hsurf); + if (Surface != NULL) + GDIOBJ_UnlockObjByPtr(Surface); } /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -104,7 +104,7 @@ } } } - RGNDATA_UnlockRgn(hVisRgn); + RGNDATA_UnlockRgn(visRgn); } else { _____ Modified: trunk/reactos/subsys/win32k/eng/xlate.c --- trunk/reactos/subsys/win32k/eng/xlate.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/eng/xlate.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -272,9 +272,9 @@ end: if (PaletteSource != NULL) - PALETTE_UnlockPalette(PaletteSource); + PALETTE_UnlockPalette(SourcePalGDI); if (PaletteDest != NULL && PaletteDest != PaletteSource) - PALETTE_UnlockPalette(PaletteDest); + PALETTE_UnlockPalette(DestPalGDI); return XlateObj; } @@ -337,7 +337,7 @@ break; } - PALETTE_UnlockPalette(PaletteSource); + PALETTE_UnlockPalette(SourcePalGDI); return XlateObj; } @@ -358,7 +358,7 @@ XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ); if (XlateGDI == NULL) { - PALETTE_UnlockPalette(PaletteDest); + PALETTE_UnlockPalette(DestPalGDI); DPRINT1("Failed to allocate memory for a XLATE structure!\n"); return NULL; } @@ -367,7 +367,7 @@ XlateGDI->translationTable = EngAllocMem(0, sizeof(ULONG) * 2, 0); if (XlateGDI->translationTable == NULL) { - PALETTE_UnlockPalette(PaletteDest); + PALETTE_UnlockPalette(DestPalGDI); EngFreeMem(XlateGDI); return NULL; } @@ -407,7 +407,7 @@ DestPalGDI->NumColors); } - PALETTE_UnlockPalette(PaletteDest); + PALETTE_UnlockPalette(DestPalGDI); return XlateObj; } @@ -498,7 +498,7 @@ { /* Return closest match for the given color. */ Closest = ClosestColorMatch(XlateGDI, (LPPALETTEENTRY)&Color, PalGDI->IndexedColors, PalGDI->NumColors); - PALETTE_UnlockPalette(XlateGDI->DestPal); + PALETTE_UnlockPalette(PalGDI); return Closest; } } @@ -538,7 +538,7 @@ *OutPal = *InPal; } - PALETTE_UnlockPalette(hPalette); + PALETTE_UnlockPalette(PalGDI); return cPal; } _____ Modified: trunk/reactos/subsys/win32k/include/dce.h --- trunk/reactos/subsys/win32k/include/dce.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/include/dce.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -40,7 +40,7 @@ ((HDCE) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_DCE)) #define DCEOBJ_FreeDCE(hDCE) GDIOBJ_FreeObj((HGDIOBJ)hDCE, GDI_OBJECT_TYPE_DCE) #define DCEOBJ_LockDCE(hDCE) ((PDCE)GDIOBJ_LockObj((HGDIOBJ)hDCE, GDI_OBJECT_TYPE_DCE)) -#define DCEOBJ_UnlockDCE(hDCE) GDIOBJ_UnlockObj((HGDIOBJ)hDCE) +#define DCEOBJ_UnlockDCE(pDCE) GDIOBJ_UnlockObjByPtr(pDCE) BOOL INTERNAL_CALL DCE_Cleanup(PVOID ObjectBody); PDCE FASTCALL DceAllocDCE(HWND hWnd, DCE_TYPE Type); _____ Modified: trunk/reactos/subsys/win32k/include/palette.h --- trunk/reactos/subsys/win32k/include/palette.h 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/include/palette.h 2005-06-07 16:34:07 UTC (rev 15830) @@ -37,7 +37,7 @@ CONST RGBQUAD *Colors); #define PALETTE_FreePalette(hPalette) GDIOBJ_FreeObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE) #define PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) -#define PALETTE_UnlockPalette(hPalette) GDIOBJ_UnlockObj((HGDIOBJ)hPalette) +#define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr(pPalette) BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody); HPALETTE FASTCALL PALETTE_Init (VOID); _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -51,7 +51,7 @@ if (!pDC->DriverFunctions.EnableDirectDraw) { // Driver doesn't support DirectDraw - DC_UnlockDc(hdc); + DC_UnlockDc(pDC); return NULL; } @@ -61,7 +61,7 @@ if (!success) { // DirectDraw creation failed - DC_UnlockDc(hdc); + DC_UnlockDc(pDC); return NULL; } @@ -121,8 +121,8 @@ if (palette_callbacks.dwFlags & DDHAL_PALCB32_SETENTRIES) pDirectDraw->DdSetEntries = palette_callbacks.SetEntries; - GDIOBJ_UnlockObj(hDirectDraw); - DC_UnlockDc(hdc); + GDIOBJ_UnlockObjByPtr(pDirectDraw); + DC_UnlockDc(pDC); return hDirectDraw; } @@ -162,7 +162,7 @@ if (!success) { - GDIOBJ_UnlockObj(hDirectDrawLocal); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return FALSE; } @@ -189,7 +189,7 @@ } - GDIOBJ_UnlockObj(hDirectDrawLocal); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return TRUE; } @@ -235,8 +235,8 @@ // FIXME: figure out how to use this pSurface->bComplete = bComplete; - GDIOBJ_UnlockObj(hSurface); - GDIOBJ_UnlockObj(hDirectDrawLocal); + GDIOBJ_UnlockObjByPtr(pSurface); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return hSurface; } @@ -260,7 +260,7 @@ PDD_SURFACE pSurfaceTo = GDIOBJ_LockObj(hSurfaceTo, GDI_OBJECT_TYPE_DD_SURFACE); if (!pSurfaceTo) { - GDIOBJ_UnlockObj(hSurfaceFrom); + GDIOBJ_UnlockObjByPtr(pSurfaceFrom); return FALSE; } @@ -269,8 +269,8 @@ pSurfaceFrom->Local.lpAttachListFrom = pSurfaceFrom->AttachListFrom; } - GDIOBJ_UnlockObj(hSurfaceFrom); - GDIOBJ_UnlockObj(hSurfaceTo); + GDIOBJ_UnlockObjByPtr(pSurfaceFrom); + GDIOBJ_UnlockObjByPtr(pSurfaceTo); return TRUE; } */ @@ -295,7 +295,7 @@ pDirectDraw->Global.dhpdev,(PDD_HALINFO) puGetDriverInfoData, &pdwNumHeaps, pvmList, &pdwNumFourCC, pdwFourCC); - GDIOBJ_UnlockObj(hDirectDrawLocal); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return ddRVal; } @@ -314,7 +314,7 @@ ddRVal = pDirectDraw->DdWaitForVerticalBlank(puWaitForVerticalBlankData); - GDIOBJ_UnlockObj(hDirectDrawLocal); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return ddRVal; } @@ -333,7 +333,7 @@ ddRVal = pDirectDraw->DdCanCreateSurface(puCanCreateSurfaceData); - GDIOBJ_UnlockObj(hDirectDrawLocal); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return ddRVal; } @@ -356,7 +356,7 @@ ddRVal = pDirectDraw->DdBlt(puBltData); - GDIOBJ_UnlockObj(hSurfaceDest); + GDIOBJ_UnlockObjByPtr(pDirectDraw); return ddRVal; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -50,9 +50,7 @@ { HDC hDC; PDC dc; - HBITMAP hBitmap; - BITMAPOBJ *BitmapObj; - SURFOBJ *SurfObj; + GDIDEVICE *GDIDevice; #if 1 /* FIXME - get the screen dc from the window station or desktop */ @@ -62,17 +60,12 @@ if (!(dc = DC_LockDc(hDC))) return FALSE; + GDIDevice = (GDIDEVICE *)dc->GDIDevice; + DC_UnlockDc(dc); - hBitmap = dc->w.hBitmap; - DC_UnlockDc(hDC); - if (!(BitmapObj = BITMAPOBJ_LockBitmap(hBitmap))) - return FALSE; + loc->x = GDIDevice->Pointer.Pos.x; + loc->y = GDIDevice->Pointer.Pos.y; - SurfObj = &BitmapObj->SurfObj; - loc->x = GDIDEV(SurfObj)->Pointer.Pos.x; - loc->y = GDIDEV(SurfObj)->Pointer.Pos.y; - - BITMAPOBJ_UnlockBitmap(hBitmap); return TRUE; } @@ -135,7 +128,7 @@ } dcbmp = dc->w.hBitmap; DevInfo = dc->DevInfo; - DC_UnlockDc(Screen); + DC_UnlockDc(dc); BitmapObj = BITMAPOBJ_LockBitmap(dcbmp); if ( !BitmapObj ) @@ -159,13 +152,13 @@ CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */ CurInfo->ShowingCursor = 0; - BITMAPOBJ_UnlockBitmap(dcbmp); + BITMAPOBJ_UnlockBitmap(BitmapObj); return Ret; } if (!NewCursor) { - BITMAPOBJ_UnlockBitmap(dcbmp); + BITMAPOBJ_UnlockBitmap(BitmapObj); return Ret; } @@ -176,11 +169,11 @@ if (MaskBmpObj) { const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); - BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask); + BITMAPOBJ_UnlockBitmap(MaskBmpObj); if (maskBpp != 1) { DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); - BITMAPOBJ_UnlockBitmap(dcbmp); + BITMAPOBJ_UnlockBitmap(BitmapObj); return Ret; } @@ -224,14 +217,14 @@ NULL); if ( !hMask ) { - BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask); - BITMAPOBJ_UnlockBitmap(dcbmp); + BITMAPOBJ_UnlockBitmap(MaskBmpObj); + BITMAPOBJ_UnlockBitmap(BitmapObj); return (HCURSOR)0; } soMask = EngLockSurface((HSURF)hMask); EngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, &DestRect, &SourcePoint); - BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask); + BITMAPOBJ_UnlockBitmap(MaskBmpObj); } } } @@ -280,7 +273,7 @@ GDIDEV(SurfObj)->Pointer.MovePointer = GDIDEVFUNCS(SurfObj).MovePointer; } - BITMAPOBJ_UnlockBitmap(dcbmp); + BITMAPOBJ_UnlockBitmap(BitmapObj); if(hMask) { EngUnlockSurface(soMask); @@ -617,7 +610,7 @@ { CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx; CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy; - BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor); + BITMAPOBJ_UnlockBitmap(bmp); GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmColor, NULL); } if(CurIconObject->IconInfo.hbmMask && @@ -628,7 +621,7 @@ CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx; CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy / 2; } - BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask); + BITMAPOBJ_UnlockBitmap(bmp); GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmMask, NULL); } } @@ -749,7 +742,7 @@ else SetLastNtError(Status); - BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor); + BITMAPOBJ_UnlockBitmap(bmp); done: IntReleaseCurIconObject(CurIconObject); @@ -1109,7 +1102,7 @@ { CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx; CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy; - BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor); + BITMAPOBJ_UnlockBitmap(bmp); GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmColor, NULL); } else @@ -1121,7 +1114,7 @@ CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx; CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy / 2; - BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask); + BITMAPOBJ_UnlockBitmap(bmp); GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmMask, NULL); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -349,9 +349,9 @@ { Ret->right = BitmapObj->SurfObj.sizlBitmap.cx; Ret->bottom = BitmapObj->SurfObj.sizlBitmap.cy; - BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapObj); } - DC_UnlockDc(ScreenDeviceContext); + DC_UnlockDc(dc); } if(Rect) _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -952,7 +952,7 @@ if (dc) { hBitmap = dc->w.hBitmap; - DC_UnlockDc(hDC); + DC_UnlockDc(dc); BitmapObj = BITMAPOBJ_LockBitmap(hBitmap); if (BitmapObj) @@ -970,7 +970,7 @@ GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; - BITMAPOBJ_UnlockBitmap(hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapObj); } } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/metric.c --- trunk/reactos/subsys/win32k/ntuser/metric.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/metric.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -169,7 +169,7 @@ { Width = ScreenDC->GDIInfo->ulHorzRes; Height = ScreenDC->GDIInfo->ulVertRes; - DC_UnlockDc(ScreenDCHandle); + DC_UnlockDc(ScreenDC); } NtGdiDeleteDC(ScreenDCHandle); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -841,7 +841,7 @@ WinStaObject->cxWallpaper = bmp->SurfObj.sizlBitmap.cx; WinStaObject->cyWallpaper = bmp->SurfObj.sizlBitmap.cy; - BITMAPOBJ_UnlockBitmap(hNewBitmap); + BITMAPOBJ_UnlockBitmap(bmp); /* change the bitmap's ownership */ GDIOBJ_SetOwnership(hNewBitmap, NULL); _____ Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c --- trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -506,7 +506,7 @@ return -1; } dcVisRgn = dc->w.hVisRgn; - DC_UnlockDc(hDC); + DC_UnlockDc(dc); regionType = NtGdiGetRgnBox(dcVisRgn, &dcRect); if (regionType == 0) _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -743,7 +743,7 @@ if (NULL != Rgn) { UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); - RGNDATA_UnlockRgn(Window->UpdateRegion); + RGNDATA_UnlockRgn(Rgn); IntGdiOffsetRect(&Ps.rcPaint, Window->WindowRect.left - Window->ClientRect.left, Window->WindowRect.top - Window->ClientRect.top); @@ -933,7 +933,7 @@ ASSERT(RgnData != NULL); RegionType = UnsafeIntGetRgnBox(RgnData, &Rect); ASSERT(RegionType != ERROR); - RGNDATA_UnlockRgn(Window->UpdateRegion); + RGNDATA_UnlockRgn(RgnData); } AlwaysPaint = (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) || (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT); @@ -1062,7 +1062,7 @@ IntGdiOffsetRect(&rSrc_lp, offset.left - offset.right, offset.top - offset.bottom); IntDPtoLP(DC, (LPPOINT)&rDst_lp, 2); IntDPtoLP(DC, (LPPOINT)&rSrc_lp, 2); - DC_UnlockDc(hDC); + DC_UnlockDc(DC); if (!NtGdiBitBlt(hDC, rDst_lp.left, rDst_lp.top, rDst_lp.right - rDst_lp.left, rDst_lp.bottom - rDst_lp.top, hDC, rSrc_lp.left, rSrc_lp.top, @@ -1071,7 +1071,7 @@ } else { - DC_UnlockDc(hDC); + DC_UnlockDc(DC); } /* _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -130,7 +130,7 @@ Dce = DCEOBJ_LockDCE(DceHandle); /* No real locking, just get the pointer */ - DCEOBJ_UnlockDCE(DceHandle); + DCEOBJ_UnlockDCE(Dce); Dce->Self = DceHandle; Dce->hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == defaultDCstate) @@ -200,7 +200,7 @@ dc->w.DCOrgY = WindowObject->ClientRect.top; } } - DC_UnlockDc(hDC); + DC_UnlockDc(dc); } @@ -855,7 +855,7 @@ NtGdiOffsetRgn(pDCE->hClipRgn, DeltaX, DeltaY); } } - DC_UnlockDc(pDCE->hDC); + DC_UnlockDc(dc); DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -3918,7 +3918,7 @@ if((pRgn = RGNDATA_LockRgn(hRgn))) { Ret = pRgn->rdh.iType; - RGNDATA_UnlockRgn(hRgn); + RGNDATA_UnlockRgn(pRgn); } else Ret = ERROR; @@ -3959,7 +3959,7 @@ { Ret = pRgn->rdh.iType; *Rect = pRgn->rdh.rcBound; - RGNDATA_UnlockRgn(VisRgn); + RGNDATA_UnlockRgn(pRgn); } else Ret = ERROR; _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -853,13 +853,13 @@ if (VisBefore != NULL && (VisRgn = (PROSRGNDATA)RGNDATA_LockRgn(VisBefore)) && UnsafeIntGetRgnBox(VisRgn, &TempRect) == NULLREGION) { - RGNDATA_UnlockRgn(VisBefore); + RGNDATA_UnlockRgn(VisRgn); NtGdiDeleteObject(VisBefore); VisBefore = NULL; } else if(VisRgn) { - RGNDATA_UnlockRgn(VisBefore); + RGNDATA_UnlockRgn(VisRgn); } } } @@ -988,13 +988,13 @@ if (VisAfter != NULL && (VisRgn = (PROSRGNDATA)RGNDATA_LockRgn(VisAfter)) && UnsafeIntGetRgnBox(VisRgn, &TempRect) == NULLREGION) { - RGNDATA_UnlockRgn(VisAfter); + RGNDATA_UnlockRgn(VisRgn); NtGdiDeleteObject(VisAfter); VisAfter = NULL; } else if(VisRgn) { - RGNDATA_UnlockRgn(VisAfter); + RGNDATA_UnlockRgn(VisRgn); } /* @@ -1048,7 +1048,7 @@ UnsafeIntGetRgnBox(VisRgn, &CopyRect) == NULLREGION) { /* Nothing to copy, clean up */ - RGNDATA_UnlockRgn(CopyRgn); + RGNDATA_UnlockRgn(VisRgn); NtGdiDeleteObject(CopyRgn); CopyRgn = NULL; } @@ -1057,7 +1057,7 @@ { if(VisRgn) { - RGNDATA_UnlockRgn(CopyRgn); + RGNDATA_UnlockRgn(VisRgn); } /* * Small trick here: there is no function to bitblt a region. So @@ -1083,7 +1083,7 @@ } else if(VisRgn) { - RGNDATA_UnlockRgn(CopyRgn); + RGNDATA_UnlockRgn(VisRgn); } } else _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-07 16:26:14 UTC (rev 15829) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-07 16:34:07 UTC (rev 15830) @@ -61,7 +61,7 @@ } if (DCDest->IsIC) { - DC_UnlockDc(hDCDest); + DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ return TRUE; } @@ -73,15 +73,15 @@ DCSrc = DC_LockDc(hDCSrc); if (NULL == DCSrc) { - DC_UnlockDc(hDCDest); + DC_UnlockDc(DCDest); DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } if (DCSrc->IsIC) { - DC_UnlockDc(hDCSrc); - DC_UnlockDc(hDCDest); + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ return TRUE; } @@ -137,17 +137,17 @@ { if (UsesSource && hDCSrc != hDCDest) { - DC_UnlockDc(hDCSrc); + DC_UnlockDc(DCSrc); } if(BitmapDest != NULL) { - BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapDest); } if(BitmapSrc != NULL && BitmapSrc != BitmapDest) { - BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapSrc); } - DC_UnlockDc(hDCDest); + DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } @@ -191,20 +191,20 @@ { if (UsesSource && hDCSrc != hDCDest) { - DC_UnlockDc(hDCSrc); + DC_UnlockDc(DCSrc); } - DC_UnlockDc(hDCDest); + DC_UnlockDc(DCDest); if(BitmapDest != NULL) { - BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapDest); } if(BitmapSrc != NULL && BitmapSrc != BitmapDest) { - BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapSrc); } if(BrushObj != NULL) { - BRUSHOBJ_UnlockBrush(DCDest->w.hBrush); + BRUSHOBJ_UnlockBrush(BrushObj); } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return FALSE; @@ -222,21 +222,21 @@ if(BitmapDest != NULL) { - BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapDest); } if (UsesSource && BitmapSrc != BitmapDest) { - BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap); + BITMAPOBJ_UnlockBitmap(BitmapSrc); } if (BrushObj != NULL) { - BRUSHOBJ_UnlockBrush(DCDest->w.hBrush); + BRUSHOBJ_UnlockBrush(BrushObj); } if (UsesSource && hDCSrc != hDCDest) { - DC_UnlockDc(hDCSrc); + DC_UnlockDc(DCSrc); } - DC_UnlockDc(hDCDest); + DC_UnlockDc(DCDest); return Status; } @@ -273,14 +273,14 @@ } if (DCDest->IsIC) { - DC_UnlockDc(hdcDst); + DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ return TRUE; } if((hdcDst != hdcSrc) && !(DCSrc = DC_LockDc(hdcSrc))) { - DC_UnlockDc(hdcDst); + DC_UnlockDc(DCDest); DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcSrc); SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; @@ -291,10 +291,10 @@ } if (DCSrc->IsIC) { - DC_UnlockDc(hdcSrc); + DC_UnlockDc(DCSrc); if(hdcDst != hdcSrc) { - DC_UnlockDc(hdcDst); + DC_UnlockDc(DCDest); } /* Yes, Windows really returns TRUE in this case */ return TRUE; @@ -314,16 +314,16 @@ if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) { - DC_UnlockDc(hdcSrc); - DC_UnlockDc(hdcDst); + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); [truncated at 1000 lines; 3758 more skipped]

19 years, 6 months

← Newer
1
...
50
51
52
53
54
55
56
...
65
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 June 2005