Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[janderwald] 32895: - add version information for notepad
by janderwald＠svn.reactos.org 09 Apr '08

09 Apr '08

Author: janderwald Date: Wed Apr 9 06:07:39 2008 New Revision: 32895 URL: http://svn.reactos.org/svn/reactos?rev=32895&view=rev Log: - add version information for notepad Modified: trunk/reactos/base/applications/notepad/rsrc.rc Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Wed Apr 9 06:07:39 2008 @@ -24,6 +24,13 @@ #include "winnls.h" #include "commctrl.h" #include "notepad_res.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Editor\0" +#define REACTOS_STR_INTERNAL_NAME "notepad\0" +#define REACTOS_STR_ORIGINAL_FILENAME "notepad.exe\0" + +#include <reactos/version.rc> + IDI_NPICON ICON "res/notepad.ico"

1 0

[pschweitzer] 32894: Updated French translation for Shell32.dll
by pschweitzer＠svn.reactos.org 08 Apr '08

08 Apr '08

Author: pschweitzer Date: Tue Apr 8 04:32:38 2008 New Revision: 32894 URL: http://svn.reactos.org/svn/reactos?rev=32894&view=rev Log: Updated French translation for Shell32.dll Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Tue Apr 8 04:32:38 2008 @@ -549,16 +549,16 @@ IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "Changer l'icône" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + LTEXT "Nom de fichier :", -1, 7, 14, 208, 10 + PUSHBUTTON "Parcourir...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "Icônes :", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 - PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 + PUSHBUTTON "Annuler",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -661,9 +661,9 @@ FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien" IDS_FOLDER_OPTIONS "Options du dossier" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" - IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - -END + IDS_RECYCLEBIN_LOCATION "Emplacement de la corbeille" + IDS_RECYCLEBIN_DISKSPACE "Espace disponible" + IDS_PICK_ICON_TITLE "Choisir une icône" + IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END

1 0

[jimtabor] 32893: Good example how client thread info structure works. Only one flag was seen being set and cleared when multi-thread messages are sent. Researched back in 2001.
by jimtabor＠svn.reactos.org 08 Apr '08

08 Apr '08

Author: jimtabor Date: Tue Apr 8 00:08:25 2008 New Revision: 32893 URL: http://svn.reactos.org/svn/reactos?rev=32893&view=rev Log: Good example how client thread info structure works. Only one flag was seen being set and cleared when multi-thread messages are sent. Researched back in 2001. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue Apr 8 00:08:25 2008 @@ -1081,12 +1081,11 @@ STDCALL InSendMessage(VOID) { - static DWORD ShowNotImplemented = TRUE; - if (ShowNotImplemented) - { - DbgPrint("InSendMessage is unimplemented\n"); - ShowNotImplemented = FALSE; - } + PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; + + if ( pcti ) + return (pcti->CTI_flags & CTI_INSENDMESSAGE); + else /* return(NtUserGetThreadState(THREADSTATE_INSENDMESSAGE) != ISMEX_NOSEND); */ return FALSE; } @@ -1100,8 +1099,11 @@ InSendMessageEx( LPVOID lpReserved) { + PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; + + if (pcti && !(pcti->CTI_flags & CTI_INSENDMESSAGE)) return ISMEX_NOSEND; + else /* return NtUserGetThreadState(THREADSTATE_INSENDMESSAGE); */ - UNIMPLEMENTED; return 0; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Apr 8 00:08:25 2008 @@ -181,8 +181,11 @@ } W32PROCESSINFO, *PW32PROCESSINFO; +#define CTI_INSENDMESSAGE 0x0002 + typedef struct _CLIENTTHREADINFO { + DWORD CTI_flags; DWORD dwcPumpHook; } CLIENTTHREADINFO, *PCLIENTTHREADINFO;

1 0

[jimtabor] 32892: Fix alignment for client info structure.
by jimtabor＠svn.reactos.org 08 Apr '08

08 Apr '08

Author: jimtabor Date: Mon Apr 7 22:37:59 2008 New Revision: 32892 URL: http://svn.reactos.org/svn/reactos?rev=32892&view=rev Log: Fix alignment for client info structure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Apr 7 22:37:59 2008 @@ -210,7 +210,6 @@ PVOID pvWnd; } CALLBACKWND, *PCALLBACKWND; - typedef struct _W32CLIENTINFO { ULONG CI_flags; @@ -225,15 +224,17 @@ ULONG fsHooks; HWND hWND; // Well be replaced with CALLBACKWND. PVOID pvWND; // " " + ULONG Win32ClientInfo; DWORD dwHookCurrent; ULONG Win32ClientInfo1; PCLIENTTHREADINFO pClientThreadInfo; DWORD dwHookData; - ULONG Win32ClientInfo2[8]; - HANDLE hKL; + DWORD dwKeyCache; + ULONG Win32ClientInfo2[7]; USHORT CodePage; USHORT csCF; - ULONG Win32ClientInfo3[36]; + HANDLE hKL; + ULONG Win32ClientInfo3[35]; } W32CLIENTINFO, *PW32CLIENTINFO; #define GetWin32ClientInfo() (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)

1 0

[janderwald] 32891: - add SHOpenWithDialog prototype and structure
by janderwald＠svn.reactos.org 07 Apr '08

07 Apr '08

Author: janderwald Date: Mon Apr 7 16:40:55 2008 New Revision: 32891 URL: http://svn.reactos.org/svn/reactos?rev=32891&view=rev Log: - add SHOpenWithDialog prototype and structure Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Mon Apr 7 16:40:55 2008 @@ -1506,6 +1506,36 @@ LPCITEMIDLIST* apidl, IDataObject **ppdtobj); +/**************************************************************************** + * SHOpenWithDialog + */ + +enum tagOPEN_AS_INFO_FLAGS +{ + OAIF_ALLOW_REGISTRATION = 1, + OAIF_REGISTER_EXT = 2, + OAIF_EXEC = 4, + OAIF_FORCE_REGISTRATION = 8, +#if (NTDDI_VERSION >= NTDDI_VISTA) + OAIF_HIDE_REGISTRATION = 32, + OAIF_URL_PROTOCOL = 64, +#endif +}; +typedef int OPEN_AS_INFO_FLAGS; + + +typedef struct tagOPENASINFO { + LPCTSTR pcszFile; + LPCTSTR pcszClass; + OPEN_AS_INFO_FLAGS oaifInFlags; +} OPENASINFO; + +HRESULT SHOpenWithDialog( + HWND hwndParent, + const OPENASINFO *poainfo +); + + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

[jimtabor] 32890: - Remove old pump hook and use new client thread information. Tested with Qemu and installed and run more than twice FF 1.5.03.
by jimtabor＠svn.reactos.org 07 Apr '08

07 Apr '08

Author: jimtabor Date: Mon Apr 7 14:02:21 2008 New Revision: 32890 URL: http://svn.reactos.org/svn/reactos?rev=32890&view=rev Log: - Remove old pump hook and use new client thread information. Tested with Qemu and installed and run more than twice FF 1.5.03. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Mon Apr 7 14:02:21 2008 @@ -11,7 +11,8 @@ struct _KBL* KeyboardLayout; struct _DESKTOP_OBJECT* Desktop; HANDLE hDesktop; - DWORD MessagePumpHookValue; + PVOID pgdiDcattr; + PVOID pgdiBrushAttr; BOOLEAN IsExiting; SINGLE_LIST_ENTRY ReferencesList; ULONG Hooks; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Apr 7 14:02:21 2008 @@ -266,7 +266,8 @@ co_IntDestroyCaret(Win32Thread); Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); - Win32Thread->MessagePumpHookValue = 0; + if (Win32Thread->ThreadInfo) + Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0; } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Apr 7 14:02:21 2008 @@ -1822,19 +1822,27 @@ BOOL STDCALL IntInitMessagePumpHook() { - ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessagePumpHookValue++; - return TRUE; + if (((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) + { + ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook++; + return TRUE; + } + return FALSE; } BOOL STDCALL IntUninitMessagePumpHook() { - if (((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessagePumpHookValue <= 0) - { - return FALSE; - } - ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessagePumpHookValue--; - return TRUE; + if (((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) + { + if (((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook <= 0) + { + return FALSE; + } + ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook--; + return TRUE; + } + return FALSE; } /* EOF */

1 0

[dreimer] 32889: Polish Language Update by Olaf Siejka.
by dreimer＠svn.reactos.org 07 Apr '08

07 Apr '08

Author: dreimer Date: Mon Apr 7 06:51:00 2008 New Revision: 32889 URL: http://svn.reactos.org/svn/reactos?rev=32889&view=rev Log: Polish Language Update by Olaf Siejka. Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc [iso-8859-1] Mon Apr 7 06:51:00 2008 @@ -55,7 +55,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Odebrano", -1, 149, 90, 37, 8 - LTEXT "Bytes:", -1, 17, 115, 32, 8 + LTEXT "Bajtów:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] Mon Apr 7 06:51:00 2008 @@ -2,6 +2,9 @@ * translation by xrogers * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl +* +* translation update by Caemyr (Olaf Siejka) +* April, 2008 */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -27,53 +30,53 @@ IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Computer Name Changes" +CAPTION "Zmiana nazwy komputera" FONT 8, "MS Shell Dlg" BEGIN LTEXT "(message goes here)", 1017, 7, 5, 218, 30 - LTEXT "&Computer name:", -1, 7, 41, 219, 8 + LTEXT "&Nazwa komputera:", -1, 7, 41, 219, 8 EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + LTEXT "Pe³na nazwa komputera:", 1016, 7, 72, 218, 10 EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 - GROUPBOX "Member of", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + PUSHBUTTON "&Wiêcej...", 1003, 150, 102, 75, 14 + GROUPBOX "Nale¿y do", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domeny:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Grupy roboczej:", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "Wy&szukaj moj¹ domenê", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 + PUSHBUTTON "Anuluj", 2, 176, 203, 50, 14 END IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS Suffix and NetBIOS Computer Name" +CAPTION "Sufiksy DNS i nazwa NetBIOS komputera" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + LTEXT "&Podstawowy sufiks DNS tego komputera:", -1, 7, 5, 253, 8 EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 - LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + AUTOCHECKBOX "&Zmieñ podstawowy sufiks DNS przy zmianie cz³onkostwa domeny", 115, 11, 39, 250, 10 + LTEXT "&Nazwa komputera NetBIOS:", -1, 7, 57, 148, 8 EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 - PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 - LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 + PUSHBUTTON "Anuluj", 2, 209, 104, 50, 14 + LTEXT "Nazwa ta jest niezbêdna przy pracy ze starszymi serwerami i us³ugami.", 13, 7, 88, 253, 8 END STRINGTABLE BEGIN - 1 "* Unknown *" - 2 "WORKGROUP" - 3 "The following error occurred while attempting to read domain membership information:" - 4 "Computer Name Changes" - 5 "Workgroup:" - 6 "Domain:" - 22 "Welcome to the %1 workgroup." - 23 "Welcome to the %1 domain." - 24 "You must restart this computer for the changes to take effect." - 1021 "Note: Only Administrators can change the identification of this computer." - 1022 "Note: The identification of the computer cannot be changed because:" - 3210 "&Details >>" - 3220 "<< &Details" + 1 "* Nieznane *" + 2 "GRUPA ROBOCZA" + 3 "Podczas odczytywania informacji o cz³onkowstwie w domenie, wyst¹pi³ b³¹d:" + 4 "Zmiana nazwy komputera" + 5 "Grupa Robocza:" + 6 "Domena:" + 22 "Witamy w grupie roboczej %1." + 23 "Witamy w domenie %1." + 24 "Musisz zrestartowaæ komputer aby zmiany odnios³y skutek." + 1021 "Uwaga: Tylko Administratorzy mog¹ zmieniaæ identyfikator tego komputera." + 1022 "Uwaga: Identyfikator tego komputera nie zosta³ zmieniony, powód:" + 3210 "&Szczegó³y >>" + 3220 "<< &Szczegó³y" END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Apr 7 06:51:00 2008 @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * translation updated by Caemyr - Olaf Siejka (Jan,Mar 2008) + * translation updated by Caemyr - Olaf Siejka (Jan,Mar,Apr 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -551,16 +551,16 @@ IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "Zmiana Ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + LTEXT "Plik:", -1, 7, 14, 208, 10 + PUSHBUTTON "Przegl¹daj...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "Ikony:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 - PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 + PUSHBUTTON "Anuluj",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE

1 0

[dchapyshev] 32888: - Update Russian translation
by dchapyshev＠svn.reactos.org 07 Apr '08

07 Apr '08

Author: dchapyshev Date: Mon Apr 7 02:19:42 2008 New Revision: 32888 URL: http://svn.reactos.org/svn/reactos?rev=32888&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Apr 7 02:19:42 2008 @@ -544,16 +544,16 @@ IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "Èçìåíåíèå çíà÷êà" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + LTEXT "Èìÿ ôàéëà:", -1, 7, 14, 208, 10 + PUSHBUTTON "Îáçîð...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "Çíà÷êè:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 - PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 + PUSHBUTTON "Îòìåíà",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -657,7 +657,7 @@ IDS_FOLDER_OPTIONS "Ñâîéñòâà ïàïêè" IDS_RECYCLEBIN_LOCATION "Ðàñïîëîæåíèå Êîðçèíû" IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" - IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - -END + IDS_PICK_ICON_TITLE "Âûáðàòü çíà÷îê" + IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + +END

1 0

[jimtabor] 32887: - Plugged in client thread information, tested with Qemu. - Add small fix to IntBroadcastSystemMessage structure.
by jimtabor＠svn.reactos.org 07 Apr '08

07 Apr '08

Author: jimtabor Date: Mon Apr 7 00:01:34 2008 New Revision: 32887 URL: http://svn.reactos.org/svn/reactos?rev=32887&view=rev Log: - Plugged in client thread information, tested with Qemu. - Add small fix to IntBroadcastSystemMessage structure. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Mon Apr 7 00:01:34 2008 @@ -2310,10 +2310,8 @@ BOOL WINAPI IsInsideMessagePumpHook() { -// PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; -// return (gfMessagePumpHook && pcti && (pcti->dwcPumpHook > 0)); - if(!gfMessagePumpHook) return FALSE; - return TRUE; + PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; + return (gfMessagePumpHook && pcti && (pcti->dwcPumpHook > 0)); } void WINAPI ResetMessagePumpHook(PUSER_MESSAGE_PUMP_ADDRESSES Addresses) @@ -2558,7 +2556,7 @@ typedef struct _BROADCASTPARM { DWORD flags; - LPDWORD recipients; + DWORD recipients; HDESK hDesk; HWND hWnd; LUID luid; @@ -2620,7 +2618,7 @@ parm.hDesk = NULL; parm.hWnd = NULL; parm.flags = dwflags; - parm.recipients = lpdwRecipients; + parm.recipients = *lpdwRecipients; if (dwflags & BSF_LUID) parm.luid = pBSMInfo->luid; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Apr 7 00:01:34 2008 @@ -436,7 +436,7 @@ { PTEB Teb; PW32THREADINFO ti; -// PW32CLIENTINFO ci; + PW32CLIENTINFO ci; PW32THREAD W32Thread = PsGetCurrentThreadWin32Thread(); if (W32Thread == NULL) @@ -476,7 +476,7 @@ W32Thread->ThreadInfo = ti; /* update the TEB */ Teb = NtCurrentTeb(); -// ci = GetWin32ClientInfo(); + ci = ((PW32CLIENTINFO)Teb->Win32ClientInfo); _SEH_TRY { ProbeForWrite(Teb, @@ -484,7 +484,7 @@ sizeof(ULONG)); Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); -// ci->pClientThreadInfo = UserHeapAddressToUser(&ti->ClientThreadInfo); + ci->pClientThreadInfo = &ti->ClientThreadInfo; } _SEH_HANDLE {

1 0

[tkreuzer] 32886: PatchPatch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove last traces of my dyslexia also known as GDIOBJ_AllocObjDepricated - fix a typo
by tkreuzer＠svn.reactos.org 06 Apr '08

06 Apr '08

Author: tkreuzer Date: Sun Apr 6 18:20:31 2008 New Revision: 32886 URL: http://svn.reactos.org/svn/reactos?rev=32886&view=rev Log: PatchPatch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove last traces of my dyslexia also known as GDIOBJ_AllocObjDepricated - fix a typo Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Surace Functions @@ -432,14 +431,16 @@ SURFOBJ *SurfObj; BITMAPOBJ *BitmapObj; - NewSurface = (HSURF)BITMAPOBJ_AllocBitmapDepricated(); - if (NewSurface == NULL) + BitmapObj = BITMAPOBJ_AllocBitmapWithHandle(); + if (!BitmapObj) + { return 0; - + } + + NewSurface = BitmapObj->BaseObject.hHmgr; GDIOBJ_SetOwnership(NewSurface, NULL); - BitmapObj = BITMAPOBJ_LockBitmap(NewSurface); - if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + if (!BITMAPOBJ_InitBitsLock(BitmapObj)) { BITMAPOBJ_UnlockBitmap(BitmapObj); BITMAPOBJ_FreeBitmapByHandle(NewSurface); Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -28,7 +28,6 @@ #define BITMAPOBJ_AllocBitmap() ((PBITMAPOBJ) GDIOBJ_AllocObj(GDIObjType_SURF_TYPE)) #define BITMAPOBJ_AllocBitmapWithHandle() ((PBITMAPOBJ) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP)) -#define BITMAPOBJ_AllocBitmapDepricated() ((HBITMAP) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_BITMAP)) #define BITMAPOBJ_FreeBitmap(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_SURF_TYPE) #define BITMAPOBJ_FreeBitmapByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) @@ -60,3 +59,4 @@ #endif + Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -74,7 +74,6 @@ #define BRUSHOBJ_AllocBrush() ((PGDIBRUSHOBJ) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define BRUSHOBJ_AllocBrushWithHandle() ((PGDIBRUSHOBJ) GDIOBJ_AllocObjWithHandle (GDI_OBJECT_TYPE_BRUSH)) -#define BRUSHOBJ_AllocBrushDepricated() ((HBRUSH) GDIOBJ_AllocObjDepricated (GDI_OBJECT_TYPE_BRUSH)) #define BRUSHOBJ_FreeBrush(pBrush) GDIOBJ_FreeObj((POBJ)pBrush, GDIObjType_BRUSH_TYPE) #define BRUSHOBJ_FreeBrushByHandle(hBrush) GDIOBJ_FreeObjByHandle((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) #define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -16,9 +16,9 @@ */ ////////////////////////////////////////////////////////////////////////////// GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; - DEVCAPS DevCaps; // Device Capabilities + DEVCAPS DevCaps; // Device Capabilities. FLONG flDeviceUniq; // Device settings uniqueness. - PVOID pvLangPack; // Lanuage Pack. + PVOID pvLangPack; // Language Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. DWORD dwCsbSupported1; // OEM code-page bitfield. ////////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,6 @@ BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType); POBJ INTERNAL_CALL GDIOBJ_AllocObj(UCHAR ObjectType); POBJ INTERNAL_CALL GDIOBJ_AllocObjWithHandle(ULONG ObjectType); -HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDepricated(ULONG ObjectType); VOID INTERNAL_CALL GDIOBJ_FreeObj (POBJ pObj, UCHAR ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObjByHandle (HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -8,13 +8,11 @@ #define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define PENOBJ_AllocPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_AllocPenDepricated() ((HPEN)GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PEN)) #define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TYPE_PEN) #define PENOBJ_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) #define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) #define PENOBJ_AllocExtPen() ((PGDIBRUSHOBJ)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define PENOBJ_AllocExtPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN)) -#define PENOBJ_AllocExtPenDepricated() ((HPEN)GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_EXTPEN)) #define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TYPE_EXTPEN) #define PENOBJ_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN) #define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -70,7 +70,6 @@ #define TEXTOBJ_AllocText() ((PTEXTOBJ) GDIOBJ_AllocObj(GDIObjType_LFONT_TYPE)) #define TEXTOBJ_AllocTextWithHandle() ((PTEXTOBJ) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_FONT)) -#define TEXTOBJ_AllocTextDepricated() ((HFONT) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_FONT)) #define TEXTOBJ_FreeText(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDILoObjType_LO_FONT_TYPE) #define TEXTOBJ_FreeTextByHandle(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT) #define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT)) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -2270,20 +2270,20 @@ RtlCopyMemory(Buf, Driver->Buffer, Driver->MaximumLength); } - hDC = (HDC) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_DC); - if (hDC == NULL) + NewDC = (PDC)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DC); + if(!NewDC) { if(Buf) { ExFreePool(Buf); } - return NULL; - } + return NULL; + } + + hDC = NewDC->BaseObject.hHmgr; DC_AllocateDcAttr(hDC); - NewDC = DC_LockDc(hDC); - /* FIXME - Handle NewDC == NULL! */ if (Driver != NULL) { RtlCopyMemory(&NewDC->DriverName, Driver, sizeof(UNICODE_STRING)); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -569,20 +569,6 @@ return NULL; } -/* Wrapper for compatibility with old calls, will be removed later */ -HGDIOBJ INTERNAL_CALL -GDIOBJ_AllocObjDepricated(ULONG ObjectType) -{ - POBJ pObject; - HGDIOBJ hObject; - - pObject = GDIOBJ_AllocObjWithHandle(ObjectType); - hObject = pObject->hHmgr; - GDIOBJ_UnlockObjByPtr(pObject); - - return hObject; -} - VOID INTERNAL_CALL GDIOBJ_FreeObj(POBJ pObject, UCHAR BaseType) Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ */ #include <w32k.h> @@ -52,7 +51,8 @@ return TRUE; } -HPALETTE FASTCALL +HPALETTE +FASTCALL PALETTE_AllocPalette(ULONG Mode, ULONG NumColors, ULONG *Colors, @@ -63,15 +63,13 @@ HPALETTE NewPalette; PPALGDI PalGDI; - NewPalette = (HPALETTE) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PALETTE); - if (NULL == NewPalette) - { + PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); + if (!PalGDI) + { return NULL; - } - - PalGDI = PALETTE_LockPalette(NewPalette); - /* FIXME - PalGDI can be NULL!!! Don't assert here! */ - ASSERT( PalGDI ); + } + + NewPalette = PalGDI->BaseObject.hHmgr; PalGDI->Self = NewPalette; PalGDI->Mode = Mode; @@ -104,23 +102,22 @@ return NewPalette; } -HPALETTE FASTCALL +HPALETTE +FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, CONST RGBQUAD *Colors) { HPALETTE NewPalette; PPALGDI PalGDI; - unsigned i; - - NewPalette = (HPALETTE) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PALETTE); - if (NULL == NewPalette) - { + UINT i; + + PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); + if (!PalGDI) + { return NULL; - } - - PalGDI = PALETTE_LockPalette(NewPalette); - /* FIXME - PalGDI can be NULL!!! Don't assert here! */ - ASSERT( PalGDI ); + } + + NewPalette = PalGDI->BaseObject.hHmgr; PalGDI->Self = NewPalette; PalGDI->Mode = PAL_INDEXED; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sun Apr 6 18:20:31 2008 @@ -113,7 +113,6 @@ * the y-x-banding that's so nice to have... */ -/* $Id$ */ #include <w32k.h> #define NDEBUG @@ -2018,44 +2017,43 @@ return ret; } -PROSRGNDATA FASTCALL -REGION_AllocRgnWithHandle(INT n) +PROSRGNDATA +FASTCALL +REGION_AllocRgnWithHandle(INT nReg) { HRGN hReg; PROSRGNDATA pReg; - - if ((hReg = (HRGN) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_REGION))) - { - if (NULL != (pReg = REGION_LockRgn(hReg))) - { - if (1 == n) - { - /* Testing shows that > 95% of all regions have only 1 rect. - Including that here saves us from having to do another - allocation */ - pReg->Buffer = &pReg->rdh.rcBound; - } - else - { - pReg->Buffer = ExAllocatePoolWithTag(PagedPool, n * sizeof(RECT), TAG_REGION); - } - if (NULL != pReg->Buffer) - { - EMPTY_REGION(pReg); - pReg->rdh.dwSize = sizeof(RGNDATAHEADER); - pReg->rdh.nCount = n; - pReg->rdh.nRgnSize = n*sizeof(RECT); - - return pReg; - } - } - else - { - REGION_FreeRgn(hReg); - } - } - - return NULL; + + pReg = (PROSRGNDATA)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_REGION); + if(!pReg) + { + return NULL; + } + + hReg = pReg->BaseObject.hHmgr; + + if (nReg == 1) + { + /* Testing shows that > 95% of all regions have only 1 rect. + Including that here saves us from having to do another allocation */ + pReg->Buffer = &pReg->rdh.rcBound; + } + else + { + pReg->Buffer = ExAllocatePoolWithTag(PagedPool, nReg * sizeof(RECT), TAG_REGION); + if (!pReg->Buffer) + { + GDIOBJ_FreeObjByHandle(hReg, GDI_OBJECT_TYPE_REGION); + return NULL; + } + } + + EMPTY_REGION(pReg); + pReg->rdh.dwSize = sizeof(RGNDATAHEADER); + pReg->rdh.nCount = nReg; + pReg->rdh.nRgnSize = nReg * sizeof(RECT); + + return pReg; } BOOL INTERNAL_CALL

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
40
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 April 2008