Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 43171: Add global compilerflag to ignore format warnings
by tkreuzer＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: tkreuzer Date: Sat Sep 26 21:54:59 2009 New Revision: 43171 URL: http://svn.reactos.org/svn/reactos?rev=43171&view=rev Log: Add global compilerflag to ignore format warnings Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Sep 26 21:54:59 2009 @@ -46,6 +46,7 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> + <compilerflag>-Wno-format</compilerflag>  <linkerflag>-disable-stdcall-fixup</linkerflag> <linkerflag>-static</linkerflag> Modified: branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] Sat Sep 26 21:54:59 2009 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe"> - <compilerflag>-Wno-format</compilerflag> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> <define name="__WINESRC__" />

1 0

[gschneider] 43170: Don't add quick launch icon copies after showing a context menu See issue #2453 for more details.
by gschneider＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: gschneider Date: Sat Sep 26 21:24:39 2009 New Revision: 43170 URL: http://svn.reactos.org/svn/reactos?rev=43170&view=rev Log: Don't add quick launch icon copies after showing a context menu See issue #2453 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sat Sep 26 21:24:39 2009 @@ -252,9 +252,7 @@ if (entry) { // entry is NULL for desktop switch buttons HRESULT hr = entry->do_context_menu(_hwnd, screen_pt, _cm_ifs); - if (SUCCEEDED(hr)) - AddShortcuts(); //refresh(); - else + if (!SUCCEEDED(hr)) CHECKERROR(hr); } else goto def;

1 0

[dgorbachev] 43169: - Import Breton, Romansh, and Welsh NLS files from Wine. - Sync locale RC files. - Move language-specific stuff to more visible to translators place. ; )
by dgorbachev＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: dgorbachev Date: Sat Sep 26 19:37:25 2009 New Revision: 43169 URL: http://svn.reactos.org/svn/reactos?rev=43169&view=rev Log: - Import Breton, Romansh, and Welsh NLS files from Wine. - Sync locale RC files. - Move language-specific stuff to more visible to translators place. ;) Added: trunk/reactos/dll/win32/kernel32/nls/brf.nls (with props) trunk/reactos/dll/win32/kernel32/nls/cym.nls (with props) trunk/reactos/dll/win32/kernel32/nls/rmc.nls (with props) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -5,6 +5,9 @@ #include <reactos/version.rc> #include "windows.h" -#include "errcodes.rc" #include "locale_rc.rc" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "windef.h" @@ -44,9 +44,9 @@ #include "nls/arh.nls" /* 0x3c01 LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN */ #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ -#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_NEUTRAL */ - -#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_NEUTRAL */ +#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ + +#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ @@ -54,9 +54,9 @@ #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ #include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ -#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_NEUTRAL */ - -#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_NEUTRAL */ +#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ + +#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_DEFAULT */ #include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ #include "nls/des.nls" /* 0x0807 LANG_GERMAN, SUBLANG_GERMAN_SWISS */ @@ -64,7 +64,7 @@ #include "nls/del.nls" /* 0x1007 LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */ #include "nls/dec.nls" /* 0x1407 LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */ -#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_NEUTRAL */ +#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_DEFAULT */ #include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ #include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ @@ -101,7 +101,7 @@ #include "nls/esi.nls" /* 0x4c0a LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */ #include "nls/esu.nls" /* 0x500a LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */ -#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_NEUTRAL */ +#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_DEFAULT */ #include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ #include "nls/frb.nls" /* 0x080c LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */ @@ -110,16 +110,16 @@ #include "nls/frl.nls" /* 0x140c LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */ #include "nls/frm.nls" /* 0x180c LANG_FRENCH, SUBLANG_FRENCH_MONACO */ -#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_NEUTRAL */ - -#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_NEUTRAL */ - -#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_NEUTRAL */ +#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_DEFAULT */ + +#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_DEFAULT */ + +#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_DEFAULT */ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ +#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ #include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ @@ -129,124 +129,122 @@ #include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */ #include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */ -#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_NEUTRAL */ +#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_DEFAULT */ #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ -#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_NEUTRAL */ - -#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_NEUTRAL */ - -#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_NEUTRAL */ +//#include "nls/rmc.nls" /* 0x0417 LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */ + +#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ + +#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ + +#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ -#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_NEUTRAL */ - -#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_NEUTRAL */ - -#include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_NEUTRAL */ +#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ + +#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_DEFAULT */ + +#include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ -#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_NEUTRAL */ - -#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_NEUTRAL */ +#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_DEFAULT */ + +#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ #include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ -#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_NEUTRAL */ - -#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_NEUTRAL */ - -#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_NEUTRAL */ - -#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_NEUTRAL */ - -#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_NEUTRAL */ - -#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_NEUTRAL */ +#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ + +#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_DEFAULT */ + +#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_DEFAULT */ + +#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_DEFAULT */ + +#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_DEFAULT */ + +#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ #include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ -#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_NEUTRAL */ - -#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_NEUTRAL */ - -#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ +#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ + +#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ + +#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ #include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ #include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ -#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_NEUTRAL */ - -#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_NEUTRAL */ - -#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_NEUTRAL */ - -#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_NEUTRAL */ - -#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_NEUTRAL */ - -#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_NEUTRAL */ +#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ + +#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_DEFAULT */ + +#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ + +#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ + +#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ + +#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ -#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_NEUTRAL */ - -#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_NEUTRAL */ - -#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_NEUTRAL */ +#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ + +#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ + +#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ #include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ -#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_NEUTRAL */ - -#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_NEUTRAL */ - -#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_NEUTRAL */ - -#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_NEUTRAL */ - -#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_NEUTRAL */ - -#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_NEUTRAL */ - -#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_NEUTRAL */ - -#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_NEUTRAL */ - -#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_NEUTRAL */ - -#include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_NEUTRAL */ - -#include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_NEUTRAL */ - -#include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_NEUTRAL */ - -#include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_NEUTRAL */ +#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ + +#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ + +#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ + +#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ + +#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ + +#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ + +#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ + +#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ + +#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ + +//#include "nls/cym.nls" /* 0x0452 LANG_WELSH, SUBLANG_DEFAULT */ + +#include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ + +#include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_DEFAULT */ + +#include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ + +#include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ + +//#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_DEFAULT */ /* Wine extensions */ //#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ -//#include "nls/gae.nls" /* 0x043c LANG_GAELIC, SUBLANG_GAELIC */ -//#include "nls/gdh.nls" /* 0x083c LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ -//#include "nls/gdv.nls" /* 0x0c3c LANG_GAELIC, SUBLANG_GAELIC_MANX */ - -//#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_NEUTRAL */ - -//#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_NEUTRAL */ - -//#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_NEUTRAL */ - -//#include "nls/cym.nls" /* 0x0492 LANG_WELSH, SUBLANG_NEUTRAL */ - -//#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_NEUTRAL */ - -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/ru-RU.rc" +//#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ + +//#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */ + +//#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_DEFAULT */ + +//#include "nls/gae.nls" /* 0x0494 LANG_GAELIC, SUBLANG_GAELIC */ +//#include "nls/gdh.nls" /* 0x0894 LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ +//#include "nls/gdv.nls" /* 0x0c94 LANG_GAELIC, SUBLANG_GAELIC_MANX */ Added: trunk/reactos/dll/win32/kernel32/nls/brf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/brf… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/brf.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/brf.nls [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -1,0 +1,157 @@ +/* + * Locale definitions for Breton (France) + * + * Copyright 1998 Marcel Baur + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "33" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "33" + LOCALE_IDEFAULTEBCDICCODEPAGE "20297" + LOCALE_IDEFAULTLANGUAGE "040c" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0493" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "FRA" + LOCALE_SABBREVDAYNAME1 "Lun" + LOCALE_SABBREVDAYNAME2 "Meu" + LOCALE_SABBREVDAYNAME3 "Mer" + LOCALE_SABBREVDAYNAME4 "Yao" + LOCALE_SABBREVDAYNAME5 "Gwe" + LOCALE_SABBREVDAYNAME6 "Sad" + LOCALE_SABBREVDAYNAME7 "Sul" + LOCALE_SABBREVLANGNAME "BRF" + LOCALE_SABBREVMONTHNAME1 "Gen" + LOCALE_SABBREVMONTHNAME2 "C'h" + LOCALE_SABBREVMONTHNAME3 "Meu" + LOCALE_SABBREVMONTHNAME4 "Ebr" + LOCALE_SABBREVMONTHNAME5 "Mae" + LOCALE_SABBREVMONTHNAME6 "Mez" + LOCALE_SABBREVMONTHNAME7 "Gou" + LOCALE_SABBREVMONTHNAME8 "Eos" + LOCALE_SABBREVMONTHNAME9 "Gwe" + LOCALE_SABBREVMONTHNAME10 "Her" + LOCALE_SABBREVMONTHNAME11 "Du" + LOCALE_SABBREVMONTHNAME12 "Ker" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "France" + LOCALE_SCURRENCY "" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Lun" + LOCALE_SDAYNAME2 "Meurzh" + LOCALE_SDAYNAME3 "Merc'her" + LOCALE_SDAYNAME4 "Yaou" + LOCALE_SDAYNAME5 "Gwener" + LOCALE_SDAYNAME6 "Sadorn" + LOCALE_SDAYNAME7 "Sul" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "France" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Breton" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "FR" + LOCALE_SISO639LANGNAME "br" + LOCALE_SLANGUAGE "Brezhoneg" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd d MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Genver" + LOCALE_SMONTHNAME2 "C'hwevrer" + LOCALE_SMONTHNAME3 "Meurzh" + LOCALE_SMONTHNAME4 "Ebrel" + LOCALE_SMONTHNAME5 "Mae" + LOCALE_SMONTHNAME6 "Mezheven" + LOCALE_SMONTHNAME7 "Gouere" + LOCALE_SMONTHNAME8 "Eost" + LOCALE_SMONTHNAME9 "Gwengolo" + LOCALE_SMONTHNAME10 "Here" + LOCALE_SMONTHNAME11 "Du" + LOCALE_SMONTHNAME12 "Kerzu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP " " + LOCALE_SNAME "br-FR" + LOCALE_SNATIVECTRYNAME "Bro-C'haill" + LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Brezhoneg" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND " " + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/brf.nls ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/nls/cym.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cym… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/cym.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/cym.nls [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -1,0 +1,157 @@ +/* + * Locale definitions for Welsh (United Kingdom) + * + * Copyright 1998 Marcel Baur + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(28604) + +STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x01ff\x003f\x8000\xffff" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "44" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "28604" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "44" + LOCALE_IDEFAULTEBCDICCODEPAGE "20285" + LOCALE_IDEFAULTLANGUAGE "0409" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28604" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0492" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "1" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "3" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "yb" + LOCALE_S2359 "yp" + LOCALE_SABBREVCTRYNAME "GBR" + LOCALE_SABBREVDAYNAME1 "Lln" + LOCALE_SABBREVDAYNAME2 "Maw" + LOCALE_SABBREVDAYNAME3 "Mer" + LOCALE_SABBREVDAYNAME4 "Iau" + LOCALE_SABBREVDAYNAME5 "Gwe" + LOCALE_SABBREVDAYNAME6 "Sad" + LOCALE_SABBREVDAYNAME7 "Sul" + LOCALE_SABBREVLANGNAME "CYM" + LOCALE_SABBREVMONTHNAME1 "Ion" + LOCALE_SABBREVMONTHNAME2 "Chw" + LOCALE_SABBREVMONTHNAME3 "Maw" + LOCALE_SABBREVMONTHNAME4 "Ebr" + LOCALE_SABBREVMONTHNAME5 "Mai" + LOCALE_SABBREVMONTHNAME6 "Meh" + LOCALE_SABBREVMONTHNAME7 "Gor" + LOCALE_SABBREVMONTHNAME8 "Aws" + LOCALE_SABBREVMONTHNAME9 "Med" + LOCALE_SABBREVMONTHNAME10 "Hyd" + LOCALE_SABBREVMONTHNAME11 "Tch" + LOCALE_SABBREVMONTHNAME12 "Rhg" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Cymru" + LOCALE_SCURRENCY "£" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Dydd Llun" + LOCALE_SDAYNAME2 "Dydd Mawrth" + LOCALE_SDAYNAME3 "Dydd Mercher" + LOCALE_SDAYNAME4 "Dydd Iau" + LOCALE_SDAYNAME5 "Dydd Gwener" + LOCALE_SDAYNAME6 "Dydd Sadwrn" + LOCALE_SDAYNAME7 "Dydd Sul" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Wales" + LOCALE_SENGCURRNAME "UK Pound Sterling" + LOCALE_SENGLANGUAGE "Welsh" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "GBP" + LOCALE_SISO3166CTRYNAME "GB" + LOCALE_SISO639LANGNAME "cy" + LOCALE_SLANGUAGE "Welsh (United Kingdom)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Ionawr" + LOCALE_SMONTHNAME2 "Chwefror" + LOCALE_SMONTHNAME3 "Mawrth" + LOCALE_SMONTHNAME4 "Ebrill" + LOCALE_SMONTHNAME5 "Mai" + LOCALE_SMONTHNAME6 "Mehefin" + LOCALE_SMONTHNAME7 "Gorffennaf" + LOCALE_SMONTHNAME8 "Awst" + LOCALE_SMONTHNAME9 "Medi" + LOCALE_SMONTHNAME10 "Hydref" + LOCALE_SMONTHNAME11 "Tachwedd" + LOCALE_SMONTHNAME12 "Rhagfyr" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "cy-GB" + LOCALE_SNATIVECTRYNAME "Cymru" + LOCALE_SNATIVECURRNAME "punt" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Cymraeg" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd/MM/yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/cym.nls ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/nls/rmc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rmc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/rmc.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/rmc.nls [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -1,0 +1,167 @@ +/* + * Locale definitions for Romansh (Switzerland) + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * Copyright 2008 Michael Stefaniuc + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* +- Windows Vista (at least the NLS information about it on www.microsoft.com) + has the wrong short date format dd/MM/yyyy e.g. 01/08/1996 instead of the + correct d-M-yyyy e.g 1-8-1996. This file uses the right short date format as + seen on http://www.liarumantscha.ch/ and in the glibc-morelocales.patch for + glibc-2.6. +- As decimal separator this file uses the "," like http://www.liarumantscha.ch/ + does and not the "." used by Windows Vista and the Swiss German language. +*/ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0093\x0000\x0000\xcdd4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "41" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "41" + LOCALE_IDEFAULTEBCDICCODEPAGE "20273" + LOCALE_IDEFAULTLANGUAGE "0417" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "2" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0417" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "2" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "CHE" + LOCALE_SABBREVDAYNAME1 "gli" + LOCALE_SABBREVDAYNAME2 "ma" + LOCALE_SABBREVDAYNAME3 "me" + LOCALE_SABBREVDAYNAME4 "gie" + LOCALE_SABBREVDAYNAME5 "ve" + LOCALE_SABBREVDAYNAME6 "so" + LOCALE_SABBREVDAYNAME7 "du" + LOCALE_SABBREVLANGNAME "RMC" + LOCALE_SABBREVMONTHNAME1 "schan" + LOCALE_SABBREVMONTHNAME2 "favr" + LOCALE_SABBREVMONTHNAME3 "mars" + LOCALE_SABBREVMONTHNAME4 "avr" + LOCALE_SABBREVMONTHNAME5 "matg" + LOCALE_SABBREVMONTHNAME6 "zercl" + LOCALE_SABBREVMONTHNAME7 "fan" + LOCALE_SABBREVMONTHNAME8 "avust" + LOCALE_SABBREVMONTHNAME9 "sett" + LOCALE_SABBREVMONTHNAME10 "oct" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Switzerland" + LOCALE_SCURRENCY "fr." + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "glindesdi" + LOCALE_SDAYNAME2 "mardi" + LOCALE_SDAYNAME3 "mesemna" + LOCALE_SDAYNAME4 "gievgia" + LOCALE_SDAYNAME5 "venderdi" + LOCALE_SDAYNAME6 "sonda" + LOCALE_SDAYNAME7 "dumengia" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Switzerland" + LOCALE_SENGCURRNAME "Swiss Franc" + LOCALE_SENGLANGUAGE "Romansh" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "CHF" + LOCALE_SISO3166CTRYNAME "CH" + LOCALE_SISO639LANGNAME "rm" + LOCALE_SLANGUAGE "Romansh (Switzerland)" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "schaner" + LOCALE_SMONTHNAME2 "favrer" + LOCALE_SMONTHNAME3 "mars" + LOCALE_SMONTHNAME4 "avrigl" + LOCALE_SMONTHNAME5 "matg" + LOCALE_SMONTHNAME6 "zercladur" + LOCALE_SMONTHNAME7 "fanadur" + LOCALE_SMONTHNAME8 "avust" + LOCALE_SMONTHNAME9 "settember" + LOCALE_SMONTHNAME10 "october" + LOCALE_SMONTHNAME11 "november" + LOCALE_SMONTHNAME12 "december" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "'" + LOCALE_SNAME "rm-CH" + LOCALE_SNATIVECTRYNAME "Svizra" + LOCALE_SNATIVECURRNAME "Franc svizzer" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Rumantsch (Svizra)" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "'" + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/rmc.nls ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 43168: Fix one of the most awesome "_MSC_VER means compiling with Microsoft's header set" assumptions, revision 30728. Instead of breaking linking for user mode CRT to hide header incompatibilities we now use a less exciting solution; do not include the incompatible headers when implementing the affected functions -- abs.c and labs.c don't need anything at all, and strset.c only needs size_t, so define it there.
by sginsberg＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: sginsberg Date: Sat Sep 26 17:42:34 2009 New Revision: 43168 URL: http://svn.reactos.org/svn/reactos?rev=43168&view=rev Log: Fix one of the most awesome "_MSC_VER means compiling with Microsoft's header set" assumptions, revision 30728. Instead of breaking linking for user mode CRT to hide header incompatibilities we now use a less exciting solution; do not include the incompatible headers when implementing the affected functions -- abs.c and labs.c don't need anything at all, and strset.c only needs size_t, so define it there. Modified: trunk/reactos/lib/sdk/crt/math/abs.c trunk/reactos/lib/sdk/crt/math/labs.c trunk/reactos/lib/sdk/crt/string/strset.c Modified: trunk/reactos/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] Sat Sep 26 17:42:34 2009 @@ -1,13 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> /* * @implemented */ -#ifndef _MSC_VER int abs(int j) { return j<0 ? -j : j; } -#endif Modified: trunk/reactos/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/labs.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] Sat Sep 26 17:42:34 2009 @@ -1,13 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <precomp.h> /* * @implemented */ -#ifndef _MSC_VER long labs(long j) { return j<0 ? -j : j; } -#endif Modified: trunk/reactos/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] Sat Sep 26 17:42:34 2009 @@ -8,7 +8,15 @@ * 25/11/05: Added license header */ -#include <precomp.h> +#if defined(__GNUC__) +#define __int64 long long +#endif + +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else +typedef unsigned int size_t; +#endif /* * @implemented @@ -30,7 +38,6 @@ /* * @implemented */ -#ifndef _MSC_VER char* _strset(char* szToFill, int szFill) { char *t = szToFill; @@ -42,4 +49,3 @@ } return t; } -#endif

1 0

[sginsberg] 43167: - HAL: Make /W3 friendly - Everywhere else: Use casts instead of -1U to fix C4146 (this is compatible with both compilers)
by sginsberg＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: sginsberg Date: Sat Sep 26 15:41:57 2009 New Revision: 43167 URL: http://svn.reactos.org/svn/reactos?rev=43167&view=rev Log: - HAL: Make /W3 friendly - Everywhere else: Use casts instead of -1U to fix C4146 (this is compatible with both compilers) Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/include/ioapic.h trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/ioapic.c trunk/reactos/hal/halx86/mp/mpconfig.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -311,7 +311,7 @@ Length = _vsnprintf(Buffer, 512, Format, ap); /* Check if we went past the buffer */ - if (Length == -1U) + if (Length == (ULONG)-1) { /* Terminate it if we went over-board */ Buffer[sizeof(Buffer) - 1] = '\n'; Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -116,7 +116,7 @@ break; } - if (red == -1U) + if (red == (DWORD)-1) { red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0); if (HIWORD(red)) @@ -127,7 +127,7 @@ red = LOBYTE(red); } - if (green == -1U) + if (green == (DWORD)-1) { green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0); if (HIWORD(green)) @@ -138,7 +138,7 @@ green = LOBYTE(green); } - if (blue == -1U) + if (blue == (DWORD)-1) { blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0); if (HIWORD(blue)) Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -160,7 +160,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); - if (pConInfo->WindowPosition != -1U) + if (pConInfo->WindowPosition != (DWORD)-1) { SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, LOWORD(pConInfo->WindowPosition), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, HIWORD(pConInfo->WindowPosition), FALSE); Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -968,7 +968,7 @@ GetSysColor(COLOR_WINDOWTEXT)); } - if (lpdis->itemID != -1U) + if (lpdis->itemID != (UINT)-1) { CopyRect(&rc, &lpdis->rcItem); rc.left += 5; Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -232,7 +232,7 @@ CLIENT_ID ClientId; /* If we don't have a PID, look it up */ - if (dwProcessId == -1U) dwProcessId = (DWORD)CsrGetProcessId(); + if (dwProcessId == (DWORD)-1) dwProcessId = (DWORD)CsrGetProcessId(); /* Open a handle to the process */ ClientId.UniqueThread = NULL; Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -534,7 +534,7 @@ *lpDistanceToMoveHigh = FilePosition.CurrentByteOffset.u.HighPart; } - if (FilePosition.CurrentByteOffset.u.LowPart == -1U) + if (FilePosition.CurrentByteOffset.u.LowPart == (DWORD)-1) { /* The value of -1 is valid here, especially when the new file position is greater than 4 GB. Since NtSetInformationFile Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -21,7 +21,7 @@ /* global vars */ /* Do not assume it have the free value -1 set, any value can be in here */ -DWORD OPENGL32_tls = -1U; +DWORD OPENGL32_tls = -1; GLPROCESSDATA OPENGL32_processdata; @@ -103,7 +103,7 @@ TRUE /* bInheritHandle */ }; OPENGL32_tls = TlsAlloc(); - if (-1U == OPENGL32_tls) + if ((DWORD)-1 == OPENGL32_tls) return FALSE; memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) ); @@ -179,7 +179,7 @@ CloseHandle( OPENGL32_processdata.dcdata_mutex ); /* free TLS */ - if (OPENGL32_tls != -1U) + if (OPENGL32_tls != (DWORD)-1) TlsFree(OPENGL32_tls); } Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -1991,7 +1991,7 @@ 0); /* Check if nothing was found */ - if (MapRegisterNumber == -1U) + if (MapRegisterNumber == (ULONG)-1) { /* No free registers found, so use the base registers */ RtlSetBits(MasterAdapter->MapRegisters, Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -572,7 +572,7 @@ { ResourceCount++; - Offset = FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); + Offset = (UCHAR)FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); /* Write 0xFFFFFFFF there */ WriteBuffer = 0xffffffff; Modified: trunk/reactos/hal/halx86/include/ioapic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/ioapic.… ============================================================================== --- trunk/reactos/hal/halx86/include/ioapic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/ioapic.h [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -15,7 +15,7 @@ #define IOAPIC_REDTBL 0x0010 /* Redirection Table (0-23 64-bit registers) (R/W) */ #define IOAPIC_ID_MASK (0xF << 24) -#define GET_IOAPIC_ID(x) (((x) & IOAPIC_ID_MASK) >> 24) +#define GET_IOAPIC_ID(x) ((UCHAR)(((x) & IOAPIC_ID_MASK) >> 24)) #define SET_IOAPIC_ID(x) ((x) << 24) #define IOAPIC_VER_MASK (0xFF) @@ -68,8 +68,8 @@ typedef struct _IOAPIC_INFO { - ULONG ApicId; /* APIC ID */ - ULONG ApicVersion; /* APIC version */ + UCHAR ApicId; /* APIC ID */ + UCHAR ApicVersion; /* APIC version */ ULONG ApicAddress; /* APIC address */ ULONG EntryCount; /* Number of redirection entries */ } IOAPIC_INFO, *PIOAPIC_INFO; Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -823,7 +823,7 @@ if (TSCPresent) { t2.QuadPart = (LONGLONG)__rdtsc(); - CPUMap[CPU].CoreSpeed = (HZ * (t2.QuadPart - t1.QuadPart)); + CPUMap[CPU].CoreSpeed = (HZ * (ULONG)(t2.QuadPart - t1.QuadPart)); DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); @@ -856,10 +856,10 @@ Access.SegmentType = I386_INTERRUPT_GATE; idt = (KIDTENTRY*)((ULONG)KeGetPcr()->IDT + index * sizeof(KIDTENTRY)); - idt->Offset = address & 0xffff; + idt->Offset = (USHORT)(address & 0xffff); idt->Selector = KGDT_R0_CODE; idt->Access = Access.Value; - idt->ExtendedOffset = address >> 16; + idt->ExtendedOffset = (USHORT)(address >> 16); } VOID HaliInitBSP(VOID) Modified: trunk/reactos/hal/halx86/mp/ioapic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ioapic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/mp/ioapic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/ioapic.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -661,7 +661,7 @@ VOID Disable8259AIrq(ULONG irq) { - ULONG tmp; + UCHAR tmp; if (irq >= 8) { Modified: trunk/reactos/hal/halx86/mp/mpconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpconfig.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpconfig.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpconfig.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -83,7 +83,7 @@ static VOID HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) { - ULONG ver; + UCHAR ver; if (!(m->CpuFlags & CPU_FLAG_ENABLED)) return; @@ -176,7 +176,7 @@ static VOID HaliMPBusInfo(PMP_CONFIGURATION_BUS m) { - static ULONG CurrentPCIBusId = 0; + static UCHAR CurrentPCIBusId = 0; DPRINT("Bus #%d is %.*s\n", m->BusId, 6, m->BusType); @@ -357,7 +357,7 @@ HaliConstructDefaultIOIrqMPTable(ULONG Type) { MP_CONFIGURATION_INTSRC intsrc; - ULONG i; + UCHAR i; intsrc.Type = MPCTE_INTSRC; intsrc.IrqFlag = 0; /* conforming */ @@ -394,8 +394,8 @@ MP_CONFIGURATION_BUS bus; MP_CONFIGURATION_IOAPIC ioapic; MP_CONFIGURATION_INTLOCAL lintsrc; - ULONG linttypes[2] = { INT_EXTINT, INT_NMI }; - ULONG i; + UCHAR linttypes[2] = { INT_EXTINT, INT_NMI }; + UCHAR i; /* * 2 CPUs, numbered 0 & 1. Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=4… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -80,7 +80,7 @@ // // Cell Magic Values // -#define HCELL_NIL -1U +#define HCELL_NIL (ULONG)-1 #define HCELL_CACHED 1 #define HCELL_TYPE_MASK 0x80000000 Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=43167&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -61,7 +61,7 @@ EXCEPTION_RECORD ExceptionRecord; /* Check if we should print it or not */ - if ((ComponentId != -1U) && + if ((ComponentId != (ULONG)-1) && !(NtQueryDebugFilterState(ComponentId, Level))) { /* This message is masked */ @@ -96,7 +96,7 @@ _SEH2_END; /* Check if we went past the buffer */ - if (Length == -1U) + if (Length == (ULONG)-1) { /* Terminate it if we went over-board */ Buffer[sizeof(Buffer) - 1] = '\n'; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=431… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -466,7 +466,7 @@ /* Make sure the buffer is a valid string which within the given length */ if ((NtInitialUserProcessBufferType != REG_SZ) || - ((NtInitialUserProcessBufferLength != -1U) && + ((NtInitialUserProcessBufferLength != (ULONG)-1) && ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) || (NtInitialUserProcessBufferLength > sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR))))) @@ -1429,7 +1429,7 @@ if (!ExpRealTimeIsUniversal) { /* Check if we don't have a valid bias */ - if (ExpLastTimeZoneBias == -1U) + if (ExpLastTimeZoneBias == (ULONG)-1) { /* Reset */ ResetBias = TRUE; Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -443,7 +443,7 @@ /* Now multiply limits by 1MB */ PspDefaultPagedLimit <<= 20; PspDefaultNonPagedLimit <<= 20; - if (PspDefaultPagefileLimit != -1U) PspDefaultPagefileLimit <<= 20; + if (PspDefaultPagefileLimit != (ULONG)-1) PspDefaultPagefileLimit <<= 20; /* Initialize the Active Process List */ InitializeListHead(&PsActiveProcessHead);

1 0

[khornicek] 43166: - sync d3d8, d3d9, ddraw, wined3d with Wine 1.1.30
by khornicek＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: khornicek Date: Sat Sep 26 13:13:40 2009 New Revision: 43166 URL: http://svn.reactos.org/svn/reactos?rev=43166&view=rev Log: - sync d3d8, d3d9, ddraw, wined3d with Wine 1.1.30 Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[dchapyshev] 43165: - Sync winhlp32 with Wine 1.1.30
by dchapyshev＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: dchapyshev Date: Sat Sep 26 12:49:56 2009 New Revision: 43165 URL: http://svn.reactos.org/svn/reactos?rev=43165&view=rev Log: - Sync winhlp32 with Wine 1.1.30 Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c trunk/reactos/base/applications/winhlp32/hlpfile.h trunk/reactos/base/applications/winhlp32/winhelp.c Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Sat Sep 26 12:49:56 2009 @@ -761,6 +761,69 @@ return TRUE; } +static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, + const char* str, unsigned len, LONG hash, + unsigned clrChange, unsigned bHotSpot, unsigned wnd); + +/****************************************************************** + * HLPFILE_AddHotSpotLinks + * + */ +static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, + const BYTE* start, ULONG hs_size, ULONG hs_offset) +{ + unsigned i, hs_num; + ULONG hs_macro; + const char* str; + + if (hs_size == 0 || hs_offset == 0) return; + + start += hs_offset; + /* always 1 ?? */ + hs_num = GET_USHORT(start, 1); + hs_macro = GET_UINT(start, 3); + + str = (const char*)start + 7 + 15 * hs_num + hs_macro; + /* FIXME: should use hs_size to prevent out of bounds reads */ + for (i = 0; i < hs_num; i++) + { + HLPFILE_HOTSPOTLINK* hslink; + + WINE_TRACE("%02x-%02x%02x {%s,%s}\n", + start[7 + 15 * i + 0], start[7 + 15 * i + 1], start[7 + 15 * i + 2], + str, str + strlen(str) + 1); + /* str points to two null terminated strings: + * hotspot name, then link name + */ + str += strlen(str) + 1; /* skip hotspot name */ + + switch (start[7 + 15 * i + 0]) + /* The next two chars always look like 0x04 0x00 ??? + * What are they for ? + */ + { + case 0xE6: + case 0xE7: + hslink = (HLPFILE_HOTSPOTLINK*) + HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, + file->lpszPath, -1, HLPFILE_Hash(str), + 0, 1, -1); + if (hslink) + { + hslink->x = GET_USHORT(start, 7 + 15 * i + 3); + hslink->y = GET_USHORT(start, 7 + 15 * i + 5); + hslink->width = GET_USHORT(start, 7 + 15 * i + 7); + hslink->height = GET_USHORT(start, 7 + 15 * i + 9); + /* target = GET_UINT(start, 7 + 15 * i + 11); */ + } + break; + default: + WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]); + } + str += strlen(str) + 1; + } +} + /****************************************************************** * HLPFILE_RtfAddTransparentBitmap * @@ -848,7 +911,7 @@ * HLPFILE_RtfAddBitmap * */ -static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, const BYTE* beg, BYTE type, BYTE pack) +static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE* beg, BYTE type, BYTE pack) { const BYTE* ptr; const BYTE* pict_beg; @@ -859,6 +922,7 @@ BOOL clrImportant = FALSE; BOOL ret = FALSE; char tmp[256]; + unsigned hs_size, hs_offset; bi = HeapAlloc(GetProcessHeap(), 0, sizeof(*bi)); if (!bi) return FALSE; @@ -884,10 +948,11 @@ bi->bmiHeader.biWidth, bi->bmiHeader.biHeight); csz = fetch_ulong(&ptr); - fetch_ulong(&ptr); /* hotspot size */ - - off = GET_UINT(ptr, 0); ptr += 4; - /* GET_UINT(ptr, 0); hotspot offset */ ptr += 4; + hs_size = fetch_ulong(&ptr); + + off = GET_UINT(ptr, 0); ptr += 4; + hs_offset = GET_UINT(ptr, 0); ptr += 4; + HLPFILE_AddHotSpotLinks(rd, file, beg, hs_size, hs_offset); /* now read palette info */ if (type == 0x06) @@ -947,9 +1012,9 @@ * HLPFILE_RtfAddMetaFile * */ -static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, const BYTE* beg, BYTE pack) -{ - ULONG size, csize, off, hsoff; +static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, HLPFILE* file, const BYTE* beg, BYTE pack) +{ + ULONG size, csize, off, hs_offset, hs_size; const BYTE* ptr; const BYTE* bits; BYTE* alloc = NULL; @@ -969,13 +1034,15 @@ size = fetch_ulong(&ptr); /* decompressed size */ csize = fetch_ulong(&ptr); /* compressed size */ - fetch_ulong(&ptr); /* hotspot size */ + hs_size = fetch_ulong(&ptr); /* hotspot size */ off = GET_UINT(ptr, 0); - hsoff = GET_UINT(ptr, 4); + hs_offset = GET_UINT(ptr, 4); ptr += 8; - WINE_TRACE("sz=%u csz=%u offs=%u/%u,%u\n", - size, csize, off, (ULONG)(ptr - beg), hsoff); + HLPFILE_AddHotSpotLinks(rd, file, beg, hs_size, hs_offset); + + WINE_TRACE("sz=%u csz=%u offs=%u/%u,%u/%u\n", + size, csize, off, (ULONG)(ptr - beg), hs_size, hs_offset); bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack, &alloc); if (!bits) return FALSE; @@ -1016,10 +1083,10 @@ { case 5: /* device dependent bmp */ case 6: /* device independent bmp */ - HLPFILE_RtfAddBitmap(rd, beg, type, pack); + HLPFILE_RtfAddBitmap(rd, hlpfile, beg, type, pack); break; case 8: - HLPFILE_RtfAddMetaFile(rd, beg, pack); + HLPFILE_RtfAddMetaFile(rd, hlpfile, beg, pack); break; default: WINE_FIXME("Unknown type %u\n", type); return FALSE; } @@ -1061,32 +1128,36 @@ */ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, const char* str, unsigned len, LONG hash, - unsigned clrChange, unsigned wnd) + unsigned clrChange, unsigned bHotSpot, unsigned wnd) { HLPFILE_LINK* link; char* link_str; + unsigned asz = bHotSpot ? sizeof(HLPFILE_HOTSPOTLINK) : sizeof(HLPFILE_LINK); /* FIXME: should build a string table for the attributes.link.lpszPath * they are reallocated for each link */ if (len == -1) len = strlen(str); - link = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_LINK) + len + 1); + link = HeapAlloc(GetProcessHeap(), 0, asz + len + 1); if (!link) return NULL; link->cookie = cookie; - link->string = link_str = (char*)(link + 1); + link->string = link_str = (char*)link + asz; memcpy(link_str, str, len); link_str[len] = '\0'; link->hash = hash; link->bClrChange = clrChange ? 1 : 0; + link->bHotSpot = bHotSpot; link->window = wnd; link->next = rd->first_link; rd->first_link = link; link->cpMin = rd->char_pos; - link->cpMax = 0; rd->force_color = clrChange; if (rd->current_link) WINE_FIXME("Pending link\n"); - rd->current_link = link; + if (bHotSpot) + link->cpMax = rd->char_pos; + else + rd->current_link = link; WINE_TRACE("Link[%d] to %s@%08x:%d\n", link->cookie, link->string, link->hash, link->window); @@ -1495,7 +1566,7 @@ case 0xCC: WINE_TRACE("macro => %s\n", format + 3); HLPFILE_AllocLink(rd, hlp_link_macro, (const char*)format + 3, - GET_USHORT(format, 1), 0, !(*format & 4), -1); + GET_USHORT(format, 1), 0, !(*format & 4), 0, -1); format += 3 + GET_USHORT(format, 1); break; @@ -1503,7 +1574,7 @@ case 0xE1: WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - page->file->lpszPath, -1, GET_UINT(format, 1), 1, -1); + page->file->lpszPath, -1, GET_UINT(format, 1), 1, 0, -1); format += 5; @@ -1515,7 +1586,7 @@ case 0xE7: HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, page->file->lpszPath, -1, GET_UINT(format, 1), - !(*format & 4), -1); + !(*format & 4), 0, -1); format += 5; break; @@ -1552,7 +1623,7 @@ break; } HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - ptr, -1, GET_UINT(format, 4), !(*format & 4), wnd); + ptr, -1, GET_UINT(format, 4), !(*format & 4), 0, wnd); } format += 3 + GET_USHORT(format, 1); break; Modified: trunk/reactos/base/applications/winhlp32/hlpfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.h [iso-8859-1] Sat Sep 26 12:49:56 2009 @@ -41,11 +41,21 @@ LPCSTR string; /* name of the file to for the link (NULL if same file) */ LONG hash; /* topic index */ unsigned bClrChange : 1; /* true if the link is green & underlined */ + unsigned bHotSpot : 1; /* true if the link is an hotspot (actually HLPFILE_HOTSPOTLINK) */ unsigned window; /* window number for displaying the link (-1 is current) */ DWORD cpMin; DWORD cpMax; struct tagHlpFileLink* next; } HLPFILE_LINK; + +typedef struct tagHlpFileHotSpotLink +{ + HLPFILE_LINK link; + unsigned x; + unsigned y; + unsigned width; + unsigned height; +} HLPFILE_HOTSPOTLINK; typedef struct tagHlpFileMacro { Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Sat Sep 26 12:49:56 2009 @@ -646,6 +646,16 @@ (LPARAM)&char_ptl, cp); SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, (LPARAM)&char_next_ptl, cp + 1); + if (link->bHotSpot) + { + HLPFILE_HOTSPOTLINK* hslink = (HLPFILE_HOTSPOTLINK*)link; + if ((mouse_ptl.x < char_ptl.x + hslink->x) || + (mouse_ptl.x >= char_ptl.x + hslink->x + hslink->width) || + (mouse_ptl.y < char_ptl.y + hslink->y) || + (mouse_ptl.y >= char_ptl.y + hslink->y + hslink->height)) + continue; + break; + } if (char_next_ptl.y != char_ptl.y || mouse_ptl.x >= char_next_ptl.x) link = NULL; break;

1 0

[dchapyshev] 43164: - Fix building of tests
by dchapyshev＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: dchapyshev Date: Sat Sep 26 12:49:05 2009 New Revision: 43164 URL: http://svn.reactos.org/svn/reactos?rev=43164&view=rev Log: - Fix building of tests Modified: trunk/rostests/winetests/comctl32/dpa.c Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/dpa.c [iso-8859-1] Sat Sep 26 12:49:05 2009 @@ -41,7 +41,6 @@ PVOID pvData; } ITEMDATA, *LPITEMDATA; -typedef PVOID (CALLBACK *PFNDPAMERGE)(UINT,PVOID,PVOID,LPARAM); typedef HRESULT (CALLBACK *PFNDPASTM)(LPITEMDATA,IStream*,LPARAM); static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA);

1 0

[dchapyshev] 43163: - Sync shlwapi, msxml3 and windowscodecs with Wine 1.1.30
by dchapyshev＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: dchapyshev Date: Sat Sep 26 12:48:07 2009 New Revision: 43163 URL: http://svn.reactos.org/svn/reactos?rev=43163&view=rev Log: - Sync shlwapi, msxml3 and windowscodecs with Wine 1.1.30 Modified: trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/shlwapi/assoc.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/string.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/stream.c Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -73,6 +73,10 @@ else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { *ppvObject = IXMLDOMNode_from_impl(This->node); + } + else if(dispex_query_interface(&This->node->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; } else { @@ -751,6 +755,18 @@ domelem_normalize, }; +static const tid_t domelem_iface_tids[] = { + IXMLDOMElement_tid, + 0 +}; + +static dispex_static_data_t domelem_dispex = { + NULL, + IXMLDOMElement_tid, + NULL, + domelem_iface_tids +}; + IUnknown* create_element( xmlNodePtr element ) { domelem *This; @@ -762,7 +778,7 @@ This->lpVtbl = &domelem_vtbl; This->ref = 1; - This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, NULL ); + This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, &domelem_dispex ); if(!This->node) { HeapFree(GetProcessHeap(), 0, This); Modified: trunk/reactos/dll/win32/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -1,5 +1,5 @@ /* - * IQueryAssociations object and helper functions + * IQueryAssociations helper functions * * Copyright 2002 Jon Griffiths * @@ -26,67 +26,16 @@ #include "winreg.h" #include "objbase.h" #include "shlguid.h" +#include "shlobj.h" #include "shlwapi.h" -#include "winver.h" #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/************************************************************************** - * IQueryAssociations {SHLWAPI} - * - * DESCRIPTION - * This object provides a layer of abstraction over the system registry in - * order to simplify the process of parsing associations between files. - * Associations in this context means the registry entries that link (for - * example) the extension of a file with its description, list of - * applications to open the file with, and actions that can be performed on it - * (the shell displays such information in the context menu of explorer - * when you right-click on a file). - * - * HELPERS - * You can use this object transparently by calling the helper functions - * AssocQueryKeyA(), AssocQueryStringA() and AssocQueryStringByKeyA(). These - * create an IQueryAssociations object, perform the requested actions - * and then dispose of the object. Alternatively, you can create an instance - * of the object using AssocCreate() and call the following methods on it: - * - * METHODS - */ /* Default IQueryAssociations::Init() flags */ #define SHLWAPI_DEF_ASSOCF (ASSOCF_INIT_BYEXENAME|ASSOCF_INIT_DEFAULTTOSTAR| \ ASSOCF_INIT_DEFAULTTOFOLDER) - -typedef struct -{ - const IQueryAssociationsVtbl *lpVtbl; - LONG ref; - HKEY hkeySource; - HKEY hkeyProgID; -} IQueryAssociationsImpl; - -static const IQueryAssociationsVtbl IQueryAssociations_vtbl; - -/************************************************************************** - * IQueryAssociations_Constructor [internal] - * - * Construct a new IQueryAssociations object. - */ -static IQueryAssociations* IQueryAssociations_Constructor(void) -{ - IQueryAssociationsImpl* iface; - - iface = HeapAlloc(GetProcessHeap(),0,sizeof(IQueryAssociationsImpl)); - iface->lpVtbl = &IQueryAssociations_vtbl; - iface->ref = 1; - iface->hkeySource = NULL; - iface->hkeyProgID = NULL; - - TRACE("Returning IQueryAssociations* %p\n", iface); - return (IQueryAssociations*)iface; -} /************************************************************************* * SHLWAPI_ParamAToW @@ -139,52 +88,36 @@ */ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) { + TRACE("(%s,%s,%p)\n", debugstr_guid(&clsid), debugstr_guid(refiid), + lpInterface); + + if (!lpInterface) + return E_INVALIDARG; + + *(DWORD*)lpInterface = 0; + + if (!IsEqualGUID(&clsid, &CLSID_QueryAssociations)) + return CLASS_E_CLASSNOTAVAILABLE; + + return SHCoCreateInstance( NULL, &clsid, NULL, refiid, lpInterface ); +} + +/************************************************************************* + * AssocQueryKeyW [SHLWAPI.@] + * + * See AssocQueryKeyA. + */ +HRESULT WINAPI AssocQueryKeyW(ASSOCF cfFlags, ASSOCKEY assockey, LPCWSTR pszAssoc, + LPCWSTR pszExtra, HKEY *phkeyOut) +{ HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(%s,%s,%p)\n", debugstr_guid(&clsid), debugstr_guid(refiid), - lpInterface); - - if (!lpInterface) - return E_INVALIDARG; - - *(DWORD*)lpInterface = 0; - - if (!IsEqualGUID(&clsid, &CLSID_QueryAssociations)) - return CLASS_E_CLASSNOTAVAILABLE; - - lpAssoc = IQueryAssociations_Constructor(); - - if (!lpAssoc) - return E_OUTOFMEMORY; - - hRet = IQueryAssociations_QueryInterface(lpAssoc, refiid, lpInterface); - IQueryAssociations_Release(lpAssoc); - - if(hRet == E_NOINTERFACE) - return CLASS_E_CLASSNOTAVAILABLE; - - return hRet; -} - -/************************************************************************* - * AssocQueryKeyW [SHLWAPI.@] - * - * See AssocQueryKeyA. - */ -HRESULT WINAPI AssocQueryKeyW(ASSOCF cfFlags, ASSOCKEY assockey, LPCWSTR pszAssoc, - LPCWSTR pszExtra, HKEY *phkeyOut) -{ - HRESULT hRet; - IQueryAssociations* lpAssoc; - TRACE("(0x%8x,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), debugstr_w(pszExtra), phkeyOut); - lpAssoc = IQueryAssociations_Constructor(); - - if (!lpAssoc) - return E_OUTOFMEMORY; + hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); + if (FAILED(hRet)) return hRet; cfFlags &= SHLWAPI_DEF_ASSOCF; hRet = IQueryAssociations_Init(lpAssoc, cfFlags, pszAssoc, NULL, NULL); @@ -254,10 +187,8 @@ if (!pcchOut) return E_UNEXPECTED; - lpAssoc = IQueryAssociations_Constructor(); - - if (!lpAssoc) - return E_OUTOFMEMORY; + hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); + if (FAILED(hRet)) return hRet; hRet = IQueryAssociations_Init(lpAssoc, cfFlags & SHLWAPI_DEF_ASSOCF, pszAssoc, NULL, NULL); @@ -350,10 +281,8 @@ TRACE("(0x%8x,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_w(pszExtra), pszOut, pcchOut); - lpAssoc = IQueryAssociations_Constructor(); - - if (!lpAssoc) - return E_OUTOFMEMORY; + hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); + if (FAILED(hRet)) return hRet; cfFlags &= SHLWAPI_DEF_ASSOCF; hRet = IQueryAssociations_Init(lpAssoc, cfFlags, 0, hkAssoc, NULL); @@ -440,627 +369,3 @@ FIXME("%s\n", debugstr_w(lpszAssoc)); return FALSE; } - -/************************************************************************** - * IQueryAssociations_QueryInterface {SHLWAPI} - * - * See IUnknown_QueryInterface. - */ -static HRESULT WINAPI IQueryAssociations_fnQueryInterface( - IQueryAssociations* iface, - REFIID riid, - LPVOID *ppvObj) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - - TRACE("(%p,%s,%p)\n",This, debugstr_guid(riid), ppvObj); - - *ppvObj = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IQueryAssociations)) - { - *ppvObj = This; - - IQueryAssociations_AddRef((IQueryAssociations*)*ppvObj); - TRACE("Returning IQueryAssociations (%p)\n", *ppvObj); - return S_OK; - } - TRACE("Returning E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/************************************************************************** - * IQueryAssociations_AddRef {SHLWAPI} - * - * See IUnknown_AddRef. - */ -static ULONG WINAPI IQueryAssociations_fnAddRef(IQueryAssociations *iface) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); - - return refCount; -} - -/************************************************************************** - * IQueryAssociations_Release {SHLWAPI} - * - * See IUnknown_Release. - */ -static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); - - if (!refCount) - { - TRACE("Destroying IQueryAssociations (%p)\n", This); - RegCloseKey(This->hkeySource); - RegCloseKey(This->hkeyProgID); - HeapFree(GetProcessHeap(), 0, This); - } - - return refCount; -} - -/************************************************************************** - * IQueryAssociations_Init {SHLWAPI} - * - * Initialise an IQueryAssociations object. - * - * PARAMS - * iface [I] IQueryAssociations interface to initialise - * cfFlags [I] ASSOCF_ flags from "shlwapi.h" - * pszAssoc [I] String for the root key name, or NULL if hkeyProgid is given - * hkeyProgid [I] Handle for the root key, or NULL if pszAssoc is given - * hWnd [I] Reserved, must be NULL. - * - * RETURNS - * Success: S_OK. iface is initialised with the parameters given. - * Failure: An HRESULT error code indicating the error. - */ -static HRESULT WINAPI IQueryAssociations_fnInit( - IQueryAssociations *iface, - ASSOCF cfFlags, - LPCWSTR pszAssoc, - HKEY hkeyProgid, - HWND hWnd) -{ - static const WCHAR szProgID[] = {'P','r','o','g','I','D',0}; - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - LONG ret; - - TRACE("(%p)->(%d,%s,%p,%p)\n", iface, - cfFlags, - debugstr_w(pszAssoc), - hkeyProgid, - hWnd); - if (hWnd != NULL) - FIXME("hwnd != NULL not supported\n"); - if (cfFlags != 0) - FIXME("unsupported flags: %x\n", cfFlags); - if (pszAssoc != NULL) - { - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, - pszAssoc, - 0, - KEY_READ, - &This->hkeySource); - if (ret != ERROR_SUCCESS) - return E_FAIL; - /* if this is not a prog id */ - if ((*pszAssoc == '.') || (*pszAssoc == '{')) - { - RegOpenKeyExW(This->hkeySource, - szProgID, - 0, - KEY_READ, - &This->hkeyProgID); - } - else - This->hkeyProgID = This->hkeySource; - return S_OK; - } - else if (hkeyProgid != NULL) - { - This->hkeyProgID = hkeyProgid; - return S_OK; - } - else - return E_INVALIDARG; -} - -static HRESULT ASSOC_GetValue(HKEY hkey, WCHAR ** pszText) -{ - DWORD len; - LONG ret; - - assert(pszText); - ret = RegQueryValueExW(hkey, NULL, 0, NULL, NULL, &len); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - if (!len) - return E_FAIL; - *pszText = HeapAlloc(GetProcessHeap(), 0, len); - if (!*pszText) - return E_OUTOFMEMORY; - ret = RegQueryValueExW(hkey, NULL, 0, NULL, (LPBYTE)*pszText, - &len); - if (ret != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, *pszText); - return HRESULT_FROM_WIN32(ret); - } - return S_OK; -} - -static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, - LPCWSTR pszExtra, WCHAR **ppszCommand) -{ - HKEY hkeyCommand; - HKEY hkeyFile; - HKEY hkeyShell; - HKEY hkeyVerb; - HRESULT hr; - LONG ret; - WCHAR * pszExtraFromReg = NULL; - WCHAR * pszFileType; - static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; - static const WCHAR shellW[] = { 's','h','e','l','l',0 }; - - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); - if (FAILED(hr)) - return hr; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); - HeapFree(GetProcessHeap(), 0, pszFileType); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - - ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); - RegCloseKey(hkeyFile); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - - if (!pszExtra) - { - hr = ASSOC_GetValue(hkeyShell, &pszExtraFromReg); - /* if no default action */ - if (hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) - { - DWORD rlen; - ret = RegQueryInfoKeyW(hkeyShell, 0, 0, 0, 0, &rlen, 0, 0, 0, 0, 0, 0); - if (ret != ERROR_SUCCESS) - { - RegCloseKey(hkeyShell); - return HRESULT_FROM_WIN32(ret); - } - rlen++; - pszExtraFromReg = HeapAlloc(GetProcessHeap(), 0, rlen * sizeof(WCHAR)); - if (!pszExtraFromReg) - { - RegCloseKey(hkeyShell); - return E_OUTOFMEMORY; - } - ret = RegEnumKeyExW(hkeyShell, 0, pszExtraFromReg, &rlen, 0, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS) - { - RegCloseKey(hkeyShell); - return HRESULT_FROM_WIN32(ret); - } - } - else if (FAILED(hr)) - { - RegCloseKey(hkeyShell); - return hr; - } - } - - ret = RegOpenKeyExW(hkeyShell, pszExtra ? pszExtra : pszExtraFromReg, 0, - KEY_READ, &hkeyVerb); - HeapFree(GetProcessHeap(), 0, pszExtraFromReg); - RegCloseKey(hkeyShell); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - - ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); - RegCloseKey(hkeyVerb); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, ppszCommand); - RegCloseKey(hkeyCommand); - return hr; -} - -static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, - LPCWSTR pszExtra, LPWSTR path, - DWORD pathlen, DWORD *len) -{ - WCHAR *pszCommand; - WCHAR *pszStart; - WCHAR *pszEnd; - HRESULT hr; - - assert(len); - - hr = ASSOC_GetCommand(This, pszExtra, &pszCommand); - if (FAILED(hr)) - return hr; - - /* cleanup pszCommand */ - if (pszCommand[0] == '"') - { - pszStart = pszCommand + 1; - pszEnd = strchrW(pszStart, '"'); - } - else - { - pszStart = pszCommand; - pszEnd = strchrW(pszStart, ' '); - } - if (pszEnd) - *pszEnd = 0; - - *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); - HeapFree(GetProcessHeap(), 0, pszCommand); - if (!*len) - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - return S_OK; -} - -static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, - DWORD datalen) -{ - assert(outlen); - - if (out) - { - if (*outlen < datalen) - { - *outlen = datalen; - return E_POINTER; - } - *outlen = datalen; - lstrcpynW(out, data, datalen); - return S_OK; - } - else - { - *outlen = datalen; - return S_FALSE; - } -} - -/************************************************************************** - * IQueryAssociations_GetString {SHLWAPI} - * - * Get a file association string from the registry. - * - * PARAMS - * iface [I] IQueryAssociations interface to query - * cfFlags [I] ASSOCF_ flags from "shlwapi.h" - * str [I] Type of string to get (ASSOCSTR enum from "shlwapi.h") - * pszExtra [I] Extra information about the string location - * pszOut [O] Destination for the association string - * pcchOut [I/O] Length of pszOut - * - * RETURNS - * Success: S_OK. pszOut contains the string, pcchOut contains its length. - * Failure: An HRESULT error code indicating the error. - */ -static HRESULT WINAPI IQueryAssociations_fnGetString( - IQueryAssociations *iface, - ASSOCF cfFlags, - ASSOCSTR str, - LPCWSTR pszExtra, - LPWSTR pszOut, - DWORD *pcchOut) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - const ASSOCF cfUnimplemented = ~(0); - DWORD len = 0; - HRESULT hr; - WCHAR path[MAX_PATH]; - - TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, str, - debugstr_w(pszExtra), pszOut, pcchOut); - - if (cfFlags & cfUnimplemented) - FIXME("%08x: unimplemented flags!\n", cfFlags & cfUnimplemented); - - if (!pcchOut) - return E_UNEXPECTED; - - switch (str) - { - case ASSOCSTR_COMMAND: - { - WCHAR *command; - hr = ASSOC_GetCommand(This, pszExtra, &command); - if (SUCCEEDED(hr)) - { - hr = ASSOC_ReturnData(pszOut, pcchOut, command, strlenW(command) + 1); - HeapFree(GetProcessHeap(), 0, command); - } - return hr; - } - - case ASSOCSTR_EXECUTABLE: - { - hr = ASSOC_GetExecutable(This, pszExtra, path, MAX_PATH, &len); - if (FAILED(hr)) - return hr; - len++; - return ASSOC_ReturnData(pszOut, pcchOut, path, len); - } - - case ASSOCSTR_FRIENDLYDOCNAME: - { - WCHAR *pszFileType; - DWORD ret; - DWORD size; - - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); - if (FAILED(hr)) - return hr; - size = 0; - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); - if (ret == ERROR_SUCCESS) - { - WCHAR *docName = HeapAlloc(GetProcessHeap(), 0, size); - if (docName) - { - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); - if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, docName, strlenW(docName) + 1); - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, docName); - } - else - hr = E_OUTOFMEMORY; - } - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, pszFileType); - return hr; - } - - case ASSOCSTR_FRIENDLYAPPNAME: - { - PVOID verinfoW = NULL; - DWORD size, retval = 0; - UINT flen; - WCHAR *bufW; - static const WCHAR translationW[] = { - '\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0 - }; - static const WCHAR fileDescFmtW[] = { - '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0 - }; - WCHAR fileDescW[41]; - - hr = ASSOC_GetExecutable(This, pszExtra, path, MAX_PATH, &len); - if (FAILED(hr)) - return hr; - - retval = GetFileVersionInfoSizeW(path, &size); - if (!retval) - goto get_friendly_name_fail; - verinfoW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); - if (!verinfoW) - return E_OUTOFMEMORY; - if (!GetFileVersionInfoW(path, 0, retval, verinfoW)) - goto get_friendly_name_fail; - if (VerQueryValueW(verinfoW, translationW, (LPVOID *)&bufW, &flen)) - { - UINT i; - DWORD *langCodeDesc = (DWORD *)bufW; - for (i = 0; i < flen / sizeof(DWORD); i++) - { - sprintfW(fileDescW, fileDescFmtW, LOWORD(langCodeDesc[i]), - HIWORD(langCodeDesc[i])); - if (VerQueryValueW(verinfoW, fileDescW, (LPVOID *)&bufW, &flen)) - { - /* Does strlenW(bufW) == 0 mean we use the filename? */ - len = strlenW(bufW) + 1; - TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - return ASSOC_ReturnData(pszOut, pcchOut, bufW, len); - } - } - } -get_friendly_name_fail: - PathRemoveExtensionW(path); - PathStripPathW(path); - TRACE("using filename: %s\n", debugstr_w(path)); - return ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); - } - - case ASSOCSTR_CONTENTTYPE: - { - static const WCHAR Content_TypeW[] = {'C','o','n','t','e','n','t',' ','T','y','p','e',0}; - WCHAR *contentType; - DWORD ret; - DWORD size; - - size = 0; - ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, NULL, &size); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - contentType = HeapAlloc(GetProcessHeap(), 0, size); - if (contentType != NULL) - { - ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); - if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, contentType, strlenW(contentType) + 1); - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, contentType); - } - else - hr = E_OUTOFMEMORY; - return hr; - } - - case ASSOCSTR_DEFAULTICON: - { - static const WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; - WCHAR *pszFileType; - DWORD ret; - DWORD size; - HKEY hkeyFile; - - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); - if (FAILED(hr)) - return hr; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); - if (ret == ERROR_SUCCESS) - { - size = 0; - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); - if (ret == ERROR_SUCCESS) - { - WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); - if (icon) - { - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); - if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, icon, strlenW(icon) + 1); - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, icon); - } - else - hr = E_OUTOFMEMORY; - } - else - hr = HRESULT_FROM_WIN32(ret); - RegCloseKey(hkeyFile); - } - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, pszFileType); - return hr; - } - - default: - FIXME("assocstr %d unimplemented!\n", str); - return E_NOTIMPL; - } -} - -/************************************************************************** - * IQueryAssociations_GetKey {SHLWAPI} - * - * Get a file association key from the registry. - * - * PARAMS - * iface [I] IQueryAssociations interface to query - * cfFlags [I] ASSOCF_ flags from "shlwapi.h" - * assockey [I] Type of key to get (ASSOCKEY enum from "shlwapi.h") - * pszExtra [I] Extra information about the key location - * phkeyOut [O] Destination for the association key - * - * RETURNS - * Success: S_OK. phkeyOut contains a handle to the key. - * Failure: An HRESULT error code indicating the error. - */ -static HRESULT WINAPI IQueryAssociations_fnGetKey( - IQueryAssociations *iface, - ASSOCF cfFlags, - ASSOCKEY assockey, - LPCWSTR pszExtra, - HKEY *phkeyOut) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - - FIXME("(%p,0x%8x,0x%8x,%s,%p)-stub!\n", This, cfFlags, assockey, - debugstr_w(pszExtra), phkeyOut); - return E_NOTIMPL; -} - -/************************************************************************** - * IQueryAssociations_GetData {SHLWAPI} - * - * Get the data for a file association key from the registry. - * - * PARAMS - * iface [I] IQueryAssociations interface to query - * cfFlags [I] ASSOCF_ flags from "shlwapi.h" - * assocdata [I] Type of data to get (ASSOCDATA enum from "shlwapi.h") - * pszExtra [I] Extra information about the data location - * pvOut [O] Destination for the association key - * pcbOut [I/O] Size of pvOut - * - * RETURNS - * Success: S_OK. pszOut contains the data, pcbOut contains its length. - * Failure: An HRESULT error code indicating the error. - */ -static HRESULT WINAPI IQueryAssociations_fnGetData( - IQueryAssociations *iface, - ASSOCF cfFlags, - ASSOCDATA assocdata, - LPCWSTR pszExtra, - LPVOID pvOut, - DWORD *pcbOut) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - - FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, assocdata, - debugstr_w(pszExtra), pvOut, pcbOut); - return E_NOTIMPL; -} - -/************************************************************************** - * IQueryAssociations_GetEnum {SHLWAPI} - * - * Not yet implemented in native Win32. - * - * PARAMS - * iface [I] IQueryAssociations interface to query - * cfFlags [I] ASSOCF_ flags from "shlwapi.h" - * assocenum [I] Type of enum to get (ASSOCENUM enum from "shlwapi.h") - * pszExtra [I] Extra information about the enum location - * riid [I] REFIID to look for - * ppvOut [O] Destination for the interface. - * - * RETURNS - * Success: S_OK. - * Failure: An HRESULT error code indicating the error. - * - * NOTES - * Presumably this function returns an enumerator object. - */ -static HRESULT WINAPI IQueryAssociations_fnGetEnum( - IQueryAssociations *iface, - ASSOCF cfFlags, - ASSOCENUM assocenum, - LPCWSTR pszExtra, - REFIID riid, - LPVOID *ppvOut) -{ - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - - FIXME("(%p,0x%8x,0x%8x,%s,%s,%p)-stub!\n", This, cfFlags, assocenum, - debugstr_w(pszExtra), debugstr_guid(riid), ppvOut); - return E_NOTIMPL; -} - -static const IQueryAssociationsVtbl IQueryAssociations_vtbl = -{ - IQueryAssociations_fnQueryInterface, - IQueryAssociations_fnAddRef, - IQueryAssociations_fnRelease, - IQueryAssociations_fnInit, - IQueryAssociations_fnGetString, - IQueryAssociations_fnGetKey, - IQueryAssociations_fnGetData, - IQueryAssociations_fnGetEnum -}; Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -1472,6 +1472,43 @@ IUnknown_Release(pService); } return hRet; +} + +/************************************************************************* + * @ [SHLWAPI.479] + * + * Call an object's UIActivateIO method. + * + * PARAMS + * unknown [I] Object to call the UIActivateIO method on + * activate [I] Parameter for UIActivateIO call + * msg [I] Parameter for UIActivateIO call + * + * RETURNS + * Success: Value of UI_ActivateIO call + * Failure: An HRESULT error code + * + * NOTES + * unknown is expected to support the IInputObject interface. + */ +HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg) +{ + IInputObject* object = NULL; + HRESULT ret; + + if (!unknown) + return E_FAIL; + + /* Get an IInputObject interface from the object */ + ret = IUnknown_QueryInterface(unknown, &IID_IInputObject, (LPVOID*) &object); + + if (ret == S_OK) + { + ret = IInputObject_UIActivateIO(object, activate, msg); + IUnknown_Release(object); + } + + return ret; } /************************************************************************* @@ -4532,3 +4569,131 @@ return psd; } + +/*********************************************************************** + * SHCreatePropertyBagOnRegKey [SHLWAPI.471] + * + * Creates a property bag from a registry key + * + * PARAMS + * hKey [I] Handle to the desired registry key + * subkey [I] Name of desired subkey, or NULL to open hKey directly + * grfMode [I] Optional flags + * riid [I] IID of requested property bag interface + * ppv [O] Address to receive pointer to the new interface + * + * RETURNS + * success: 0 + * failure: error code + * + */ +HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, + DWORD grfMode, REFIID riid, void **ppv) +{ + FIXME("%p %s %d %s %p STUB\n", hKey, debugstr_w(subkey), grfMode, + debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} + +/*********************************************************************** + * SHGetViewStatePropertyBag [SHLWAPI.515] + * + * Retrieves a property bag in which the view state information of a folder + * can be stored. + * + * PARAMS + * pidl [I] PIDL of the folder requested + * bag_name [I] Name of the property bag requested + * flags [I] Optional flags + * riid [I] IID of requested property bag interface + * ppv [O] Address to receive pointer to the new interface + * + * RETURNS + * success: S_OK + * failure: error code + * + */ +HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, + DWORD flags, REFIID riid, void **ppv) +{ + FIXME("%p %s %d %s %p STUB\n", pidl, debugstr_w(bag_name), flags, + debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} + +/*********************************************************************** + * SHFormatDateTimeW [SHLWAPI.354] + * + * Produces a string representation of a time. + * + * PARAMS + * fileTime [I] Pointer to FILETIME structure specifying the time + * flags [I] Flags specifying the desired output + * buf [O] Pointer to buffer for output + * bufSize [I] Number of characters that can be contained in buffer + * + * RETURNS + * success: number of characters written to the buffer + * failure: 0 + * + */ +INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, + LPWSTR buf, UINT bufSize) +{ + FIXME("%p %p %s %d STUB\n", fileTime, flags, debugstr_w(buf), bufSize); + return 0; +} + +/*********************************************************************** + * SHFormatDateTimeA [SHLWAPI.353] + * + * See SHFormatDateTimeW. + * + */ +INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, + LPCSTR buf, UINT bufSize) +{ + WCHAR *bufW; + DWORD buflenW, convlen; + INT retval; + + if (!buf || !bufSize) + return 0; + + buflenW = bufSize; + bufW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflenW); + retval = SHFormatDateTimeW(fileTime, flags, bufW, buflenW); + + if (retval != 0) + convlen = WideCharToMultiByte(CP_ACP, 0, bufW, -1, (LPSTR) buf, bufSize, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, bufW); + return retval; +} + +/*********************************************************************** + * ZoneCheckUrlExW [SHLWAPI.231] + * + * Checks the details of the security zone for the supplied site. (?) + * + * PARAMS + * + * szURL [I] Pointer to the URL to check + * + * Other parameters currently unknown. + * + * RETURNS + * unknown + */ + +INT WINAPI ZoneCheckUrlExW(LPWSTR szURL, PVOID pUnknown, DWORD dwUnknown2, + DWORD dwUnknown3, DWORD dwUnknown4, DWORD dwUnknown5, DWORD dwUnknown6, + DWORD dwUnknown7) +{ + FIXME("(%s,%p,%x,%x,%x,%x,%x,%x) STUB\n", debugstr_w(szURL), pUnknown, dwUnknown2, + dwUnknown3, dwUnknown4, dwUnknown5, dwUnknown6, dwUnknown7); + + return 0; +} Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -228,7 +228,7 @@ 228 stub -noname ZoneCheckUrlA 229 stub -noname ZoneCheckUrlW 230 stub -noname ZoneCheckUrlExA -231 stub -noname ZoneCheckUrlExW +231 stdcall -noname ZoneCheckUrlExW(wstr ptr long long long long long long) 232 stub -noname ZoneCheckUrlExCacheA 233 stub -noname ZoneCheckUrlExCacheW 234 stub -noname ZoneCheckHost @@ -350,8 +350,8 @@ 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) -353 stub -noname SHFormatDateTimeA -354 stub -noname SHFormatDateTimeW +353 stdcall -noname SHFormatDateTimeA(ptr ptr str long) +354 stdcall -noname SHFormatDateTimeW(ptr ptr wstr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) 357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) @@ -459,7 +459,7 @@ 459 stdcall -noname SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA 460 stdcall -noname SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW 461 stdcall -noname SHGetAppCompatFlags(long) -462 stub -noname UrlFixupW +462 stdcall -noname UrlFixupW(wstr wstr long) 463 stub -noname SHExpandEnvironmentStringsForUserA 464 stub -noname SHExpandEnvironmentStringsForUserW 465 stub -noname PathUnExpandEnvStringsForUserA @@ -468,7 +468,7 @@ 468 stub -noname RunIndirectRegCommand 469 stub -noname RunRegCommand 470 stub -noname IUnknown_ProfferServiceOld -471 stub -noname SHCreatePropertyBagOnRegKey +471 stdcall -noname SHCreatePropertyBagOnRegKey(long wstr long ptr ptr) 472 stub -noname SHCreatePropertyBagOnProfileSelection 473 stub -noname SHGetIniStringUTF7W 474 stub -noname SHSetIniStringUTF7W @@ -476,7 +476,7 @@ 476 stub -noname SHGetObjectCompatFlags 477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) -479 stub -noname IUnknown_UIActivateIO +479 stdcall -noname IUnknown_UIActivateIO(ptr long ptr) 480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA @@ -508,7 +508,7 @@ 512 stub -noname IStream_ReadPidl 513 stub -noname IStream_WritePidl 514 stdcall -noname IUnknown_ProfferService(ptr ptr ptr ptr) -515 stub -noname SHGetViewStatePropertyBag +515 stdcall -noname SHGetViewStatePropertyBag(ptr wstr long ptr ptr) 516 stdcall -noname SKGetValueW(long wstr wstr long long long) 517 stub -noname SKSetValueW 518 stub -noname SKDeleteValueW @@ -757,6 +757,7 @@ @ stdcall StrChrA (str long) @ stdcall StrChrIA (str long) @ stdcall StrChrIW (wstr long) +@ stdcall StrChrNW(wstr long long) @ stdcall StrChrW (wstr long) @ stdcall StrCmpIW (wstr wstr) @ stdcall StrCmpLogicalW(wstr wstr) Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -316,6 +316,25 @@ lpszStr = NULL; } return (LPWSTR)lpszStr; +} + +/************************************************************************* + * StrChrNW [SHLWAPI.@] + */ +LPWSTR WINAPI StrChrNW(LPCWSTR lpszStr, WCHAR ch, UINT cchMax) +{ + TRACE("(%s(%i),%i)\n", debugstr_wn(lpszStr,cchMax), cchMax, ch); + + if (lpszStr) + { + while (*lpszStr && cchMax-- > 0) + { + if (*lpszStr == ch) + return (LPWSTR)lpszStr; + lpszStr++; + } + } + return NULL; } /************************************************************************* Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -2382,3 +2382,35 @@ } return hRet; } + +/*********************************************************************** + * UrlFixupW [SHLWAPI.462] + * + * Checks the scheme part of a URL and attempts to correct misspellings. + * + * PARAMS + * lpszUrl [I] Pointer to the URL to be corrected + * lpszTranslatedUrl [O] Pointer to a buffer to store corrected URL + * dwMaxChars [I] Maximum size of corrected URL + * + * RETURNS + * success: S_OK if URL corrected or already correct + * failure: S_FALSE if unable to correct / COM error code if other error + * + */ +HRESULT WINAPI UrlFixupW(LPCWSTR url, LPWSTR translatedUrl, DWORD maxChars) +{ + DWORD srcLen; + + FIXME("(%s,%p,%d) STUB\n", debugstr_w(url), translatedUrl, maxChars); + + if (!url) + return E_FAIL; + + srcLen = lstrlenW(url); + + /* For now just copy the URL directly */ + lstrcpynW(translatedUrl, url, (maxChars < srcLen) ? maxChars : srcLen); + + return S_OK; +} Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -952,7 +952,7 @@ list_add_tail(&This->objects, &item->entry); } - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, item); hr = S_OK; Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Sat Sep 26 12:48:07 2009 @@ -129,13 +129,12 @@ LARGE_INTEGER NewPosition; TRACE("(%p)\n", This); - if (dlibMove.QuadPart > 0xFFFFFFFF) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); - if (dwOrigin == STREAM_SEEK_SET) NewPosition.QuadPart = dlibMove.QuadPart; else if (dwOrigin == STREAM_SEEK_CUR) NewPosition.QuadPart = This->dwCurPos + dlibMove.QuadPart; else if (dwOrigin == STREAM_SEEK_END) NewPosition.QuadPart = This->dwMemsize + dlibMove.QuadPart; else return E_INVALIDARG; + if (NewPosition.u.HighPart) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; if (NewPosition.QuadPart < 0) return E_INVALIDARG; This->dwCurPos = NewPosition.u.LowPart;

1 0

[dchapyshev] 43162: - Sync crypt32 with Wine 1.1.30
by dchapyshev＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: dchapyshev Date: Sat Sep 26 12:46:37 2009 New Revision: 43162 URL: http://svn.reactos.org/svn/reactos?rev=43162&view=rev Log: - Sync crypt32 with Wine 1.1.30 Modified: trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Sat Sep 26 12:46:37 2009 @@ -1567,12 +1567,7 @@ SetLastError(ERROR_INVALID_DATA); return FALSE; } - if (pChainPara->cbSize != sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS) && - pChainPara->cbSize != sizeof(CERT_CHAIN_PARA)) - { - SetLastError(E_INVALIDARG); - return FALSE; - } + if (!hChainEngine) hChainEngine = CRYPT_GetDefaultChainEngine(); /* FIXME: what about HCCE_LOCAL_MACHINE? */ Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Sat Sep 26 12:46:37 2009 @@ -2410,6 +2410,20 @@ else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_SIGNER: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CryptEncodeObjectEx( + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, CMS_SIGNER_INFO, + &msg->u.signed_data.info->rgSignerInfo[dwIndex], 0, NULL, + pvData, pcbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ATTR_CERT_COUNT_PARAM: if (msg->u.signed_data.info) { Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] Sat Sep 26 12:46:37 2009 @@ -978,7 +978,8 @@ ret = FALSE; else ret = hcs->certs.deleteContext(hcs, (void *)pCertContext); - CertFreeCertificateContext(pCertContext); + if (ret) + CertFreeCertificateContext(pCertContext); } return ret; } Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Sat Sep 26 12:46:37 2009 @@ -930,10 +930,65 @@ return ret; } +/* Searches cert's extensions for the alternate name extension with OID + * altNameOID, and if found, searches it for the alternate name type entryType. + * If found, returns a pointer to the entry, otherwise returns NULL. + * Regardless of whether an entry of the desired type is found, if the + * alternate name extension is present, sets *info to the decoded alternate + * name extension, which you must free using LocalFree. + * The return value is a pointer within *info, so don't free *info before + * you're done with the return value. + */ +static PCERT_ALT_NAME_ENTRY cert_find_alt_name_entry(PCCERT_CONTEXT cert, + LPCSTR altNameOID, DWORD entryType, PCERT_ALT_NAME_INFO *info) +{ + PCERT_ALT_NAME_ENTRY entry = NULL; + PCERT_EXTENSION ext = CertFindExtension(altNameOID, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + + if (ext) + { + DWORD bytes = 0; + + if (CryptDecodeObjectEx(cert->dwCertEncodingType, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + info, &bytes)) + { + DWORD i; + + for (i = 0; !entry && i < (*info)->cAltEntry; i++) + if ((*info)->rgAltEntry[i].dwAltNameChoice == entryType) + entry = &(*info)->rgAltEntry[i]; + } + } + else + *info = NULL; + return entry; +} + +static DWORD cert_get_name_from_rdn_attr(DWORD encodingType, + PCERT_NAME_BLOB name, LPCSTR oid, LPWSTR pszNameString, DWORD cchNameString) +{ + CERT_NAME_INFO *nameInfo; + DWORD bytes = 0, ret = 0; + + if (CryptDecodeObjectEx(encodingType, X509_NAME, name->pbData, + name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) + { + PCERT_RDN_ATTR nameAttr = CertFindRDNAttr(oid, nameInfo); + + if (nameAttr) + ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, + pszNameString, cchNameString); + LocalFree(nameInfo); + } + return ret; +} + DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString) { - DWORD ret; + DWORD ret = 0; PCERT_NAME_BLOB name; LPCSTR altNameOID; @@ -953,50 +1008,113 @@ switch (dwType) { + case CERT_NAME_EMAIL_TYPE: + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_RFC822_NAME, &info); + + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszRfc822Name) + 1; + else if (cchNameString) + { + ret = min(strlenW(entry->pwszRfc822Name), cchNameString - 1); + memcpy(pszNameString, entry->pwszRfc822Name, + ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + if (info) + LocalFree(info); + if (!ret) + ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, + name, szOID_RSA_emailAddr, pszNameString, cchNameString); + break; + } + case CERT_NAME_RDN_TYPE: + if (name->cbData) + ret = CertNameToStrW(pCertContext->dwCertEncodingType, name, + *(DWORD *)pvTypePara, pszNameString, cchNameString); + else + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_DIRECTORY_NAME, &info); + + if (entry) + ret = CertNameToStrW(pCertContext->dwCertEncodingType, + &entry->DirectoryName, *(DWORD *)pvTypePara, pszNameString, + cchNameString); + if (info) + LocalFree(info); + } + break; + case CERT_NAME_ATTR_TYPE: + ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, + name, pvTypePara, pszNameString, cchNameString); + if (!ret) + { + CERT_ALT_NAME_INFO *altInfo; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_DIRECTORY_NAME, &altInfo); + + if (entry) + ret = cert_name_to_str_with_indent(X509_ASN_ENCODING, 0, + &entry->DirectoryName, 0, pszNameString, cchNameString); + if (altInfo) + LocalFree(altInfo); + } + break; case CERT_NAME_SIMPLE_DISPLAY_TYPE: { static const LPCSTR simpleAttributeOIDs[] = { szOID_COMMON_NAME, szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME, szOID_RSA_emailAddr }; - CERT_NAME_INFO *info = NULL; - PCERT_RDN_ATTR nameAttr = NULL; + CERT_NAME_INFO *nameInfo = NULL; DWORD bytes = 0, i; if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, X509_NAME, - name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, + name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) { + PCERT_RDN_ATTR nameAttr = NULL; + for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / sizeof(simpleAttributeOIDs[0]); i++) - nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info); - } - if (!nameAttr) - { - PCERT_EXTENSION ext = CertFindExtension(altNameOID, - pCertContext->pCertInfo->cExtension, - pCertContext->pCertInfo->rgExtension); - - if (ext) - { - for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / - sizeof(simpleAttributeOIDs[0]); i++) - nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info); - if (!nameAttr) - { - /* FIXME: gotta then look for a rfc822Name choice in ext. - * Failing that, look for the first attribute. - */ - FIXME("CERT_NAME_SIMPLE_DISPLAY_TYPE: stub\n"); - } - } - } - if (nameAttr) - ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, - pszNameString, cchNameString); - else - ret = 0; - if (info) - LocalFree(info); + nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], nameInfo); + if (nameAttr) + ret = CertRDNValueToStrW(nameAttr->dwValueType, + &nameAttr->Value, pszNameString, cchNameString); + LocalFree(nameInfo); + } + if (!ret) + { + CERT_ALT_NAME_INFO *altInfo; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_RFC822_NAME, &altInfo); + + if (altInfo) + { + if (!entry && altInfo->cAltEntry) + entry = &altInfo->rgAltEntry[0]; + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszRfc822Name) + 1; + else if (cchNameString) + { + ret = min(strlenW(entry->pwszRfc822Name), + cchNameString - 1); + memcpy(pszNameString, entry->pwszRfc822Name, + ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + LocalFree(altInfo); + } + } break; } case CERT_NAME_FRIENDLY_DISPLAY_TYPE: @@ -1012,9 +1130,64 @@ cchNameString); break; } + case CERT_NAME_DNS_TYPE: + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_DNS_NAME, &info); + + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszDNSName) + 1; + else if (cchNameString) + { + ret = min(strlenW(entry->pwszDNSName), cchNameString - 1); + memcpy(pszNameString, entry->pwszDNSName, ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + if (info) + LocalFree(info); + if (!ret) + ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, + name, szOID_COMMON_NAME, pszNameString, cchNameString); + break; + } + case CERT_NAME_URL_TYPE: + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_URL, &info); + + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszURL) + 1; + else if (cchNameString) + { + ret = min(strlenW(entry->pwszURL), cchNameString - 1); + memcpy(pszNameString, entry->pwszURL, ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + if (info) + LocalFree(info); + break; + } default: FIXME("unimplemented for type %d\n", dwType); ret = 0; } - return ret; -} + if (!ret) + { + if (!pszNameString) + ret = 1; + else if (cchNameString) + { + pszNameString[0] = 0; + ret = 1; + } + } + return ret; +}

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