Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[winesync] 23210: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:07:51 2006 New Revision: 23210 URL: http://svn.reactos.org/svn/reactos?rev=23210&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32stubs.c (original) +++ trunk/reactos/dll/win32/olepro32/olepro32stubs.c Fri Jul 21 17:07:51 2006 @@ -17,7 +17,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 */ #define COM_NO_WINDOWS_H

18 years, 5 months

[winesync] 23209: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:05:13 2006 New Revision: 23209 URL: http://svn.reactos.org/svn/reactos?rev=23209&view=rev Log: Autosyncing with Wine HEAD Removed: trunk/reactos/dll/win32/oledlg/Makefile.in Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/oledlg_De.rc trunk/reactos/dll/win32/oledlg/oledlg_En.rc trunk/reactos/dll/win32/oledlg/oledlg_Es.rc trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/oledlg_It.rc trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/oledlg_No.rc trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc trunk/reactos/dll/win32/oledlg/oledlg_main.c trunk/reactos/dll/win32/oledlg/resource.h Removed: trunk/reactos/dll/win32/oledlg/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/Makefile.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/Makefile.in (original) +++ trunk/reactos/dll/win32/oledlg/Makefile.in (removed) @@ -1,17 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = oledlg.dll -IMPORTLIB = liboledlg.$(IMPLIBEXT) -IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll - -C_SRCS = \ - insobjdlg.c \ - oledlg_main.c - -RC_SRCS = rsrc.rc - -@MAKE_DLL_RULES@ - -### Dependencies: Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg… ============================================================================== --- trunk/reactos/dll/win32/oledlg/insobjdlg.c (original) +++ trunk/reactos/dll/win32/oledlg/insobjdlg.c Fri Jul 21 17:05:13 2006 @@ -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 */ #include <stdarg.h> Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Cs… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc Fri Jul 21 17:05:13 2006 @@ -16,7 +16,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_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_De… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_De.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_De.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_GERMAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_En… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_En.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_En.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Es… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Es.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Es.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Fr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc Fri Jul 21 17:05:13 2006 @@ -16,7 +16,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 */ Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_It… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_It.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_It.rc Fri Jul 21 17:05:13 2006 @@ -14,7 +14,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_ITALIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_JAPANESE, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ko… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc Fri Jul 21 17:05:13 2006 @@ -14,7 +14,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_DUTCH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_No.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_No.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc Fri Jul 21 17:05:13 2006 @@ -13,7 +13,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_PORTUGUESE, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Tr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc Fri Jul 21 17:05:13 2006 @@ -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_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oledlg/oledlg_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ma… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_main.c (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_main.c Fri Jul 21 17:05:13 2006 @@ -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 */ #define COM_NO_WINDOWS_H @@ -245,7 +245,7 @@ /*********************************************************************** * OleUIPromptUserA (OLEDLG.10) */ -INT __cdecl OleUIPromptUserA( +INT WINAPIV OleUIPromptUserA( INT nTemplate, HWND hwndParent, ...) { FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent); @@ -256,7 +256,7 @@ /*********************************************************************** * OleUIPromptUserW (OLEDLG.13) */ -INT __cdecl OleUIPromptUserW( +INT WINAPIV OleUIPromptUserW( INT nTemplate, HWND hwndParent, ...) { FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent); Modified: trunk/reactos/dll/win32/oledlg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/resource.h (original) +++ trunk/reactos/dll/win32/oledlg/resource.h Fri Jul 21 17:05:13 2006 @@ -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 */ #define IDS_RESULTOBJDESC 101

18 years, 5 months

[winesync] 23208: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:05:07 2006 New Revision: 23208 URL: http://svn.reactos.org/svn/reactos?rev=23208&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/oleacc/main.c Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c (original) +++ trunk/reactos/dll/win32/oleacc/main.c Fri Jul 21 17:05:07 2006 @@ -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 */ #include <stdarg.h>

18 years, 5 months

[winesync] 23207: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:05:00 2006 New Revision: 23207 URL: http://svn.reactos.org/svn/reactos?rev=23207&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/objsel/objsel_ros.diff Modified: trunk/reactos/dll/win32/objsel/factory.c trunk/reactos/dll/win32/objsel/objsel.c trunk/reactos/dll/win32/objsel/objsel.rbuild trunk/reactos/dll/win32/objsel/objsel.rc trunk/reactos/dll/win32/objsel/objsel_private.h trunk/reactos/dll/win32/objsel/regsvr.c Modified: trunk/reactos/dll/win32/objsel/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/factory.c… ============================================================================== --- trunk/reactos/dll/win32/objsel/factory.c (original) +++ trunk/reactos/dll/win32/objsel/factory.c Fri Jul 21 17:05:00 2006 @@ -16,7 +16,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 */ #include "objsel_private.h" Modified: trunk/reactos/dll/win32/objsel/objsel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.c (original) +++ trunk/reactos/dll/win32/objsel/objsel.c Fri Jul 21 17:05:00 2006 @@ -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 */ #include "objsel_private.h" Modified: trunk/reactos/dll/win32/objsel/objsel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rb… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.rbuild (original) +++ trunk/reactos/dll/win32/objsel/objsel.rbuild Fri Jul 21 17:05:00 2006 @@ -1,19 +1,21 @@ -<module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll"> +<module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="objsel.spec.def" /> <include base="objsel">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> <library>wine</library> + <library>ole32</library> + <library>oleaut32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <library>ole32</library> <library>ntdll</library> <file>factory.c</file> <file>objsel.c</file> Modified: trunk/reactos/dll/win32/objsel/objsel.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rc… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.rc (original) +++ trunk/reactos/dll/win32/objsel/objsel.rc Fri Jul 21 17:05:00 2006 @@ -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 */ #include "windef.h" Modified: trunk/reactos/dll/win32/objsel/objsel_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel_private.h (original) +++ trunk/reactos/dll/win32/objsel/objsel_private.h Fri Jul 21 17:05:00 2006 @@ -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 */ #include <string.h> Added: trunk/reactos/dll/win32/objsel/objsel_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_ro… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel_ros.diff (added) +++ trunk/reactos/dll/win32/objsel/objsel_ros.diff Fri Jul 21 17:05:00 2006 @@ -1,0 +1,10 @@ +Index: objsel.rbuild +=================================================================== +--- objsel.rbuild (revision 23122) ++++ objsel.rbuild (working copy) +@@ -1,4 +1,5 @@ + <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true"> ++ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="objsel.spec.def" /> + <include base="objsel">.</include> + <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/objsel/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/regsvr.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/regsvr.c (original) +++ trunk/reactos/dll/win32/objsel/regsvr.c Fri Jul 21 17:05:00 2006 @@ -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 */ #include "config.h" @@ -159,7 +159,7 @@ } if (list->base_iid) { - register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); if (res != ERROR_SUCCESS) goto error_close_iid_key; } @@ -181,12 +181,12 @@ } if (list->ps_clsid) { - register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); if (res != ERROR_SUCCESS) goto error_close_iid_key; } if (list->ps_clsid32) { - register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); if (res != ERROR_SUCCESS) goto error_close_iid_key; }

18 years, 5 months

[winesync] 23206: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:04:55 2006 New Revision: 23206 URL: http://svn.reactos.org/svn/reactos?rev=23206&view=rev Log: Autosyncing with Wine HEAD Removed: trunk/reactos/dll/win32/msimg32/Makefile.in Modified: trunk/reactos/dll/win32/msimg32/msimg32_main.c Removed: trunk/reactos/dll/win32/msimg32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/Makefile… ============================================================================== --- trunk/reactos/dll/win32/msimg32/Makefile.in (original) +++ trunk/reactos/dll/win32/msimg32/Makefile.in (removed) @@ -1,13 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = msimg32.dll -IMPORTLIB = libmsimg32.$(IMPLIBEXT) -IMPORTS = gdi32 kernel32 - -C_SRCS = msimg32_main.c - -@MAKE_DLL_RULES@ - -### Dependencies: Modified: trunk/reactos/dll/win32/msimg32/msimg32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/msimg32_… ============================================================================== --- trunk/reactos/dll/win32/msimg32/msimg32_main.c (original) +++ trunk/reactos/dll/win32/msimg32/msimg32_main.c Fri Jul 21 17:04:55 2006 @@ -13,7 +13,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 */ #include <stdarg.h>

18 years, 5 months

[winesync] 23205: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 17:04:49 2006 New Revision: 23205 URL: http://svn.reactos.org/svn/reactos?rev=23205&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mapi32/sendmail.c Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c Fri Jul 21 17:04:49 2006 @@ -63,7 +63,8 @@ unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; - char *address = "", *to = NULL, *cc = NULL, *bcc = NULL, *subject, *body; + char *to = NULL, *cc = NULL, *bcc = NULL; + const char *address, *subject, *body; static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; char *mailto = NULL, *escape = NULL;

18 years, 5 months

[fireball] 23204: Update autosyncing status of Wine-shared DLLs

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jul 21 16:49:46 2006 New Revision: 23204 URL: http://svn.reactos.org/svn/reactos?rev=23204&view=rev Log: Update autosyncing status of Wine-shared DLLs Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Jul 21 16:49:46 2006 @@ -39,7 +39,7 @@ reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 reactos/dll/win32/cabinet # Autosync -reactos/dll/win32/comctl32 # Synced to Wine-0_9_16 +reactos/dll/win32/comctl32 # Autosync reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 reactos/dll/win32/crypt32 # Autosync reactos/dll/win32/cryptdll # Autosync @@ -48,33 +48,34 @@ reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. -reactos/dll/win32/mapi32 # Synced to Wine-0_9_10 +reactos/dll/win32/lz32 # Autosync +reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/mpr # Synced to Wine-0_9_5 reactos/dll/win32/msacm # Out of sync -reactos/dll/win32/msimg32 # Synced to Wine-0_9_12 +reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Synced to Wine-0_9_5 reactos/dll/win32/msvideo # Out of sync reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 -reactos/dll/win32/objsel # Synced to Wine-0_9_12 +reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. reactos/dll/win32/ole32 # Synced to Wine-0_9_5 -reactos/dll/win32/oleacc # Synced to Wine-0_9_10 +reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10 -reactos/dll/win32/oledlg # Synced to Wine-0_9_5 -reactos/dll/win32/olepro32 # Synced to Wine-0_9_10 +reactos/dll/win32/oledlg # Autosync +reactos/dll/win32/olepro32 # Autosync reactos/dll/win32/powrprof # Synced to Wine-0_9_14 reactos/dll/win32/riched20 # Synced to Wine-0_9_5 -reactos/dll/win32/richedit # Synced to Wine-0_9_10 +reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Synced to Wine-0_9_5 reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 -reactos/dll/win32/shfolder # Synced to Wine-0_9_5 +reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Synced to Wine-0_9_5 reactos/dll/win32/twain # Out of sync reactos/dll/win32/urlmon # Synced to Wine-0_9_10 -reactos/dll/win32/uxtheme # Synced to Wine-0_9_10 +reactos/dll/win32/uxtheme # Autosync reactos/dll/win32/version # Synced at 20060509 reactos/dll/win32/wininet # Synced to Wine-0_9_10 reactos/dll/win32/wintrust # Synced to Wine-0_9_10

18 years, 5 months

[winesync] 23203: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 15:30:20 2006 New Revision: 23203 URL: http://svn.reactos.org/svn/reactos?rev=23203&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (with props) Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cn.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/trackbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Fri Jul 21 15:30:20 2006 @@ -4,18 +4,19 @@ <include base="comctl32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>winmm</library> + <library>uxtheme</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>uxtheme</library> - <library>winmm</library> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> @@ -37,8 +38,8 @@ <file>propsheet.c</file> <file>rebar.c</file> <file>smoothscroll.c</file> + <file>status.c</file> <file>string.c</file> - <file>status.c</file> <file>syslink.c</file> <file>tab.c</file> <file>theme_combo.c</file> Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (added) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Fri Jul 21 15:30:20 2006 @@ -1,0 +1,26 @@ +Index: comctl32.rbuild +=================================================================== +--- comctl32.rbuild (revision 23123) ++++ comctl32.rbuild (working copy) +@@ -1,4 +1,5 @@ + <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> ++ <autoregister infsection="OleControlDlls" type="DllInstall" /> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/reactos/wine</include> +Index: listview.c +=================================================================== +--- listview.c (revision 23123) ++++ listview.c (working copy) +@@ -3770,9 +3770,8 @@ + if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) + { + TRACE("iImage=%d\n", lvItem.iImage); ++ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, ++ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); +- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, +- rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, +- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + } + + /* Don't bother painting item being edited */ Propchange: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Bg.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Bg.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà íà " +CAPTION "Ñâîéñòâà íà %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "ÊôÐÔ " +CAPTION "ÊôÐÔ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Fri Jul 21 15:30:20 2006 @@ -26,7 +26,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Vlastnosti " +CAPTION "Vlastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Fri Jul 21 15:30:20 2006 @@ -41,7 +41,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschaften für " +CAPTION "Eigenschaften für %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ecoj laý " +CAPTION "Ecoj laý %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " +CAPTION "Propiedades de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Fri Jul 21 15:30:20 2006 @@ -24,7 +24,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriétés pour " +CAPTION "Propriétés pour %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Tulajdonságok: " +CAPTION "Tulajdonságok: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Proprietà per " +CAPTION "Proprietà per %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¼Ó¼º" +CAPTION "%s ¼Ó¼º" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -54,11 +54,11 @@ FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "´Ù½Ã(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "À§·Î ÀÌµ¿(&U)", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "¾Æ·¡·Î ÀÌµ¿(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10 + LTEXT "°¡´ÉÇÑ ¹öÆ°(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "´õÇÏ±â(&A) ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- Á¦°ÅÇÏ±â(&R)", IDC_REMOVE_BTN,131,62,44,14 @@ -81,3 +81,8 @@ { IDS_SEPARATOR "ºÐ¸®ÀÚ" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "¾øÀ½" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschappen van " +CAPTION "Eigenschappen van %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper for " +CAPTION "Egenskaper for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "W³aciwoci " +CAPTION "W³aciwoci %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para " +CAPTION "Propriedades para %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà äëÿ " +CAPTION "Ñâîéñòâà äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Lastnosti" +CAPTION "Lastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Sv.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Sv.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper för " +CAPTION "Egenskaper för %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ " +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Tr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Tr.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Özellikler: " +CAPTION "Özellikler: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Tamam", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Âëàñòèâîñò³ äëÿ " +CAPTION "Âëàñòèâîñò³ äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Fri Jul 21 15:30:20 2006 @@ -3770,8 +3770,8 @@ if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { TRACE("iImage=%d\n", lvItem.iImage); - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } /* Don't bother painting item being edited */ @@ -5617,9 +5617,11 @@ { POINT Position; LVITEMW lvItem; - INT nColumn = lprc->top; + INT nColumn; if (!lprc) return FALSE; + + nColumn = lprc->top; TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ @@ -6274,7 +6276,13 @@ memcpy(&item, lpLVItem, offsetof( LVITEMW, iIndent )); } item.iItem = nItem; - if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) item.state &= ~LVIS_STATEIMAGEMASK; + if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + item.mask |= LVIF_STATE; + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* if we're sorted, sort the list, and update the index */ @@ -6592,6 +6600,7 @@ /* make space for the new column */ LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left); + LISTVIEW_UpdateItemSize(infoPtr); return nNewColumn; @@ -6871,7 +6880,15 @@ { HIMAGELIST himl = 0; if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + LVITEMW item; + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + LISTVIEW_SetItemState(infoPtr, -1, &item); + himl = LISTVIEW_CreateCheckBoxIL(infoPtr); + } LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); } Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Fri Jul 21 15:30:20 2006 @@ -2151,8 +2151,7 @@ int lenprop = strlenW(psInfo->strPropertiesFor); dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR)); - strcpyW(dest, psInfo->strPropertiesFor); - strcatW(dest, lpszText); + wsprintfW(dest, psInfo->strPropertiesFor, lpszText); SetWindowTextW(hwndDlg, dest); Free(dest); Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Fri Jul 21 15:30:20 2006 @@ -237,7 +237,7 @@ return 0; } -static void inline +inline static void TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; @@ -249,7 +249,7 @@ } -static void inline +inline static void TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; @@ -260,7 +260,7 @@ notify_with_scroll (infoPtr, TB_PAGEUP); } -static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; infoPtr->lPos -= infoPtr->lLineSize; @@ -269,7 +269,7 @@ notify_with_scroll (infoPtr, TB_LINEUP); } -static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; infoPtr->lPos += infoPtr->lLineSize; @@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumb (infoPtr, newPos); } -static BOOL inline +inline static BOOL TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr) { return infoPtr->lSelMin != infoPtr->lSelMax; @@ -757,7 +757,7 @@ } -static void inline +inline static void TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) { TTTOOLINFOW ti; @@ -1022,7 +1022,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) { if (lprc == NULL) return 0; @@ -1036,7 +1036,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) @@ -1058,7 +1058,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) { if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics) @@ -1069,7 +1069,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic) { LONG range, width, pos, tic; @@ -1111,7 +1111,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) { LONG lTemp = infoPtr->lLineSize; @@ -1122,7 +1122,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; @@ -1133,7 +1133,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) { LONG oldPos = infoPtr->lPos; @@ -1152,7 +1152,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) { infoPtr->lRangeMin = (SHORT)LOWORD(lRange); @@ -1177,7 +1177,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) { infoPtr->lRangeMax = lMax; @@ -1195,7 +1195,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) { infoPtr->lRangeMin = lMin; @@ -1213,7 +1213,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1234,7 +1234,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1252,7 +1252,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1270,7 +1270,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) { @@ -1283,7 +1283,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) @@ -1310,7 +1310,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) { @@ -1323,7 +1323,7 @@ } -static INT inline +inline static INT TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation) { INT fTemp = infoPtr->fLocation; @@ -1334,7 +1334,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT) { infoPtr->hwndToolTip = hwndTT; @@ -1343,7 +1343,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) { BOOL bTemp = infoPtr->bUnicode; @@ -1702,7 +1702,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) { switch (nVirtKey) {

18 years, 5 months

[winesync] 23202: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 15:20:23 2006 New Revision: 23202 URL: http://svn.reactos.org/svn/reactos?rev=23202&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/lz32/lzexpand16.c Modified: trunk/reactos/dll/win32/lz32/lzexpand16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand16.… ============================================================================== --- trunk/reactos/dll/win32/lz32/lzexpand16.c (original) +++ trunk/reactos/dll/win32/lz32/lzexpand16.c Fri Jul 21 15:20:23 2006 @@ -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 */ #include <stdarg.h>

18 years, 5 months

[winesync] 23201: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 21 15:13:18 2006 New Revision: 23201 URL: http://svn.reactos.org/svn/reactos?rev=23201&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/crypt32.spec 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/serialize.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c (original) +++ trunk/reactos/dll/win32/crypt32/cert.c Fri Jul 21 15:13:18 2006 @@ -244,12 +244,7 @@ return ret; } -/* info is assumed to be a CRYPT_KEY_PROV_INFO, followed by its container name, - * provider name, and any provider parameters, in a contiguous buffer, but - * where info's pointers are assumed to be invalid. Upon return, info's - * pointers point to the appropriate memory locations. - */ -static void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) { DWORD i, containerLen, provNameLen; LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); @@ -1826,6 +1821,7 @@ } /* Copies data from the parameters into info, where: + * pSerialNumber: The serial number. Must not be NULL. * pSubjectIssuerBlob: Specifies both the subject and issuer for info. * Must not be NULL * pSignatureAlgorithm: Optional. @@ -1836,23 +1832,22 @@ * pubKey: The public key of the certificate. Must not be NULL. * pExtensions: Extensions to be included with the certificate. Optional. */ -static void CRYPT_MakeCertInfo(PCERT_INFO info, +static void CRYPT_MakeCertInfo(PCERT_INFO info, PCRYPT_DATA_BLOB pSerialNumber, PCERT_NAME_BLOB pSubjectIssuerBlob, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, PSYSTEMTIME pStartTime, PSYSTEMTIME pEndTime, PCERT_PUBLIC_KEY_INFO pubKey, PCERT_EXTENSIONS pExtensions) { - /* FIXME: what serial number to use? */ - static const BYTE serialNum[] = { 1 }; static CHAR oid[] = szOID_RSA_SHA1RSA; assert(info); + assert(pSerialNumber); assert(pSubjectIssuerBlob); assert(pubKey); info->dwVersion = CERT_V3; - info->SerialNumber.cbData = sizeof(serialNum); - info->SerialNumber.pbData = (LPBYTE)serialNum; + info->SerialNumber.cbData = pSerialNumber->cbData; + info->SerialNumber.pbData = pSerialNumber->pbData; if (pSignatureAlgorithm) memcpy(&info->SignatureAlgorithm, pSignatureAlgorithm, sizeof(info->SignatureAlgorithm)); @@ -1910,9 +1905,9 @@ UuidCreateFunc uuidCreate = (UuidCreateFunc)GetProcAddress(rpcrt, "UuidCreate"); UuidToStringFunc uuidToString = (UuidToStringFunc)GetProcAddress(rpcrt, - "UuidToString"); + "UuidToStringA"); RpcStringFreeFunc rpcStringFree = (RpcStringFreeFunc)GetProcAddress( - rpcrt, "RpcStringFree"); + rpcrt, "RpcStringFreeA"); if (uuidCreate && uuidToString && rpcStringFree) { @@ -1978,10 +1973,12 @@ { CERT_INFO info = { 0 }; CRYPT_DER_BLOB blob = { 0, NULL }; - BOOL ret; - - CRYPT_MakeCertInfo(&info, pSubjectIssuerBlob, pSignatureAlgorithm, - pStartTime, pEndTime, pubKey, pExtensions); + BYTE serial[16]; + CRYPT_DATA_BLOB serialBlob = { sizeof(serial), serial }; + + CryptGenRandom(hProv, sizeof(serial), serial); + CRYPT_MakeCertInfo(&info, &serialBlob, pSubjectIssuerBlob, + pSignatureAlgorithm, pStartTime, pEndTime, pubKey, pExtensions); ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&blob.pbData, &blob.cbData); Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec Fri Jul 21 15:13:18 2006 @@ -89,7 +89,7 @@ @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stub CertVerifyValidityNesting -@ stub CreateFileU +@ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) @ stub CryptBinaryToStringW # (ptr long long ptr ptr) @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h Fri Jul 21 15:13:18 2006 @@ -23,13 +23,20 @@ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) #define ASN_ENUMERATED (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0a) +#define ASN_UTF8STRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0c) #define ASN_SETOF (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x11) #define ASN_NUMERICSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x12) #define ASN_PRINTABLESTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x13) #define ASN_T61STRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x14) +#define ASN_VIDEOTEXSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x15) #define ASN_IA5STRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x16) #define ASN_UTCTIME (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x17) #define ASN_GENERALTIME (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x18) +#define ASN_GRAPHICSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x19) +#define ASN_VISIBLESTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1a) +#define ASN_GENERALSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1b) +#define ASN_UNIVERSALSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1c) +#define ASN_BMPSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1e) /* The following aren't defined in wincrypt.h, as they're "reserved" */ #define CERT_CERT_PROP_ID 32 @@ -97,6 +104,14 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType); +/* Fixes up the the pointers in info, where info is assumed to be a + * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any + * provider parameters, in a contiguous buffer, but where info's pointers are + * assumed to be invalid. Upon return, info's pointers point to the + * appropriate memory locations. + */ +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info); + DWORD CertStore_GetAccessState(HCERTSTORE hCertStore); /** Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c (original) +++ trunk/reactos/dll/win32/crypt32/decode.c Fri Jul 21 15:13:18 2006 @@ -42,6 +42,7 @@ #include "winbase.h" #include "excpt.h" #include "wincrypt.h" +#include "winnls.h" #include "winreg.h" #include "snmp.h" #include "wine/debug.h" @@ -1271,33 +1272,75 @@ if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesNeeded = sizeof(CERT_NAME_VALUE), valueType; switch (pbEncoded[0]) { + case ASN_OCTETSTRING: + valueType = CERT_RDN_OCTET_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_NUMERICSTRING: + valueType = CERT_RDN_NUMERIC_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_PRINTABLESTRING: + valueType = CERT_RDN_PRINTABLE_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_IA5STRING: + valueType = CERT_RDN_IA5_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_T61STRING: + valueType = CERT_RDN_T61_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_VIDEOTEXSTRING: + valueType = CERT_RDN_VIDEOTEX_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_GRAPHICSTRING: + valueType = CERT_RDN_GRAPHIC_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_VISIBLESTRING: + valueType = CERT_RDN_VISIBLE_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_GENERALSTRING: + valueType = CERT_RDN_GENERAL_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_UNIVERSALSTRING: + FIXME("ASN_UNIVERSALSTRING: unimplemented\n"); + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + break; + case ASN_BMPSTRING: + valueType = CERT_RDN_BMP_STRING; + bytesNeeded += dataLen; + break; + case ASN_UTF8STRING: + valueType = CERT_RDN_UTF8_STRING; + bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; break; default: - FIXME("Unimplemented string type %02x\n", pbEncoded[0]); - SetLastError(OSS_UNIMPLEMENTED); + SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; } if (ret) { - DWORD bytesNeeded = sizeof(CERT_NAME_VALUE); - - switch (pbEncoded[0]) - { - case ASN_NUMERICSTRING: - case ASN_PRINTABLESTRING: - case ASN_IA5STRING: - case ASN_T61STRING: - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - bytesNeeded += dataLen; - break; - } if (!value) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1309,39 +1352,225 @@ else { *pcbStructInfo = bytesNeeded; - switch (pbEncoded[0]) - { - case ASN_NUMERICSTRING: - value->dwValueType = CERT_RDN_NUMERIC_STRING; - break; - case ASN_PRINTABLESTRING: - value->dwValueType = CERT_RDN_PRINTABLE_STRING; - break; - case ASN_IA5STRING: - value->dwValueType = CERT_RDN_IA5_STRING; - break; - case ASN_T61STRING: - value->dwValueType = CERT_RDN_T61_STRING; - break; - } + value->dwValueType = valueType; if (dataLen) { + DWORD i; + + assert(value->Value.pbData); + switch (pbEncoded[0]) + { + case ASN_OCTETSTRING: + case ASN_NUMERICSTRING: + case ASN_PRINTABLESTRING: + case ASN_IA5STRING: + case ASN_T61STRING: + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + value->Value.cbData = dataLen; + if (dataLen) + { + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + memcpy(value->Value.pbData, + pbEncoded + 1 + lenBytes, dataLen); + else + value->Value.pbData = (LPBYTE)pbEncoded + 1 + + lenBytes; + } + break; + case ASN_BMPSTRING: + { + LPWSTR str = (LPWSTR)value->Value.pbData; + + value->Value.cbData = dataLen; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + break; + } + case ASN_UTF8STRING: + { + LPWSTR str = (LPWSTR)value->Value.pbData; + + value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + break; + } + } + } + else + { + value->Value.cbData = 0; + value->Value.pbData = NULL; + } + } + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeNameValue(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = TRUE; + + __TRY + { + ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, pcbStructInfo); + if (ret && pvStructInfo) + { + ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, *pcbStructInfo); + if (ret) + { + CERT_NAME_VALUE *value; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + value = (CERT_NAME_VALUE *)pvStructInfo; + value->Value.pbData = ((BYTE *)value + sizeof(CERT_NAME_VALUE)); + ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + pcbStructInfo); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeUnicodeNameValueInternal( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = TRUE; + DWORD dataLen; + CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesNeeded = sizeof(CERT_NAME_VALUE), valueType; + + switch (pbEncoded[0]) + { + case ASN_NUMERICSTRING: + valueType = CERT_RDN_NUMERIC_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_PRINTABLESTRING: + valueType = CERT_RDN_PRINTABLE_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_IA5STRING: + valueType = CERT_RDN_IA5_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_T61STRING: + valueType = CERT_RDN_T61_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_VIDEOTEXSTRING: + valueType = CERT_RDN_VIDEOTEX_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_GRAPHICSTRING: + valueType = CERT_RDN_GRAPHIC_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_VISIBLESTRING: + valueType = CERT_RDN_VISIBLE_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_GENERALSTRING: + valueType = CERT_RDN_GENERAL_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_UNIVERSALSTRING: + valueType = CERT_RDN_UNIVERSAL_STRING; + bytesNeeded += dataLen / 2 + 2; + break; + case ASN_BMPSTRING: + valueType = CERT_RDN_BMP_STRING; + bytesNeeded += dataLen + 2; + break; + case ASN_UTF8STRING: + valueType = CERT_RDN_UTF8_STRING; + bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2 + 2; + break; + default: + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + } + if (ret) + { + if (!value) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbStructInfo = bytesNeeded; + value->dwValueType = valueType; + if (dataLen) + { + DWORD i; + LPWSTR str = (LPWSTR)value->Value.pbData; + + assert(value->Value.pbData); switch (pbEncoded[0]) { case ASN_NUMERICSTRING: case ASN_PRINTABLESTRING: case ASN_IA5STRING: case ASN_T61STRING: - value->Value.cbData = dataLen; - if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) - value->Value.pbData = (BYTE *)pbEncoded + 1 + - lenBytes; - else - { - assert(value->Value.pbData); - memcpy(value->Value.pbData, - pbEncoded + 1 + lenBytes, dataLen); - } + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + value->Value.cbData = dataLen * 2 + 2; + for (i = 0; i < dataLen; i++) + str[i] = pbEncoded[1 + lenBytes + i]; + str[i] = 0; + break; + case ASN_UNIVERSALSTRING: + value->Value.cbData = dataLen / 2 + 2; + for (i = 0; i < dataLen / 4; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i + 2] << 8) + | pbEncoded[1 + lenBytes + 2 * i + 3]; + str[i] = 0; + break; + case ASN_BMPSTRING: + value->Value.cbData = dataLen + 2; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + str[i] = 0; + break; + case ASN_UTF8STRING: + value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + str[value->Value.cbData / 2] = 0; + value->Value.cbData += 2; break; } } @@ -1356,7 +1585,7 @@ return ret; } -static BOOL WINAPI CRYPT_AsnDecodeNameValue(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_AsnDecodeUnicodeNameValue(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { @@ -1364,7 +1593,7 @@ __TRY { - ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, + ret = CRYPT_AsnDecodeUnicodeNameValueInternal(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, pcbStructInfo); if (ret && pvStructInfo) @@ -1379,8 +1608,8 @@ pvStructInfo = *(BYTE **)pvStructInfo; value = (CERT_NAME_VALUE *)pvStructInfo; value->Value.pbData = ((BYTE *)value + sizeof(CERT_NAME_VALUE)); - ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, - lpszStructType, pbEncoded, cbEncoded, + ret = CRYPT_AsnDecodeUnicodeNameValueInternal( + dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, pcbStructInfo); } @@ -3190,6 +3419,9 @@ case (WORD)RSA_CSP_PUBLICKEYBLOB: decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; + case (WORD)X509_UNICODE_NAME_VALUE: + decodeFunc = CRYPT_AsnDecodeUnicodeNameValue; + break; case (WORD)X509_OCTET_STRING: decodeFunc = CRYPT_AsnDecodeOctets; break; Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c (original) +++ trunk/reactos/dll/win32/crypt32/encode.c Fri Jul 21 15:13:18 2006 @@ -46,6 +46,7 @@ #include "snmp.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -163,6 +164,8 @@ SetLastError(ERROR_MORE_DATA); ret = FALSE; } + else + *pcbEncoded = bytesNeeded; return ret; } @@ -381,18 +384,18 @@ *pcbEncoded = blob->cbData; ret = TRUE; } - else if (*pcbEncoded < blob->cbData) - { - *pcbEncoded = blob->cbData; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } else { - if (blob->cbData) - memcpy(pbEncoded, blob->pbData, blob->cbData); - *pcbEncoded = blob->cbData; - ret = TRUE; + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, blob->cbData))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + if (blob->cbData) + memcpy(pbEncoded, blob->pbData, blob->cbData); + *pcbEncoded = blob->cbData; + ret = TRUE; + } } return ret; } @@ -910,6 +913,104 @@ return ret; } +static BOOL CRYPT_AsnEncodeStringCoerce(const CERT_NAME_VALUE *value, + BYTE tag, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCSTR str = (LPCSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData : lstrlenA(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = tag; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + memcpy(pbEncoded, str, encodedLen); + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeBMPString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, strLen; + + strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(strLen * 2, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + strLen * 2; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_BMPSTRING; + CRYPT_EncodeLen(strLen * 2, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < strLen; i++) + { + *pbEncoded++ = (str[i] & 0xff00) >> 8; + *pbEncoded++ = str[i] & 0x00ff; + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeUTF8String(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen, strLen; + + strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + encodedLen = WideCharToMultiByte(CP_UTF8, 0, str, strLen, NULL, 0, NULL, + NULL); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_UTF8STRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + WideCharToMultiByte(CP_UTF8, 0, str, strLen, (LPSTR)pbEncoded, + bytesNeeded - lenBytes - 1, NULL, NULL); + } + } + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -918,65 +1019,355 @@ __TRY { - BYTE tag; - DWORD bytesNeeded, lenBytes, encodedLen; const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; switch (value->dwValueType) { - case CERT_RDN_NUMERIC_STRING: - tag = ASN_NUMERICSTRING; - encodedLen = value->Value.cbData; - break; - case CERT_RDN_PRINTABLE_STRING: - tag = ASN_PRINTABLESTRING; - encodedLen = value->Value.cbData; - break; - case CERT_RDN_T61_STRING: - tag = ASN_T61STRING; - encodedLen = value->Value.cbData; - break; - case CERT_RDN_IA5_STRING: - tag = ASN_IA5STRING; - encodedLen = value->Value.cbData; - break; case CERT_RDN_ANY_TYPE: /* explicitly disallowed */ SetLastError(E_INVALIDARG); - return FALSE; + ret = FALSE; + break; + case CERT_RDN_ENCODED_BLOB: + ret = CRYPT_CopyEncodedBlob(dwCertEncodingType, NULL, + &value->Value, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_OCTET_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_OCTETSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_NUMERIC_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_NUMERICSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_PRINTABLE_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_PRINTABLESTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_TELETEX_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_T61STRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VIDEOTEX_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, + ASN_VIDEOTEXSTRING, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_IA5_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_IA5STRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_GRAPHIC_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_GRAPHICSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VISIBLE_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_VISIBLESTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_GENERAL_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_GENERALSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_UNIVERSAL_STRING: + FIXME("CERT_RDN_UNIVERSAL_STRING: unimplemented\n"); + SetLastError(CRYPT_E_ASN1_CHOICE); + ret = FALSE; + break; + case CERT_RDN_BMP_STRING: + ret = CRYPT_AsnEncodeBMPString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_UTF8_STRING: + ret = CRYPT_AsnEncodeUTF8String(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; default: - FIXME("String type %ld unimplemented\n", value->dwValueType); - return FALSE; - } - CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + encodedLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else - { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) - { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = tag; - CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - switch (value->dwValueType) - { - case CERT_RDN_NUMERIC_STRING: - case CERT_RDN_PRINTABLE_STRING: - case CERT_RDN_T61_STRING: - case CERT_RDN_IA5_STRING: - memcpy(pbEncoded, value->Value.pbData, value->Value.cbData); - } - } + SetLastError(CRYPT_E_ASN1_CHOICE); + ret = FALSE; } } __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, + BYTE tag, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = tag; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < encodedLen; i++) + *pbEncoded++ = (BYTE)str[i]; + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_NUMERICSTRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < encodedLen; i++) + { + if (isdigitW(str[i])) + *pbEncoded++ = (BYTE)str[i]; + else + { + *pcbEncoded = i; + SetLastError(CRYPT_E_INVALID_NUMERIC_STRING); + ret = FALSE; + } + } + } + } + return ret; +} + +static inline int isprintableW(WCHAR wc) +{ + return isalnumW(wc) || isspaceW(wc) || wc == '\'' || wc == '(' || + wc == ')' || wc == '+' || wc == ',' || wc == '-' || wc == '.' || + wc == '/' || wc == ':' || wc == '=' || wc == '?'; +} + +static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_PRINTABLESTRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < encodedLen; i++) + { + if (isprintableW(str[i])) + *pbEncoded++ = (BYTE)str[i]; + else + { + *pcbEncoded = i; + SetLastError(CRYPT_E_INVALID_PRINTABLE_STRING); + ret = FALSE; + } + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_IA5STRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < encodedLen; i++) + { + if (str[i] <= 0x7f) + *pbEncoded++ = (BYTE)str[i]; + else + { + *pcbEncoded = i; + SetLastError(CRYPT_E_INVALID_IA5_STRING); + ret = FALSE; + } + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeUniversalString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, strLen; + + /* FIXME: doesn't handle composite characters */ + strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(strLen * 4, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + strLen * 4; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_UNIVERSALSTRING; + CRYPT_EncodeLen(strLen * 4, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < strLen; i++) + { + *pbEncoded++ = 0; + *pbEncoded++ = 0; + *pbEncoded++ = (BYTE)((str[i] & 0xff00) >> 8); + *pbEncoded++ = (BYTE)(str[i] & 0x00ff); + } + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeUnicodeNameValue(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; + + switch (value->dwValueType) + { + case CERT_RDN_ANY_TYPE: + case CERT_RDN_ENCODED_BLOB: + case CERT_RDN_OCTET_STRING: + SetLastError(CRYPT_E_NOT_CHAR_STRING); + break; + case CERT_RDN_NUMERIC_STRING: + ret = CRYPT_AsnEncodeNumericString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_PRINTABLE_STRING: + ret = CRYPT_AsnEncodePrintableString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_TELETEX_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_T61STRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VIDEOTEX_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, + ASN_VIDEOTEXSTRING, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_IA5_STRING: + ret = CRYPT_AsnEncodeIA5String(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_GRAPHIC_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_GRAPHICSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VISIBLE_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_VISIBLESTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_GENERAL_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_GENERALSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_UNIVERSAL_STRING: + ret = CRYPT_AsnEncodeUniversalString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_BMP_STRING: + ret = CRYPT_AsnEncodeBMPString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_UTF8_STRING: + ret = CRYPT_AsnEncodeUTF8String(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + default: + SetLastError(CRYPT_E_ASN1_CHOICE); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); } __ENDTRY return ret; @@ -2395,6 +2786,9 @@ break; case (WORD)RSA_CSP_PUBLICKEYBLOB: encodeFunc = CRYPT_AsnEncodeRsaPubKey; + break; + case (WORD)X509_UNICODE_NAME_VALUE: + encodeFunc = CRYPT_AsnEncodeUnicodeNameValue; break; case (WORD)X509_OCTET_STRING: encodeFunc = CRYPT_AsnEncodeOctets; Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/serializ… ============================================================================== --- trunk/reactos/dll/win32/crypt32/serialize.c (original) +++ trunk/reactos/dll/win32/crypt32/serialize.c Fri Jul 21 15:13:18 2006 @@ -363,6 +363,16 @@ ret = contextInterface->setProp(context, hdr->propID, 0, pbElement); break; + case CERT_KEY_PROV_INFO_PROP_ID: + { + PCRYPT_KEY_PROV_INFO info = + (PCRYPT_KEY_PROV_INFO)pbElement; + + CRYPT_FixKeyProvInfoPointers(info); + ret = contextInterface->setProp(context, + hdr->propID, 0, pbElement); + break; + } default: FIXME("prop ID %ld: stub\n", hdr->propID); } 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 (original) +++ trunk/reactos/dll/win32/crypt32/store.c Fri Jul 21 15:13:18 2006 @@ -1723,6 +1723,54 @@ return ret; } +static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + FIXME("(%ld, %08lx, %s): stub\n", hCryptProv, dwFlags, + debugstr_w((LPCWSTR)pvPara)); + return NULL; +} + +static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + int len; + PWINECRYPT_CERTSTORE ret = NULL; + + TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags, + debugstr_a((LPCSTR)pvPara)); + + if (!pvPara) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return NULL; + } + len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0); + if (len) + { + LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR)); + + if (storeName) + { + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len); + ret = CRYPT_FileNameOpenStoreW(hCryptProv, dwFlags, storeName); + CryptMemFree(storeName); + } + } + return ret; +} + +static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + FIXME("(%ld, %08lx, %p): stub\n", hCryptProv, dwFlags, pvPara); + else + FIXME("(%ld, %08lx, %s): stub\n", hCryptProv, dwFlags, + debugstr_w((LPCWSTR)pvPara)); + return NULL; +} + HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingType, HCRYPTPROV hCryptProv, DWORD dwFlags, const void* pvPara) @@ -1742,6 +1790,12 @@ break; case (int)CERT_STORE_PROV_REG: openFunc = CRYPT_RegOpenStore; + break; + case (int)CERT_STORE_PROV_FILENAME_A: + openFunc = CRYPT_FileNameOpenStoreA; + break; + case (int)CERT_STORE_PROV_FILENAME_W: + openFunc = CRYPT_FileNameOpenStoreW; break; case (int)CERT_STORE_PROV_COLLECTION: openFunc = CRYPT_CollectionOpenStore; @@ -1757,6 +1811,9 @@ break; case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_W: openFunc = CRYPT_SysRegOpenStoreW; + break; + case (int)CERT_STORE_PROV_PHYSICAL_W: + openFunc = CRYPT_PhysOpenStoreW; break; default: if (LOWORD(lpszStoreProvider)) 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 (original) +++ trunk/reactos/dll/win32/crypt32/str.c Fri Jul 21 15:13:18 2006 @@ -62,6 +62,7 @@ } else ret++; + TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -106,7 +107,33 @@ } else ret++; + TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); return ret; +} + +/* Adds the prefix prefix to the string pointed to by psz, followed by the + * character '='. Copies no more than csz characters. Returns the number of + * characters copied. If psz is NULL, returns the number of characters that + * would be copied. + */ +static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) +{ + DWORD chars; + + TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); + + if (psz) + { + chars = min(lstrlenA(prefix), csz); + memcpy(psz, prefix, chars); + csz -= chars; + *(psz + chars) = '='; + chars++; + csz--; + } + else + chars = lstrlenA(prefix) + 1; + return chars; } DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, @@ -147,36 +174,45 @@ else rdnSep = plusSep; rdnSepLen = strlen(rdnSep); - for (i = 0; ret < csz && i < info->cRDN; i++) - { - for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) + for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) + { + for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; + char prefixBuf[10]; /* big enough for GivenName */ + LPCSTR prefix = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) + prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) + { + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( + CRYPT_OID_INFO_OID_KEY, + info->rgRDN[i].rgRDNAttr[j].pszObjId, + CRYPT_RDN_ATTR_OID_GROUP_ID); + + if (oidInfo) + { + WideCharToMultiByte(CP_ACP, 0, oidInfo->pwszName, -1, + prefixBuf, sizeof(prefixBuf), NULL, NULL); + prefix = prefixBuf; + } + else + prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + } + if (prefix) { /* - 1 is needed to account for the NULL terminator. */ - chars = min( - lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId), - csz - ret - 1); - if (psz && chars) - memcpy(psz + ret, info->rgRDN[i].rgRDNAttr[j].pszObjId, - chars); + chars = CRYPT_AddPrefixA(prefix, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + ret) = '='; - ret++; - csz--; - } } /* FIXME: handle quoting */ chars = CertRDNValueToStrA( info->rgRDN[i].rgRDNAttr[j].dwValueType, &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, - csz - ret - 1); + psz ? csz - ret : 0); if (chars) ret += chars - 1; if (j < info->rgRDN[i].cRDNAttr - 1) @@ -203,7 +239,62 @@ } else ret++; + TRACE("Returning %s\n", debugstr_a(psz)); return ret; +} + +/* Adds the prefix prefix to the wide-character string pointed to by psz, + * followed by the character '='. Copies no more than csz characters. Returns + * the number of characters copied. If psz is NULL, returns the number of + * characters that would be copied. + * Assumes the characters in prefix are ASCII (not multibyte characters.) + */ +static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) +{ + DWORD chars; + + TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); + + if (psz) + { + DWORD i; + + chars = min(lstrlenA(prefix), csz); + for (i = 0; i < chars; i++) + *(psz + i) = prefix[i]; + csz -= chars; + *(psz + chars) = '='; + chars++; + csz--; + } + else + chars = lstrlenA(prefix) + 1; + return chars; +} + +/* Adds the prefix prefix to the string pointed to by psz, followed by the + * character '='. Copies no more than csz characters. Returns the number of + * characters copied. If psz is NULL, returns the number of characters that + * would be copied. + */ +static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) +{ + DWORD chars; + + TRACE("(%s, %p, %ld)\n", debugstr_w(prefix), psz, csz); + + if (psz) + { + chars = min(lstrlenW(prefix), csz); + memcpy(psz, prefix, chars * sizeof(WCHAR)); + csz -= chars; + *(psz + chars) = '='; + chars++; + csz--; + } + else + chars = lstrlenW(prefix) + 1; + return chars; } DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, @@ -244,41 +335,49 @@ else rdnSep = plusSep; rdnSepLen = lstrlenW(rdnSep); - for (i = 0; ret < csz && i < info->cRDN; i++) - { - for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) + for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) + { + for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; + LPCSTR prefixA = NULL; + LPCWSTR prefixW = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) + prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) + { + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( + CRYPT_OID_INFO_OID_KEY, + info->rgRDN[i].rgRDNAttr[j].pszObjId, + CRYPT_RDN_ATTR_OID_GROUP_ID); + + if (oidInfo) + prefixW = oidInfo->pwszName; + else + prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + } + if (prefixW) { /* - 1 is needed to account for the NULL terminator. */ - chars = min( - lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId), - csz - ret - 1); - if (psz && chars) - { - DWORD k; - - for (k = 0; k < chars; k++) - *(psz + ret + k) = - info->rgRDN[i].rgRDNAttr[j].pszObjId[k]; - } + chars = CRYPT_AddPrefixW(prefixW, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + ret) = '='; - ret++; - csz--; - } + } + else if (prefixA) + { + /* - 1 is needed to account for the NULL terminator. */ + chars = CRYPT_AddPrefixAToW(prefixA, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); + ret += chars; + csz -= chars; } /* FIXME: handle quoting */ chars = CertRDNValueToStrW( info->rgRDN[i].rgRDNAttr[j].dwValueType, &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, - csz - ret - 1); + psz ? csz - ret : 0); if (chars) ret += chars - 1; if (j < info->rgRDN[i].cRDNAttr - 1) @@ -305,6 +404,7 @@ } else ret++; + TRACE("Returning %s\n", debugstr_w(psz)); return ret; }

18 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006