Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akorotaev] 31732: Add forgotten MmInitSectionImplementation2 call to init phase
by akorotaev＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: akorotaev Date: Sat Jan 12 15:45:55 2008 New Revision: 31732 URL: http://svn.reactos.org/svn/reactos?rev=31732&view=rev Log: Add forgotten MmInitSectionImplementation2 call to init phase Modified: branches/cache_manager_rewrite/mm/mminit.c Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Sat Jan 12 15:45:55 2008 @@ -425,6 +425,9 @@ BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; extern KMUTANT MmSystemLoadLock; +VOID +MmInitSectionImplementation2(VOID); + BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -488,6 +491,7 @@ MmInitBsmThread(); /* FIXME: Read parameters from memory */ + MmInitSectionImplementation2(); } return TRUE;

1 0

[cfinck] 31731: Updated Lithuanian translation for getbuilds by Vytis Girdzijauskas (cman AT cman DOT us) See issue #2596 for more details.
by cfinck＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: cfinck Date: Sat Jan 12 14:13:40 2008 New Revision: 31731 URL: http://svn.reactos.org/svn/reactos?rev=31731&view=rev Log: Updated Lithuanian translation for getbuilds by Vytis Girdzijauskas (cman AT cman DOT us) See issue #2596 for more details. Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php Sat Jan 12 14:13:40 2008 @@ -1,4 +1,4 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Website LICENSE: GPL v2 or any later version @@ -12,44 +12,44 @@ $getbuilds_langres["language"] = "Kalba"; $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Pagrindinis</a> > ReactOS SVN laidos'; - $getbuilds_langres["title"] = "Parsisiusti ReactOS SVN laidas"; - $getbuilds_langres["intro"] = 'Cia jus galite parsisiusti naujausias, o taip pat ir senesnes ReactOS SVN laidas, sukurtas musu <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot\'o</a>.'; + $getbuilds_langres["title"] = "ParsisiÅ³sti ReactOS SVN laidas"; + $getbuilds_langres["intro"] = 'Äia JÅ«s galite parsisiÅ³sti naujausias, o taip pat ir senesnes ReactOS SVN laidas, sukurtas mÅ«sÅ³ <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot\'o</a>.'; $getbuilds_langres["overview"] = "Apibendrinimas"; $getbuilds_langres["latestrev"] = "Naujausia ReactOS SVN laida"; - $getbuilds_langres["browsesvn"] = "NarÂyti SVN saugykla"; - $getbuilds_langres["cia"] = "Âiureti veliausius SVN iraÂus CIA.vc puslapyje"; - $getbuilds_langres["buildbot_status"] = "BuildBot'o bukle"; - $getbuilds_langres["buildbot_web"] = "BuildBot'o Web sasaja"; - $getbuilds_langres["browsebuilds"] = "NarÂyti visas sukurtas laidas"; + $getbuilds_langres["browsesvn"] = "NarÅ¡yti SVN saugyklÄ"; + $getbuilds_langres["cia"] = "Å½iÅ«rÄti vÄliausius SVN Ä¯raÅ¡us CIA.vc puslapyje"; + $getbuilds_langres["buildbot_status"] = "BuildBot'o bÅ«klÄ"; + $getbuilds_langres["buildbot_web"] = "BuildBot'o Web sÄsaja"; + $getbuilds_langres["browsebuilds"] = "NarÅ¡yti visas sukurtas laidas"; - $getbuilds_langres["downloadrev"] = "Parsisiusti ReactOS SVN laidas"; - $getbuilds_langres["js_disclaimer"] = 'JavaScript turi buti ijungtas jusu narÂykleje, kad galetumete naudotis SVN bylu saraÂu.<br>Kitu atveju, jus galite parsisiusti SVN laidas <a href="http://svn.reactos.org/iso">cia</a>.'; + $getbuilds_langres["downloadrev"] = "ParsisiÅ³sti ReactOS SVN laidas"; + $getbuilds_langres["js_disclaimer"] = 'JavaScript turi bÅ«ti Ä¯jungtas JÅ«sÅ³ narÅ¡yklÄje, kad galÄtumÄte naudotis SVN bylÅ³ saraÅ¡u.<br>Kitu atveju, JÅ«s galite parsisiÅ³sti SVN laidas <a href="http://svn.reactos.org/iso">Äia</a>.'; $getbuilds_langres["showrevfiles"] = "Rodyti bylas laidai"; - $getbuilds_langres["prevrev"] = "Ankstesne laida"; + $getbuilds_langres["prevrev"] = "AnkstesnÄ laida"; $getbuilds_langres["nextrev"] = "Sekanti laida"; $getbuilds_langres["showrev"] = "Rodyti"; - $getbuilds_langres["gettinglist"] = "IeÂkoma bylu"; - $getbuilds_langres["rangeinfo"] = "Galima ivesti laidos numeri (pvz. %s) arba laidu ribas (pvz. %s-%s)"; - $getbuilds_langres["isotype"] = "Rodyti CD atvaizdu tipus"; + $getbuilds_langres["gettinglist"] = "IeÅ¡koma bylÅ³"; + $getbuilds_langres["rangeinfo"] = "Galima Ä¯vesti laidos numerÄ¯ (pvz. %s) arba laidÅ³ ribas (pvz. %s-%s)"; + $getbuilds_langres["isotype"] = "Rodyti CD atvaizdÅ³ tipus"; - $getbuilds_langres["foundfiles"] = "Rasta %s bylu!"; + $getbuilds_langres["foundfiles"] = "Rasta %s bylÅ³!"; - $getbuilds_langres["firstpage_title"] = "Eiti i pirma puslapi"; + $getbuilds_langres["firstpage_title"] = "Eiti Ä¯ pirmÄ puslapÄ¯"; $getbuilds_langres["prevpage_title"] = "Ankstesnis puslapis"; $getbuilds_langres["prevpage"] = "Ankstesnis"; $getbuilds_langres["page"] = "Puslapis"; $getbuilds_langres["nextpage"] = "Sekantis"; $getbuilds_langres["nextpage_title"] = "Sekantis puslapis"; - $getbuilds_langres["lastpage_title"] = "Eiti i paskutini puslapi"; + $getbuilds_langres["lastpage_title"] = "Eiti Ä¯ paskutinÄ¯ puslapÄ¯"; $getbuilds_langres["filename"] = "Bylos vardas"; $getbuilds_langres["filesize"] = "Dydis"; $getbuilds_langres["filedate"] = "Data"; - $getbuilds_langres["pleasewait"] = "PraÂome palaukti"; + $getbuilds_langres["pleasewait"] = "PraÅ¡ome palaukti"; - $getbuilds_langres["nofiles"] = "Laidai %s bylu nerasta!"; + $getbuilds_langres["nofiles"] = "Laidai %s bylÅ³ nerasta!"; $getbuilds_langres["invalidrev"] = "Neteisingas laidos numeris!"; - $getbuilds_langres["rangelimitexceeded"] = "Laidu skaicius negali virÂyti %s!"; + $getbuilds_langres["rangelimitexceeded"] = "LaidÅ³ skaiÄius negali virÅ¡yti %s!"; ?>

1 0

[dreimer] 31730: Bug 2922: en-US updated shell translations (atylmo<AT>gmail<DOT>com) Bug 2957: Bulgarian translation of ReactOS (sstpr<AT>narod<DOT>ru)
by dreimer＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dreimer Date: Sat Jan 12 13:20:26 2008 New Revision: 31730 URL: http://svn.reactos.org/svn/reactos?rev=31730&view=rev Log: Bug 2922: en-US updated shell translations (atylmo<AT>gmail<DOT>com) Bug 2957: Bulgarian translation of ReactOS (sstpr<AT>narod<DOT>ru) Added: trunk/reactos/base/applications/mstsc/lang/bg-BG.rc (with props) trunk/reactos/base/setup/usetup/lang/bg-BG.h (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/winhelp/lang/bg-BG.rc trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/timedate/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/mstsc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/timedate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/en-U… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-…

1 0

[cfinck] 31729: Polish translation for rasdlg by Olaf Siejka (caemyr AT gmail DOT com) See issue #2944 for more details.
by cfinck＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: cfinck Date: Sat Jan 12 00:25:50 2008 New Revision: 31729 URL: http://svn.reactos.org/svn/reactos?rev=31729&view=rev Log: Polish translation for rasdlg by Olaf Siejka (caemyr AT gmail DOT com) See issue #2944 for more details. Added: trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc (with props) Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/pl-P… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc…

1 0

[gedmurphy] 31728: - add the new win32k CURICON_OBJECT struct (unused) which is compatible with Win2K3
by gedmurphy＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: gedmurphy Date: Fri Jan 11 20:27:36 2008 New Revision: 31728 URL: http://svn.reactos.org/svn/reactos?rev=31728&view=rev Log: - add the new win32k CURICON_OBJECT struct (unused) which is compatible with Win2K3 Modified: branches/curicon_rewrite/subsystems/win32/win32k/include/cursoricon.h Modified: branches/curicon_rewrite/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/curicon_rewrite/subsystems/win3… ============================================================================== --- branches/curicon_rewrite/subsystems/win32/win32k/include/cursoricon.h (original) +++ branches/curicon_rewrite/subsystems/win32/win32k/include/cursoricon.h Fri Jan 11 20:27:36 2008 @@ -8,6 +8,21 @@ LIST_ENTRY ListEntry; PW32PROCESS Process; } CURICON_PROCESS, *PCURICON_PROCESS; + +typedef struct _CURSOR +{ + LIST_ENTRY pcurNext; + UINT CURSORF_flags; // CURSORF_+ LINKED, SECRET, ACONFRAME, WOWCLEANUP, ACON, LRSHARED, GLOBAL, FROMRESOURCE + UNICODE_STRING strName; // resource string name + ATOM atomModName; // atom for the module name + UINT rt; // resource type, RT_ICON or RT_CURSOR ?? + INT cx; + INT cy; + UINT xhotspot; + UINT yhotspot; + HBITMAP hbmMask; + HBITMAP hbmColor; +} CURSOR, *PCURSOR; typedef struct _CURICON_OBJECT {

1 0

[gedmurphy] 31727: Start to reorganize and rewrite parts of the usermode code for handling icons. Rewrite the CopyImage code for icons following the same call chain as Vista uses. The rest of the UM code will follow suit.
by gedmurphy＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: gedmurphy Date: Fri Jan 11 20:17:19 2008 New Revision: 31727 URL: http://svn.reactos.org/svn/reactos?rev=31727&view=rev Log: Start to reorganize and rewrite parts of the usermode code for handling icons. Rewrite the CopyImage code for icons following the same call chain as Vista uses. The rest of the UM code will follow suit. Modified: branches/curicon_rewrite/dll/win32/user32/windows/bitmap.c branches/curicon_rewrite/dll/win32/user32/windows/cursor.c branches/curicon_rewrite/dll/win32/user32/windows/icon.c Modified: branches/curicon_rewrite/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/curicon_rewrite/dll/win32/user3… ============================================================================== --- branches/curicon_rewrite/dll/win32/user32/windows/bitmap.c (original) +++ branches/curicon_rewrite/dll/win32/user32/windows/bitmap.c Fri Jan 11 20:17:19 2008 @@ -1,29 +1,10 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * 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 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 General Public License for more details. - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/input.c - * PURPOSE: Input - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 09-05-2001 CSH Created + * PROJECT: ReactOS User32 dll + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/user32/bitmap.c + * PURPOSE: Bitmap handling code + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Ged Murphy (gedmurphy(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -32,6 +13,8 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + +/* TYPES *********************************************************************/ #include "pshpack1.h" @@ -62,40 +45,8 @@ CURSORICONDIRENTRY *CURSORICON_FindBestIcon( CURSORICONDIR *dir, int width, int height, int colors); CURSORICONDIRENTRY *CURSORICON_FindBestCursor( CURSORICONDIR *dir, int width, int height, int colors); -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -HANDLE STDCALL -LoadImageA(HINSTANCE hinst, - LPCSTR lpszName, - UINT uType, - int cxDesired, - int cyDesired, - UINT fuLoad) -{ - LPWSTR lpszWName; - HANDLE Handle; - UNICODE_STRING NameString; - - if (HIWORD(lpszName)) - { - RtlCreateUnicodeStringFromAsciiz(&NameString, (LPSTR)lpszName); - lpszWName = NameString.Buffer; - Handle = LoadImageW(hinst, lpszWName, uType, cxDesired, - cyDesired, fuLoad); - RtlFreeUnicodeString(&NameString); - } - else - { - Handle = LoadImageW(hinst, (LPCWSTR)lpszName, uType, cxDesired, - cyDesired, fuLoad); - } - - return Handle; -} - + +/* PRIVATE FUNCTIONS *********************************************************/ /* * The following macro functions account for the irregularities of @@ -505,68 +456,6 @@ UnmapViewOfFile(BitmapInfo); return hBitmap; -} - -HANDLE STDCALL -LoadImageW( - IN HINSTANCE hinst, - IN LPCWSTR lpszName, - IN UINT uType, - IN INT cxDesired, - IN INT cyDesired, - IN UINT fuLoad) -{ - if (fuLoad & LR_DEFAULTSIZE) - { - if (uType == IMAGE_ICON) - { - if (cxDesired == 0) - cxDesired = GetSystemMetrics(SM_CXICON); - if (cyDesired == 0) - cyDesired = GetSystemMetrics(SM_CYICON); - } - else if (uType == IMAGE_CURSOR) - { - if (cxDesired == 0) - cxDesired = GetSystemMetrics(SM_CXCURSOR); - if (cyDesired == 0) - cyDesired = GetSystemMetrics(SM_CYCURSOR); - } - } - - switch (uType) - { - case IMAGE_BITMAP: - return LoadBitmapImage(hinst, lpszName, fuLoad); - case IMAGE_CURSOR: - case IMAGE_ICON: - return LoadCursorIconImage(hinst, lpszName, cxDesired, cyDesired, - fuLoad, uType); - default: - break; - } - - return NULL; -} - - -/* - * @implemented - */ -HBITMAP STDCALL -LoadBitmapA(HINSTANCE hInstance, LPCSTR lpBitmapName) -{ - return LoadImageA(hInstance, lpBitmapName, IMAGE_BITMAP, 0, 0, 0); -} - - -/* - * @implemented - */ -HBITMAP STDCALL -LoadBitmapW(HINSTANCE hInstance, LPCWSTR lpBitmapName) -{ - return LoadImageW(hInstance, lpBitmapName, IMAGE_BITMAP, 0, 0, 0); } @@ -764,28 +653,27 @@ return pbi->bmiHeader.biBitCount; } -#if 0 +#if 1 static BOOL SetCursorIconData( HANDLE Handle, - HINSTANCE hMod, + LPWSTR lpMod, LPWSTR lpResName, PICONINFO pIconInfo) { - - UNICODE_STRING Res; + UNICODE_STRING Mod, Res; + POINT p = {pIconInfo->xHotspot, pIconInfo->yHotspot}; // remove if (!Handle || !pIconInfo) return FALSE; + RtlInitUnicodeString(&Mod, lpResName); RtlInitUnicodeString(&Res, lpResName); - return NtUserSetCursorIconData(Handle, hMod, &Res, pIconInfo); - -} - - -/* bare bones icon copy implementation */ + //return NtUserSetCursorIconData(Handle, &Mod, &Res, pIconInfo); + return NtUserSetCursorIconData(Handle, &pIconInfo->fIcon, &p, NULL, NULL, NULL); +} + static HANDLE CopyIcoCur(HANDLE hIconCur, UINT type, @@ -794,57 +682,228 @@ UINT flags) { HANDLE hNewIcon = NULL; - ICONINFO origIconInfo, newIconInfo; + ICONINFO IconInfo; SIZE origSize; DWORD origBpp; if (!hIconCur) return NULL; + if ((desiredx < 0) || (desiredy < 0)) + return NULL; + if (flags & LR_COPYFROMRESOURCE) { TRACE("FIXME: LR_COPYFROMRESOURCE is yet not implemented for icons\n"); } + /* Get the original icon size */ if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy)) { + /* use the original size 0 was passed in */ if (desiredx == 0) desiredx = origSize.cx; - if (desiredx == 0) desiredy = origSize.cy; - - if (NtUserGetIconInfo(hIconCur, &origIconInfo, NULL, NULL, &origBpp, TRUE)) - { - hNewIcon = (HANDLE)NtUserCallOneParam(0, ONEPARAM_ROUTINE_CREATECURICONHANDLE); - - if (hNewIcon) + if (desiredy == 0) desiredy = origSize.cy; + } + else + { + TRACE("Failed to retrieve original icon dimensions\n"); + return NULL; + } + + /* get the original icon info */ + if (NtUserGetIconInfo(hIconCur, &IconInfo, NULL, NULL, &origBpp, TRUE)) + { + /* stretch the bitmap if required */ + if ((desiredx != origSize.cx) || (desiredy != origSize.cy)) + { + HBITMAP hBitmap; + BOOL bSuccess = FALSE; + + /* create a stretched copy of the color bitmap */ + hBitmap = CopyBmp(IconInfo.hbmColor, IMAGE_BITMAP, desiredx, desiredy, flags); + if (hBitmap) { - /* the bitmaps returned from the NtUserGetIconInfo are copies of the original, - * so we can use these directly to build up our icon/cursor copy */ - RtlCopyMemory(&newIconInfo, &origIconInfo, sizeof(ICONINFO)); - - if (!SetCursorIconData(hNewIcon, NULL, NULL, &newIconInfo)) + /* delete the original bitmap and set the new one */ + DeleteObject(IconInfo.hbmColor); + IconInfo.hbmColor = hBitmap; + + /* create a stretched copy of the mask bitmap */ + hBitmap = CopyBmp(IconInfo.hbmMask, IMAGE_BITMAP, desiredx, desiredy, flags); + if (hBitmap) { - if (newIconInfo.fIcon) - DestroyIcon(hNewIcon); - else - DestroyCursor(hNewIcon); - - hNewIcon = NULL; + /* delete the original bitmap and set the new one */ + DeleteObject(IconInfo.hbmMask); + IconInfo.hbmMask = hBitmap; + bSuccess = TRUE; } } - DeleteObject(origIconInfo.hbmMask); - DeleteObject(origIconInfo.hbmColor); - } + if (!bSuccess) goto error; + } + + /* create a new icon handle */ + hNewIcon = (HANDLE)NtUserCallOneParam(0, ONEPARAM_ROUTINE_CREATECURICONHANDLE); + if (hNewIcon) + { + /* set the icon data */ + if (!SetCursorIconData(hNewIcon, NULL, NULL, &IconInfo)) + { + goto error; + } + } + + /* delete the bitmaps, we're done with them now */ + DeleteObject(IconInfo.hbmMask); + DeleteObject(IconInfo.hbmColor); } if (hNewIcon && (flags & LR_COPYDELETEORG)) { + /* delete the icon we copied from */ DestroyCursor((HCURSOR)hIconCur); } + /* return the copied icon */ return hNewIcon; + +error: + if (hNewIcon) + DestroyCursor(hNewIcon); + + DeleteObject(IconInfo.hbmColor); + DeleteObject(IconInfo.hbmMask); + + return NULL; } #endif + + + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +HANDLE STDCALL +LoadImageW(IN HINSTANCE hinst, + IN LPCWSTR lpszName, + IN UINT uType, + IN INT cxDesired, + IN INT cyDesired, + IN UINT fuLoad) +{ + if (fuLoad & LR_DEFAULTSIZE) + { + if (uType == IMAGE_ICON) + { + if (cxDesired == 0) + cxDesired = GetSystemMetrics(SM_CXICON); + if (cyDesired == 0) + cyDesired = GetSystemMetrics(SM_CYICON); + } + else if (uType == IMAGE_CURSOR) + { + if (cxDesired == 0) + cxDesired = GetSystemMetrics(SM_CXCURSOR); + if (cyDesired == 0) + cyDesired = GetSystemMetrics(SM_CYCURSOR); + } + } + + switch (uType) + { + case IMAGE_BITMAP: + return LoadBitmapImage(hinst, + lpszName, + fuLoad); + case IMAGE_CURSOR: + case IMAGE_ICON: + return LoadCursorIconImage(hinst, + lpszName, + cxDesired, + cyDesired, + fuLoad, + uType); + default: + break; + } + + return NULL; +} + + +/* + * @implemented + */ +HBITMAP STDCALL +LoadBitmapA(HINSTANCE hInstance, + LPCSTR lpBitmapName) +{ + return LoadImageA(hInstance, + lpBitmapName, + IMAGE_BITMAP, + 0, + 0, + 0); +} + + +/* + * @implemented + */ +HBITMAP STDCALL +LoadBitmapW(HINSTANCE hInstance, + LPCWSTR lpBitmapName) +{ + return LoadImageW(hInstance, + lpBitmapName, + IMAGE_BITMAP, + 0, + 0, + 0); +} + + +/* + * @implemented + */ +HANDLE STDCALL +LoadImageA(HINSTANCE hinst, + LPCSTR lpszName, + UINT uType, + int cxDesired, + int cyDesired, + UINT fuLoad) +{ + LPWSTR lpszWName; + HANDLE Handle; + UNICODE_STRING NameString; + + if (HIWORD(lpszName)) + { + RtlCreateUnicodeStringFromAsciiz(&NameString, (LPSTR)lpszName); + lpszWName = NameString.Buffer; + Handle = LoadImageW(hinst, + lpszWName, + uType, + cxDesired, + cyDesired, + fuLoad); + RtlFreeUnicodeString(&NameString); + } + else + { + Handle = LoadImageW(hinst, + (LPCWSTR)lpszName, + uType, + cxDesired, + cyDesired, + fuLoad); + } + + return Handle; +} + /* * @unimplemented @@ -871,31 +930,21 @@ * if the source is a DIB section. * The LR_MONOCHROME flag is ignored if LR_CREATEDIBSECTION is present. */ - switch (type) - { - case IMAGE_BITMAP: - return CopyBmp(hnd, type, desiredx, desiredy, flags); - - case IMAGE_ICON: - //return CopyIcoCur(hnd, type, desiredx, desiredy, flags); - return CopyIcon(hnd); - - case IMAGE_CURSOR: - { - static BOOL IconMsgDisplayed = FALSE; - /* FIXME: support loading the image as shared from an instance */ - if (!IconMsgDisplayed) - { - FIXME("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n"); - IconMsgDisplayed = TRUE; - } - /* Should call CURSORICON_ExtCopy but more testing - * needs to be done before we change this - */ - if (flags) FIXME("FIXME: Flags are ignored\n"); + switch (type) + { + case IMAGE_BITMAP: + return CopyBmp(hnd, type, desiredx, desiredy, flags); + + case IMAGE_ICON: + //return CopyIcoCur(hnd, type, desiredx, desiredy, flags); + return CopyIcon(hnd); + + case IMAGE_CURSOR: + { + //return CopyIcoCur(hnd, type, desiredx, desiredy, flags); return CopyCursor(hnd); - } - } - - return NULL; -} + } + } + + return NULL; +} Modified: branches/curicon_rewrite/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/curicon_rewrite/dll/win32/user3… ============================================================================== --- branches/curicon_rewrite/dll/win32/user32/windows/cursor.c (original) +++ branches/curicon_rewrite/dll/win32/user32/windows/cursor.c Fri Jan 11 20:17:19 2008 @@ -1,29 +1,10 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * 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 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 General Public License for more details. - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/cursor.c - * PURPOSE: Cursor - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 09-05-2001 CSH Created + * PROJECT: ReactOS User32 dll + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/user32/cursor.c + * PURPOSE: Curosr handling code + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Ged Murphy (gedmurphy(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -36,35 +17,36 @@ #undef CopyCursor -HBITMAP -CopyBitmap(HBITMAP bmp); - -/* INTERNAL ******************************************************************/ +HBITMAP CopyBitmap(HBITMAP bmp); + + +/* PRIVATE FUNCTIONS *********************************************************/ + /* This callback routine is called directly after switching to gui mode */ NTSTATUS STDCALL User32SetupDefaultCursors(PVOID Arguments, ULONG ArgumentLength) { - BOOL *DefaultCursor = (BOOL*)Arguments; - LRESULT Result = TRUE; - - if(*DefaultCursor) - { - /* set default cursor */ - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - } - else - { - /* FIXME load system cursor scheme */ - SetCursor(0); - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - } - - return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); -} - -/* FUNCTIONS *****************************************************************/ - + BOOL *DefaultCursor = (BOOL*)Arguments; + LRESULT Result = TRUE; + + if(*DefaultCursor) + { + /* set default cursor */ + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + } + else + { + /* FIXME load system cursor scheme */ + SetCursor(0); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + } + + return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); +} + + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented Modified: branches/curicon_rewrite/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/curicon_rewrite/dll/win32/user3… ============================================================================== --- branches/curicon_rewrite/dll/win32/user32/windows/icon.c (original) +++ branches/curicon_rewrite/dll/win32/user32/windows/icon.c Fri Jan 11 20:17:19 2008 @@ -1,29 +1,10 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * 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 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 General Public License for more details. - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/icon.c - * PURPOSE: Icon - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 09-05-2001 CSH Created + * PROJECT: ReactOS User32 dll + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/user32/icon.c + * PURPOSE: Icon handling code + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Ged Murphy (gedmurphy(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -33,8 +14,8 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -/* FUNCTIONS *****************************************************************/ - + +/* PRIVATE FUNCTIONS *********************************************************/ HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot) @@ -142,6 +123,206 @@ return NtUserCreateCursorIconHandle(&IconInfo, FALSE); } + + + + +/* + * The following macro function accounts for the irregularities of + * accessing cursor and icon resources in files and resource entries. + */ +typedef BOOL +(*fnGetCIEntry)(LPVOID dir, int n, int *width, int *height, int *bits ); + +/********************************************************************** + * CURSORICON_FindBestIcon + * + * Find the icon closest to the requested size and number of colors. + */ +static int +CURSORICON_FindBestIcon(LPVOID dir, + fnGetCIEntry get_entry, + int Width, + int Height, + int ColorBits) +{ + int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; + UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; + UINT iTempXDiff, iTempYDiff, iTempColorDiff; + + /* Find Best Fit */ + iTotalDiff = 0xFFFFFFFF; + iColorDiff = 0xFFFFFFFF; + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + iTempXDiff = abs(Width - cx); + iTempYDiff = abs(Height - cy); + + if(iTotalDiff > (iTempXDiff + iTempYDiff)) + { + iXDiff = iTempXDiff; + iYDiff = iTempYDiff; + iTotalDiff = iXDiff + iYDiff; + } + } + + /* Find Best Colors for Best Fit */ + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) + { + iTempColorDiff = abs(ColorBits - Bits); + if(iColorDiff > iTempColorDiff) + { + BestEntry = i; + BestBits = Bits; + iColorDiff = iTempColorDiff; + } + } + } + + TRACE("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits); + + return BestEntry; +} + + + +/********************************************************************** + * CURSORICON_FindBestCursor + * + * Find the cursor closest to the requested size. + * FIXME: parameter 'color' ignored and entries with more than 1 bpp + * ignored too + */ +static int +CURSORICON_FindBestCursor(LPVOID dir, + fnGetCIEntry get_entry, + int Width, + int Height, + int ColorBits) +{ + int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; + UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; + UINT iTempXDiff, iTempYDiff, iTempColorDiff; + + /* Find Best Fit */ + iTotalDiff = 0xFFFFFFFF; + iColorDiff = 0xFFFFFFFF; + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + iTempXDiff = abs(Width - cx); + iTempYDiff = abs(Height - cy); + + if(iTotalDiff > (iTempXDiff + iTempYDiff)) + { + iXDiff = iTempXDiff; + iYDiff = iTempYDiff; + iTotalDiff = iXDiff + iYDiff; + } + } + + /* Find Best Colors for Best Fit */ + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) + { + iTempColorDiff = abs(ColorBits - Bits); + if(iColorDiff > iTempColorDiff) + { + BestEntry = i; + BestBits = Bits; + iColorDiff = iTempColorDiff; + } + } + } + + TRACE("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits); + + return BestEntry; +} + + +static BOOL +CURSORICON_GetResIconEntry(LPVOID dir, + int n, + int *Width, + int *Height, + int *Bits) +{ + GRPCURSORICONDIR *ResDir = dir; + ICONRESDIR *Icon; + + if (ResDir->idCount <= n) + return FALSE; + + Icon = &ResDir->idEntries[n].ResInfo.icon; + *Width = Icon->bWidth; + *Height = Icon->bHeight; + *Bits = ResDir->idEntries[n].wBitCount; + return TRUE; +} + +static BOOL +CURSORICON_GetResCursorEntry(LPVOID dir, + int n, + int *Width, + int *Height, + int *Bits) +{ + GRPCURSORICONDIR *ResDir = dir; + CURSORRESDIR *Cursor; + + if (ResDir->idCount <= n) + return FALSE; + + Cursor = &ResDir->idEntries[n].ResInfo.cursor; + *Width = Cursor->wWidth; + *Height = Cursor->wHeight; + *Bits = ResDir->idEntries[n].wBitCount; + return TRUE; +} + +static GRPCURSORICONDIRENTRY * +CURSORICON_FindBestIconRes(GRPCURSORICONDIR * dir, + int Width, + int Height, + int ColorBits) +{ + int n; + n = CURSORICON_FindBestIcon(dir, + CURSORICON_GetResIconEntry, + Width, + Height, + ColorBits); + if (n < 0) + return NULL; + + return &dir->idEntries[n]; +} + +static GRPCURSORICONDIRENTRY * +CURSORICON_FindBestCursorRes(GRPCURSORICONDIR *dir, + int Width, + int Height, + int ColorBits) +{ + int n; + n = CURSORICON_FindBestCursor(dir, + CURSORICON_GetResCursorEntry, + Width, + Height, + ColorBits); + if (n < 0) + return NULL; + + return &dir->idEntries[n]; +} + + + + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented @@ -452,201 +633,6 @@ - - -/* - * The following macro function accounts for the irregularities of - * accessing cursor and icon resources in files and resource entries. - */ -typedef BOOL -(*fnGetCIEntry)(LPVOID dir, int n, int *width, int *height, int *bits ); - -/********************************************************************** - * CURSORICON_FindBestIcon - * - * Find the icon closest to the requested size and number of colors. - */ -static int -CURSORICON_FindBestIcon(LPVOID dir, - fnGetCIEntry get_entry, - int Width, - int Height, - int ColorBits) -{ - int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; - UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; - UINT iTempXDiff, iTempYDiff, iTempColorDiff; - - /* Find Best Fit */ - iTotalDiff = 0xFFFFFFFF; - iColorDiff = 0xFFFFFFFF; - for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) - { - iTempXDiff = abs(Width - cx); - iTempYDiff = abs(Height - cy); - - if(iTotalDiff > (iTempXDiff + iTempYDiff)) - { - iXDiff = iTempXDiff; - iYDiff = iTempYDiff; - iTotalDiff = iXDiff + iYDiff; - } - } - - /* Find Best Colors for Best Fit */ - for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) - { - if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) - { - iTempColorDiff = abs(ColorBits - Bits); - if(iColorDiff > iTempColorDiff) - { - BestEntry = i; - BestBits = Bits; - iColorDiff = iTempColorDiff; - } - } - } - - TRACE("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits); - - return BestEntry; -} - - - -/********************************************************************** - * CURSORICON_FindBestCursor - * - * Find the cursor closest to the requested size. - * FIXME: parameter 'color' ignored and entries with more than 1 bpp - * ignored too - */ -static int -CURSORICON_FindBestCursor(LPVOID dir, - fnGetCIEntry get_entry, - int Width, - int Height, - int ColorBits) -{ - int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; - UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; - UINT iTempXDiff, iTempYDiff, iTempColorDiff; - - /* Find Best Fit */ - iTotalDiff = 0xFFFFFFFF; - iColorDiff = 0xFFFFFFFF; - for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) - { - iTempXDiff = abs(Width - cx); - iTempYDiff = abs(Height - cy); - - if(iTotalDiff > (iTempXDiff + iTempYDiff)) - { - iXDiff = iTempXDiff; - iYDiff = iTempYDiff; - iTotalDiff = iXDiff + iYDiff; - } - } - - /* Find Best Colors for Best Fit */ - for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) - { - if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) - { - iTempColorDiff = abs(ColorBits - Bits); - if(iColorDiff > iTempColorDiff) - { - BestEntry = i; - BestBits = Bits; - iColorDiff = iTempColorDiff; - } - } - } - - TRACE("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits); - - return BestEntry; -} - - -static BOOL -CURSORICON_GetResIconEntry(LPVOID dir, - int n, - int *Width, - int *Height, - int *Bits) -{ - GRPCURSORICONDIR *ResDir = dir; - ICONRESDIR *Icon; - - if (ResDir->idCount <= n) - return FALSE; - - Icon = &ResDir->idEntries[n].ResInfo.icon; - *Width = Icon->bWidth; - *Height = Icon->bHeight; - *Bits = ResDir->idEntries[n].wBitCount; - return TRUE; -} - -static BOOL -CURSORICON_GetResCursorEntry(LPVOID dir, - int n, - int *Width, - int *Height, - int *Bits) -{ - GRPCURSORICONDIR *ResDir = dir; - CURSORRESDIR *Cursor; - - if (ResDir->idCount <= n) - return FALSE; - - Cursor = &ResDir->idEntries[n].ResInfo.cursor; - *Width = Cursor->wWidth; - *Height = Cursor->wHeight; - *Bits = ResDir->idEntries[n].wBitCount; - return TRUE; -} - -static GRPCURSORICONDIRENTRY * -CURSORICON_FindBestIconRes(GRPCURSORICONDIR * dir, - int Width, - int Height, - int ColorBits) -{ - int n; - n = CURSORICON_FindBestIcon(dir, - CURSORICON_GetResIconEntry, - Width, - Height, - ColorBits); - if (n < 0) - return NULL; - - return &dir->idEntries[n]; -} - -static GRPCURSORICONDIRENTRY * -CURSORICON_FindBestCursorRes(GRPCURSORICONDIR *dir, - int Width, - int Height, - int ColorBits) -{ - int n; - n = CURSORICON_FindBestCursor(dir, - CURSORICON_GetResCursorEntry, - Width, - Height, - ColorBits); - if (n < 0) - return NULL; - - return &dir->idEntries[n]; -} - - INT WINAPI LookupIconIdFromDirectoryEx(PBYTE xdir, BOOL bIcon,

1 0

[fireball] 31726: - Update ros diff according to recent Colin's changes.
by fireball＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: fireball Date: Fri Jan 11 19:32:28 2008 New Revision: 31726 URL: http://svn.reactos.org/svn/reactos?rev=31726&view=rev Log: - Update ros diff according to recent Colin's changes. Modified: trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Fri Jan 11 19:32:28 2008 @@ -1,6 +1,21 @@ --- hash.c Fri Sep 29 17:48:44 2006 -+++ hash.c Sat Jan 05 21:25:37 2008 -@@ -533,17 +533,24 @@ ++++ hash.c Fri Jan 11 17:49:22 2008 +@@ -19,13 +19,11 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + #include <stdio.h> + #include <stdarg.h> + +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" ++#include <host/nls.h> + + #include "hash.h" + + static const unsigned char Lookup_16[128 * 3] = { + /* Common */ +@@ -533,17 +531,24 @@ case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: @@ -26,7 +41,7 @@ case LANG_CZECH: case LANG_HUNGARIAN: case LANG_POLISH: case LANG_SLOVAK: case LANG_SPANISH: --- server.c Sat Jan 05 20:48:36 2008 -+++ server.c Sat Jan 05 22:44:57 2008 ++++ server.c Fri Jan 11 17:49:21 2008 @@ -388,10 +388,11 @@ error("Could not open %s for output\n", server_name); @@ -39,8 +54,24 @@ } +--- typelib.c Sat Jan 05 20:48:36 2008 ++++ typelib.c Fri Jan 11 17:49:21 2008 +@@ -33,12 +33,11 @@ + #include <signal.h> + + #define NONAMELESSUNION + #define NONAMELESSSTRUCT + +-#include "windef.h" +-#include "winbase.h" ++#include <host/typedefs.h> + + #include "widl.h" + #include "utils.h" + #include "parser.h" + #include "header.h" --- widl.c Sat Jan 05 20:48:36 2008 -+++ widl.c Sat Jan 05 23:44:29 2008 ++++ widl.c Fri Jan 11 17:49:21 2008 @@ -547,10 +547,15 @@ return 1; } @@ -57,3 +88,42 @@ if(!(header = fopen(header_name, "w"))) { fprintf(stderr, "Could not open %s for output\n", header_name); return 1; +--- widltypes.h Sat Jan 05 20:48:36 2008 ++++ widltypes.h Fri Jan 11 17:49:22 2008 +@@ -19,10 +19,17 @@ + */ + + #ifndef __WIDL_WIDLTYPES_H + #define __WIDL_WIDLTYPES_H + ++#define S_OK 0 ++#define S_FALSE 1 ++#define E_OUTOFMEMORY ((HRESULT)0x8007000EL) ++#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L) ++ ++#define max(a, b) ((a) > (b) ? a : b) ++ + #include <stdarg.h> + #include "guiddef.h" + #include "wine/rpcfc.h" + #include "wine/list.h" + +--- write_msft.c Sat Jan 05 20:48:36 2008 ++++ write_msft.c Fri Jan 11 17:49:22 2008 +@@ -38,14 +38,12 @@ + #include <time.h> + + #define NONAMELESSUNION + #define NONAMELESSSTRUCT + +-#include "winerror.h" +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" ++#include <host/typedefs.h> ++#include <host/nls.h> + + #include "widltypes.h" + #include "typelib.h" + #include "typelib_struct.h" + #include "utils.h"

1 0

[gedmurphy] 31725: create a branch for the cursor / icon object rewrite
by gedmurphy＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: gedmurphy Date: Fri Jan 11 19:21:39 2008 New Revision: 31725 URL: http://svn.reactos.org/svn/reactos?rev=31725&view=rev Log: create a branch for the cursor / icon object rewrite Added: branches/curicon_rewrite/ - copied from r31724, trunk/reactos/

1 0

[gedmurphy] 31724: lets delete it and try again
by gedmurphy＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: gedmurphy Date: Fri Jan 11 19:21:03 2008 New Revision: 31724 URL: http://svn.reactos.org/svn/reactos?rev=31724&view=rev Log: lets delete it and try again Removed: branches/curicon_rewrite/

1 0

[gedmurphy] 31723: create a branch for the cursor / icon object rewrite
by gedmurphy＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: gedmurphy Date: Fri Jan 11 19:17:42 2008 New Revision: 31723 URL: http://svn.reactos.org/svn/reactos?rev=31723&view=rev Log: create a branch for the cursor / icon object rewrite Added: branches/curicon_rewrite/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs