Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cwittich] 36233: sync imm.h with wine (should fix build)
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 06:46:08 2008 New Revision: 36233 URL: http://svn.reactos.org/svn/reactos?rev=36233&view=rev Log: sync imm.h with wine (should fix build) Modified: trunk/reactos/include/psdk/imm.h Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=362… ============================================================================== --- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Sun Sep 14 06:46:08 2008 @@ -169,7 +169,6 @@ /* the modifiers of hot key */ -#ifndef _WINUSER_ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002 #define MOD_SHIFT 0x0004 @@ -179,7 +178,6 @@ #define MOD_ON_KEYUP 0x0800 #define MOD_IGNORE_ALL_MODIFIER 0x0400 -#endif /* _WINUSER_ */ /* Windows for Simplified Chinese Edition hot key ID from 0x10 - 0x2F */

1 0

[cwittich] 36232: update crypt headers sync crypt32 with wine 1.1.4 sync wintrust with wine 1.1.4
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 06:32:55 2008 New Revision: 36232 URL: http://svn.reactos.org/svn/reactos?rev=36232&view=rev Log: update crypt headers sync crypt32 with wine 1.1.4 sync wintrust with wine 1.1.4 Added: trunk/reactos/dll/win32/crypt32/ctl.c (with props) trunk/reactos/dll/win32/crypt32/message.c (with props) trunk/reactos/dll/win32/wintrust/asn.c (with props) trunk/reactos/dll/win32/wintrust/softpub.c (with props) trunk/reactos/dll/win32/wintrust/wintrust_priv.h (with props) trunk/reactos/include/psdk/bcrypt.h (with props) Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/collectionstore.c trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/crypt32_Sv.rc trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/filestore.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/provstore.c trunk/reactos/dll/win32/crypt32/regstore.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/dll/win32/crypt32/serialize.c trunk/reactos/dll/win32/crypt32/sip.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/register.c trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/dll/win32/wintrust/wintrust.spec trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/include/psdk/softpub.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/wintrust.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collecti… Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Added: trunk/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/ctl.c?re… Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… Modified: trunk/reactos/dll/win32/crypt32/filestore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/filestor… Added: trunk/reactos/dll/win32/crypt32/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/message.… Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?re… Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c… Modified: trunk/reactos/dll/win32/crypt32/provstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/provstor… Modified: trunk/reactos/dll/win32/crypt32/regstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/regstore… Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/serializ… Modified: trunk/reactos/dll/win32/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/sip.c?re… Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… Added: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c… Modified: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/registe… Added: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub… Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Added: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Added: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… Modified: trunk/reactos/include/psdk/softpub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/softpub.h?rev… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… Modified: trunk/reactos/include/psdk/wintrust.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wintrust.h?re…

1 0

[cwittich] 36231: set _ADVAPI32_ define
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 06:28:56 2008 New Revision: 36231 URL: http://svn.reactos.org/svn/reactos?rev=36231&view=rev Log: set _ADVAPI32_ define Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Sun Sep 14 06:28:56 2008 @@ -8,6 +8,7 @@ <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> + <define name="_ADVAPI32_" /> <library>scm_client</library> <library>lsa_client</library> <library>eventlog_client</library>

1 0

[sginsberg] 36230: - Don't leak a handle if user mode tries to debug the system process
by sginsberg＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: sginsberg Date: Sun Sep 14 06:27:28 2008 New Revision: 36230 URL: http://svn.reactos.org/svn/reactos?rev=36230&view=rev Log: - Don't leak a handle if user mode tries to debug the system process Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Sep 14 06:27:28 2008 @@ -1643,7 +1643,12 @@ if (!NT_SUCCESS(Status)) return Status; /* Don't allow debugging the initial system process */ - if (Process == PsInitialSystemProcess) return STATUS_ACCESS_DENIED; + if (Process == PsInitialSystemProcess) + { + /* Dereference and fail */ + ObDereferenceObject(Process); + return STATUS_ACCESS_DENIED; + } /* Reference the debug object */ Status = ObReferenceObjectByHandle(DebugHandle,

1 0

[cwittich] 36229: sync rasapi32 to wine 1.1.4
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 05:37:55 2008 New Revision: 36229 URL: http://svn.reactos.org/svn/reactos?rev=36229&view=rev Log: sync rasapi32 to wine 1.1.4 Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi.… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] Sun Sep 14 05:37:55 2008 @@ -246,8 +246,11 @@ */ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD lpcDevices) { + if (!lpcb || !lpcDevices) + return ERROR_INVALID_PARAMETER; + FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices); - if (*lpcb < sizeof(RASDEVINFOA)) { + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; }

1 0

[cwittich] 36228: sync mpr to wine 1.1.4
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 05:18:40 2008 New Revision: 36228 URL: http://svn.reactos.org/svn/reactos?rev=36228&view=rev Log: sync mpr to wine 1.1.4 Added: trunk/reactos/dll/win32/mpr/mpr_Zh.rc (with props) Modified: trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr_Ru.rc Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Sun Sep 14 05:18:40 2008 @@ -45,4 +45,5 @@ #include "mpr_Si.rc" #include "mpr_Sv.rc" #include "mpr_Tr.rc" +#include "mpr_Zh.rc" #include "mpr_Uk.rc" Modified: trunk/reactos/dll/win32/mpr/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ru.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] Sun Sep 14 05:18:40 2008 @@ -1,7 +1,7 @@ /* - * MPR dll resources + * MPR dll Russian resources * - * Copyright (C) 2005 Mikhail Y. Zvyozdochkin + * Copyright (C) 2008 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -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 St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -27,19 +27,19 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ââåäèòå Ñåòåâîé Ïàðîëü" +CAPTION "Ââåäèòå ñåòåâîé ïàðîëü" FONT 8, "MS Shell Dlg" { - LTEXT "Ïîæàëóéñòà, ââåäèòå Âàøè èìÿ è ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñè-ñåðâåð", -1, 40, 26, 50, 10 + LTEXT "Ââåäèòå âàøè èìÿ è ïàðîëü ïîëüçîâàòåëÿ:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Ïðîêñè", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Èìÿ ïîëüçîâàòåëÿ", -1, 40, 66, 50, 10 + LTEXT "Èìÿ", -1, 40, 66, 50, 10 LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Ñîõðàíèòü ïàðîëü (íåáåçîïàñíî)", IDC_SAVEPASSWORD, + CHECKBOX "&Ñîõðàíèòü ýòîò ïàðîëü (íåáåçîïàñíî!)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP Added: trunk/reactos/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Zh.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] Sun Sep 14 05:18:40 2008 @@ -1,0 +1,78 @@ +/* + * MPR dll (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "æ´ä¸ªç½ç»" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¾å¥ç½ç»å¯ç " +FONT 9, "MS Song" +{ + LTEXT "è¯·è¾å¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "ä»£ç", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "ç¨æ·å", -1, 40, 66, 50, 10 + LTEXT "å¯ç ", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¡®å®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "æ´åç¶²è·¯" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "è¼¸å¥ç¶²è·¯å¯ç¢¼" +FONT 8, "PMingLiu" +{ + LTEXT "è«è¼¸å¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "ä»£ç", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "ç¨æ¶å", -1, 40, 66, 50, 10 + LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¢ºå®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/mpr/mpr_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 36227: sync advpack to wine 1.1.4
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 05:14:21 2008 New Revision: 36227 URL: http://svn.reactos.org/svn/reactos?rev=36227&view=rev Log: sync advpack to wine 1.1.4 Modified: trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Sun Sep 14 05:14:21 2008 @@ -709,7 +709,7 @@ if (FileList) { szConvertedList = convert_file_list(FileList, &dwFileCount); - if (!szConvertedList || dwFileCount == -1) + if (!szConvertedList) { res = E_FAIL; goto done; Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Sun Sep 14 05:14:21 2008 @@ -39,7 +39,7 @@ #define SPAPI_ERROR 0xE0000000L #define SPAPI_PREFIX 0x800F0000L #define SPAPI_MASK 0xFFFFL -#define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX) +#define HRESULT_FROM_SPAPI(x) ((HRESULT)((x & SPAPI_MASK) | SPAPI_PREFIX)) #define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x))

1 0

[cwittich] 36226: update headers for shdocvw
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 05:05:35 2008 New Revision: 36226 URL: http://svn.reactos.org/svn/reactos?rev=36226&view=rev Log: update headers for shdocvw Modified: trunk/reactos/include/psdk/intshcut.h trunk/reactos/include/psdk/isguids.h Modified: trunk/reactos/include/psdk/intshcut.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intshcut.h?re… ============================================================================== --- trunk/reactos/include/psdk/intshcut.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intshcut.h [iso-8859-1] Sun Sep 14 05:05:35 2008 @@ -1,82 +1,114 @@ -#ifndef _INTSHCUT_H -#define _INTSHCUT_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +/* + * Copyright (C) 2007 Francois Gouget + * + * 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 + */ + +#ifndef __WINE_INTSHCUT_H +#define __WINE_INTSHCUT_H #include <isguids.h> + +#define INTSHCUTAPI + #ifdef __cplusplus extern "C" { #endif -#define INTSHCUTAPI DECLSPEC_IMPORT + #define E_FLAGS MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1000) #define IS_E_EXEC_FAILED MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x2002) #define URL_E_INVALID_SYNTAX MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1001) #define URL_E_UNREGISTERED_PROTOCOL MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1002) + typedef enum iurl_seturl_flags { - IURL_SETURL_FL_GUESS_PROTOCOL=1, - IURL_SETURL_FL_USE_DEFAULT_PROTOCOL, - ALL_IURL_SETURL_FLAGS=(IURL_SETURL_FL_GUESS_PROTOCOL|IURL_SETURL_FL_USE_DEFAULT_PROTOCOL) + IURL_SETURL_FL_GUESS_PROTOCOL=1, + IURL_SETURL_FL_USE_DEFAULT_PROTOCOL, + ALL_IURL_SETURL_FLAGS=(IURL_SETURL_FL_GUESS_PROTOCOL|IURL_SETURL_FL_USE_DEFAULT_PROTOCOL) } IURL_SETURL_FLAGS; + typedef enum iurl_invokecommand_flags { - IURL_INVOKECOMMAND_FL_ALLOW_UI=1, - IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB, - ALL_IURL_INVOKECOMMAND_FLAGS=(IURL_INVOKECOMMAND_FL_ALLOW_UI|IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB) + IURL_INVOKECOMMAND_FL_ALLOW_UI=1, + IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB, + ALL_IURL_INVOKECOMMAND_FLAGS=(IURL_INVOKECOMMAND_FL_ALLOW_UI|IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB) } IURL_INVOKECOMMAND_FLAGS; -typedef enum translateurl_in_flags { - TRANSLATEURL_FL_GUESS_PROTOCOL=1, - TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL, - ALL_TRANSLATEURL_FLAGS=(TRANSLATEURL_FL_GUESS_PROTOCOL|TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL) -} TRANSLATEURL_IN_FLAGS; -typedef enum urlassociationdialog_in_flags { - URLASSOCDLG_FL_USE_DEFAULT_NAME=1, - URLASSOCDLG_FL_REGISTER_ASSOC, - ALL_URLASSOCDLG_FLAGS=(URLASSOCDLG_FL_USE_DEFAULT_NAME|URLASSOCDLG_FL_REGISTER_ASSOC) -} URLASSOCIATIONDIALOG_IN_FLAGS; -typedef enum mimeassociationdialog_in_flags { - MIMEASSOCDLG_FL_REGISTER_ASSOC=1, - ALL_MIMEASSOCDLG_FLAGS=MIMEASSOCDLG_FL_REGISTER_ASSOC -} MIMEASSOCIATIONDIALOG_IN_FLAGS; -typedef struct urlinvokecommandinfo { - DWORD dwcbSize; - DWORD dwFlags; - HWND hwndParent; - PCSTR pcszVerb; -} URLINVOKECOMMANDINFO,*PURLINVOKECOMMANDINFO; -typedef const URLINVOKECOMMANDINFO CURLINVOKECOMMANDINFO; -typedef const URLINVOKECOMMANDINFO *PCURLINVOKECOMMANDINFO; -#define INTERFACE IUniformResourceLocator -DECLARE_INTERFACE_(IUniformResourceLocator,IUnknown) + +typedef struct urlinvokecommandinfoA { + DWORD dwcbSize; + DWORD dwFlags; + HWND hwndParent; + LPCSTR pcszVerb; +} URLINVOKECOMMANDINFOA, *PURLINVOKECOMMANDINFOA; +typedef const URLINVOKECOMMANDINFOA CURLINVOKECOMMANDINFOA; +typedef const URLINVOKECOMMANDINFOA *PCURLINVOKECOMMANDINFOA; + +typedef struct urlinvokecommandinfoW { + DWORD dwcbSize; + DWORD dwFlags; + HWND hwndParent; + LPCWSTR pcszVerb; +} URLINVOKECOMMANDINFOW, *PURLINVOKECOMMANDINFOW; +typedef const URLINVOKECOMMANDINFOW CURLINVOKECOMMANDINFOW; +typedef const URLINVOKECOMMANDINFOW *PCURLINVOKECOMMANDINFOW; + +#define INTERFACE IUniformResourceLocatorA +DECLARE_INTERFACE_(IUniformResourceLocatorA,IUnknown) { - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(SetURL)(THIS_ PCSTR,DWORD) PURE; - STDMETHOD(GetURL)(THIS_ PSTR*) PURE; - STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFO) PURE; + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, VOID **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IUniformResourceLocatorA methods ***/ + STDMETHOD(SetURL)(THIS_ LPCSTR pcszURL, DWORD dwInFlags) PURE; + STDMETHOD(GetURL)(THIS_ LPSTR *ppszURL) PURE; + STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFOA pURLCommandInfo) PURE; }; #undef INTERFACE -typedef IUniformResourceLocator *PIUniformResourceLocator; -typedef const IUniformResourceLocator CIUniformResourceLocator; -typedef const IUniformResourceLocator *PCIUniformResourceLocator; -BOOL WINAPI InetIsOffline(DWORD); -HRESULT WINAPI MIMEAssociationDialogA(HWND,DWORD,PCSTR,PCSTR,PSTR,UINT); -HRESULT WINAPI MIMEAssociationDialogW(HWND,DWORD,PCWSTR,PCWSTR,PWSTR,UINT); -HRESULT WINAPI TranslateURLA(PCSTR,DWORD,PSTR*); -HRESULT WINAPI TranslateURLW(PCWSTR,DWORD,PWSTR*); -HRESULT WINAPI URLAssociationDialogA(HWND,DWORD,PCSTR,PCSTR,PSTR,UINT); -HRESULT WINAPI URLAssociationDialogW(HWND,DWORD,PCWSTR,PCWSTR,PWSTR,UINT); -#ifdef UNICODE -#define TranslateURL TranslateURLW -#define MIMEAssociationDialog MIMEAssociationDialogW -#define URLAssociationDialog URLAssociationDialogW -#else -#define TranslateURL TranslateURLA -#define MIMEAssociationDialog MIMEAssociationDialogA -#define URLAssociationDialog URLAssociationDialogA -#endif +#define INTERFACE IUniformResourceLocatorW +DECLARE_INTERFACE_(IUniformResourceLocatorW,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, VOID **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IUniformResourceLocatorW methods ***/ + STDMETHOD(SetURL)(THIS_ LPCWSTR pcszURL, DWORD dwInFlags) PURE; + STDMETHOD(GetURL)(THIS_ LPWSTR *ppszURL) PURE; + STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFOW pURLCommandInfo) PURE; +}; +#undef INTERFACE + +DECL_WINELIB_TYPE_AW(URLINVOKECOMMANDINFO) +DECL_WINELIB_TYPE_AW(PURLINVOKECOMMANDINFO) +DECL_WINELIB_TYPE_AW(CURLINVOKECOMMANDINFO) +DECL_WINELIB_TYPE_AW(PCURLINVOKECOMMANDINFO) + + +typedef enum translateurl_in_flags { + TRANSLATEURL_FL_GUESS_PROTOCOL=1, + TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL +} TRANSLATEURL_IN_FLAGS; + +HRESULT WINAPI TranslateURLA(LPCSTR, DWORD, LPSTR *); +HRESULT WINAPI TranslateURLW(LPCWSTR, DWORD, LPWSTR *); +#define TranslateURL WINELIB_NAME_AW(TranslateURL) + +BOOL WINAPI InetIsOffline(DWORD); + #ifdef __cplusplus } #endif -#endif + +#endif /* __WINE_INTSHCUT_H */ Modified: trunk/reactos/include/psdk/isguids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/isguids.h?rev… ============================================================================== --- trunk/reactos/include/psdk/isguids.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/isguids.h [iso-8859-1] Sun Sep 14 05:05:35 2008 @@ -1,15 +1,28 @@ -#ifndef _ISGUID_H -#define _ISGUID_H -#if __GNUC__ >=3 -#pragma GCC system_header +/* + * Copyright 2007 Jacek Caban 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 + */ + +#ifndef _ISGUIDS_H_ +#define _ISGUIDS_H_ + +DEFINE_GUID(CLSID_InternetShortcut, 0xfbf23b40,0xe3f0,0x101b,0x84,0x88,0x00,0xaa,0x00,0x3e,0x56,0xf8); + +DEFINE_GUID(IID_IUniformResourceLocatorA, 0xfbf23b80,0xe3f0,0x101b,0x84,0x88,0x00,0xaa,0x00,0x3e,0x56,0xf8); +DEFINE_GUID(IID_IUniformResourceLocatorW, 0xcabb0da0,0xda57,0x11cf,0x99,0x74,0x00,0x20,0xaf,0xd7,0x97,0x62); +#define IID_IUniformResourceLocator WINELIB_NAME_AW(IID_IUniformResourceLocator) + #endif - -#ifdef __cplusplus -extern "C" { -#endif -extern const GUID CLSID_InternetShortcut; -extern const GUID IID_IUniformResourceLocator; -#ifdef __cplusplus -} -#endif -#endif

1 0

[cwittich] 36225: IID_IActiveScriptSiteDebug32 is already defined in uuid
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 04:56:41 2008 New Revision: 36225 URL: http://svn.reactos.org/svn/reactos?rev=36225&view=rev Log: IID_IActiveScriptSiteDebug32 is already defined in uuid Modified: trunk/reactos/lib/sdk/strmiids/strmiids.c Modified: trunk/reactos/lib/sdk/strmiids/strmiids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/strmiids/strmiids.… ============================================================================== --- trunk/reactos/lib/sdk/strmiids/strmiids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/strmiids/strmiids.c [iso-8859-1] Sun Sep 14 04:56:41 2008 @@ -1,4 +1,4 @@ -/* + /* strmiids.c - DirectShow GUIDs @@ -348,7 +348,7 @@ DEFINE_GUID(FORMAT_VideoInfo2,0xf72a76a0,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba); DEFINE_GUID(FORMAT_VIDEOINFO2,0xf72a76a0,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba); DEFINE_GUID(FORMAT_WaveFormatEx,0x05589f81,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a); -DEFINE_GUID(IID_IActiveScriptSiteDebug32,0x51973c11,0xcb0c,0x11d0,0xb5,0xc9,0x00,0xa0,0x24,0x4a,0x0e,0x7a); +/* DEFINE_GUID(IID_IActiveScriptSiteDebug32,0x51973c11,0xcb0c,0x11d0,0xb5,0xc9,0x00,0xa0,0x24,0x4a,0x0e,0x7a); */ DEFINE_GUID(IID_IAMAnalogVideoDecoder,0xc6e13350,0x30ac,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56); DEFINE_GUID(IID_IAMAnalogVideoEncoder,0xc6e133b0,0x30ac,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56); DEFINE_GUID(IID_IAMAudioInputMixer,0x54c39221,0x8380,0x11d0,0xb3,0xf0,0x00,0xaa,0x00,0x37,0x61,0xc5);

1 0

[sserapion] 36224: always double check late night commits.
by sserapion＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: sserapion Date: Sun Sep 14 03:45:07 2008 New Revision: 36224 URL: http://svn.reactos.org/svn/reactos?rev=36224&view=rev Log: always double check late night commits. Modified: branches/ros-amd64-bringup/reactos/tools/rsym.h Modified: branches/ros-amd64-bringup/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym.h [iso-8859-1] Sun Sep 14 03:45:07 2008 @@ -162,7 +162,6 @@ #pragma pack(pop) #ifdef _TARGET_PE64 -#error HERE typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008