Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gvg] 20116: Import oleacc from Wine. oleacc.xml provided by Christoph von Wittich
by gvg＠svn.reactos.com 12 Dec '05

12 Dec '05

Import oleacc from Wine. oleacc.xml provided by Christoph von Wittich Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/lib/oleacc/ Deleted: trunk/reactos/lib/oleacc/Makefile.in Added: trunk/reactos/lib/oleacc/oleacc.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-12-12 20:39:52 UTC (rev 20115) +++ trunk/reactos/baseaddress.xml 2005-12-12 20:41:27 UTC (rev 20116) @@ -22,6 +22,7 @@ <property name="BASEADDRESS_HID" value="0x688F0000" /> <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> +<property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-12-12 20:39:52 UTC (rev 20115) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-12-12 20:41:27 UTC (rev 20116) @@ -137,6 +137,7 @@ lib\ntmarta\ntmarta.dll 1 lib\objsel\objsel.dll 1 lib\ole32\ole32.dll 1 +lib\oleacc\oleacc.dll 1 lib\oleaut32\oleaut32.dll 1 lib\oledlg\oledlg.dll 1 lib\olepro32\olepro32.dll 1 _____ Copied: trunk/reactos/lib/oleacc (from rev 20113, vendor/wine/dlls/oleacc/current) Property changes on: trunk/reactos/lib/oleacc ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Deleted: trunk/reactos/lib/oleacc/Makefile.in --- vendor/wine/dlls/oleacc/current/Makefile.in 2005-12-12 20:26:19 UTC (rev 20113) +++ trunk/reactos/lib/oleacc/Makefile.in 2005-12-12 20:41:27 UTC (rev 20116) @@ -1,14 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = oleacc.dll -IMPORTLIB = liboleacc.$(IMPLIBEXT) -IMPORTS = kernel32 - -C_SRCS = \ - main.c - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Added: trunk/reactos/lib/oleacc/oleacc.xml --- vendor/wine/dlls/oleacc/current/oleacc.xml 2005-12-12 20:26:19 UTC (rev 20113) +++ trunk/reactos/lib/oleacc/oleacc.xml 2005-12-12 20:41:27 UTC (rev 20116) @@ -0,0 +1,12 @@ +<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll"> + <importlibrary definition="oleacc.spec.def" /> + <include base="oleacc">.</include> + <include base="ReactOS">include/wine</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>wine</library> + <file>main.c</file> + <file>oleacc.spec</file> +</module> Property changes on: trunk/reactos/lib/oleacc/oleacc.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[frik85] 20115: RosCMS update:
by frik85＠svn.reactos.com 12 Dec '05

12 Dec '05

RosCMS update: * content edit interface: content type bug fixed * login function: add a link to the "too many sessions" error message -> this link allow user to delete their old sessions (and reset their password) * website status page: fix the language detection routine Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-12 20:30:09 UTC (rev 20114) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-12 20:39:52 UTC (rev 20115) @@ -405,7 +405,7 @@ `content_visible` = '". mysql_escape_string($content_vis) ."', `content_active` = '". mysql_escape_string($content_act) ."', `content_description` = '". mysql_escape_string($content_description) ."', - `content_type` = '". mysql_escape_string($content_description) ."' + `content_type` = '". mysql_escape_string($content_typea) ."' WHERE `content_id` = '$rpm_db_id' LIMIT 1 ;"; //`content_active` = '1', //`content_usrname_id` = '$roscms_intern_account_id', _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php --- trunk/web/reactos.org/htdocs/roscms/inc/login.php 2005-12-12 20:30:09 UTC (rev 20114) +++ trunk/web/reactos.org/htdocs/roscms/inc/login.php 2005-12-12 20:39:52 UTC (rev 20115) @@ -93,7 +93,7 @@ $roscms_intern_timeout_option = $result_usr['user_setting_timeout']; } else { // only hacker/cracker/script kiddy/brute force script/bot/etc. is able to reach this part - die("<blink>No valid user session found!<br><br>You are a hacker/cracker/script kiddy/brute force script/bot/etc.<br><br>RosCMS does not like you, anymore! Your ip address, etc. has been saved and you are on the watch list!</blink>"); + die("<blink>No valid user session found!</blink><p><a href='http://www.reactos.org/roscms/?page=getpwd'>Delete all old sessions and login again!</a> (this function will also allow you to set a new password)</p>"); // TODO: add it to the watchlist! } _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php --- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-12 20:30:09 UTC (rev 20114) +++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-12 20:39:52 UTC (rev 20115) @@ -214,7 +214,7 @@ $query_lang_page_name_trans = mysql_query("SELECT * FROM `pages` WHERE `page_name` = '". $result_page['content_name'] ."' - AND (`page_language` = 'all' OR `page_language` = 'en') + AND (`page_language` = 'all' OR `page_language` = 'en' OR `page_language` = '". $result_page['content_lang'] ."') AND `page_active` = 1 AND `page_visible` = 1 ;") ; $result_lang_page_name_trans = mysql_fetch_array($query_lang_page_name_trans); @@ -238,10 +238,10 @@ ?></font></td> <td valign="middle" bgcolor="<?php echo $color; ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"><?php if ($link_current_line == "true") { - echo '<a href="../?page='.$result_page['content_name'].'&lang=en">done</a>'; + echo '<a href="../?page='.$result_page['content_name'].'&lang=en">'. $result_page['content_date'] .'</a>'; } else { - echo "done"; + echo $result_page['content_date']; } ?></font></div></td> <?php @@ -263,13 +263,12 @@ $result_count_lang_item = mysql_fetch_row($query_count_lang_item); if ($result_count_lang_item[0] != "0" && $result_count_lang_item[0] != "") { if ($link_current_line == "true") { - echo '<a href="../?page='.$result_page['content_name'].'&lang='.$result_lang_ name['lang_id'].'">done</a>'; + echo '<a href="../?page='.$result_page['content_name'].'&lang='.$result_lang_ name['lang_id'].'">'. $result_page['content_date'] .'</a>'; } else { - echo "done"; + echo $result_page['content_date']; } } - ?></font></div></td> <?php }

1 0

[navaraf] 20114: Check for failed allocations. Spotted by Martin Bealby.
by navaraf＠svn.reactos.com 12 Dec '05

12 Dec '05

Check for failed allocations. Spotted by Martin Bealby. Modified: trunk/reactos/lib/user32/windows/icon.c _____ Modified: trunk/reactos/lib/user32/windows/icon.c --- trunk/reactos/lib/user32/windows/icon.c 2005-12-12 20:26:19 UTC (rev 20113) +++ trunk/reactos/lib/user32/windows/icon.c 2005-12-12 20:30:09 UTC (rev 20114) @@ -260,6 +260,10 @@ /* get an safe copy of the icon data */ SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, cbIconBits); + if (SafeIconImage == NULL) + { + return NULL; + } memcpy(SafeIconImage, pbIconBits, cbIconBits); /* take into acount the origonal height was for both the AND and XOR images */

1 0

[gvg] 20113: Wine-0_9_3 vendor drop
by gvg＠svn.reactos.com 12 Dec '05

12 Dec '05

Wine-0_9_3 vendor drop Modified: vendor/wine/dlls/commdlg/current/cdlg_Bg.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Ca.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Cn.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Cs.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Da.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_De.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Es.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Fi.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Fr.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Hu.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_It.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Ja.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Nl.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_No.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pl.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pt.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Ru.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Si.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Sk.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Sv.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Uk.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Wa.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Zh.rc Modified: vendor/wine/dlls/commdlg/current/printdlg.c Modified: vendor/wine/dlls/crypt32/current/Makefile.in Modified: vendor/wine/dlls/crypt32/current/cert.c Modified: vendor/wine/dlls/crypt32/current/crypt32.spec Modified: vendor/wine/dlls/crypt32/current/crypt32_private.h Modified: vendor/wine/dlls/crypt32/current/encode.c Modified: vendor/wine/dlls/crypt32/current/main.c Added: vendor/wine/dlls/crypt32/current/oid.c Modified: vendor/wine/dlls/dinput/current/device.c Modified: vendor/wine/dlls/dplayx/current/dplayx_messages.c Added: vendor/wine/dlls/imm32/ Added: vendor/wine/dlls/imm32/current/ Added: vendor/wine/dlls/imm32/current/Makefile.in Added: vendor/wine/dlls/imm32/current/imm.c Added: vendor/wine/dlls/imm32/current/imm.spec Added: vendor/wine/dlls/imm32/current/imm32.spec Modified: vendor/wine/dlls/midimap/current/midimap.c Modified: vendor/wine/dlls/msi/current/dialog.c Modified: vendor/wine/dlls/msi/current/helpers.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.spec Modified: vendor/wine/dlls/msi/current/registry.c Modified: vendor/wine/dlls/netapi32/current/Makefile.in Modified: vendor/wine/dlls/netapi32/current/browsr.c Added: vendor/wine/dlls/netapi32/current/ds.c Modified: vendor/wine/dlls/netapi32/current/netapi32.c Modified: vendor/wine/dlls/netapi32/current/netapi32.spec Modified: vendor/wine/dlls/netapi32/current/wksta.c Modified: vendor/wine/dlls/ole32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/ole32.spec Modified: vendor/wine/dlls/ole32/current/ole32res.rc Modified: vendor/wine/dlls/ole32/current/oleobj.c Modified: vendor/wine/dlls/ole32/current/rpc.c Added: vendor/wine/dlls/ole32/current/usrmarshal.c Added: vendor/wine/dlls/oleacc/ Added: vendor/wine/dlls/oleacc/current/ Added: vendor/wine/dlls/oleacc/current/Makefile.in Added: vendor/wine/dlls/oleacc/current/main.c Added: vendor/wine/dlls/oleacc/current/oleacc.spec Modified: vendor/wine/dlls/oleaut32/current/tmarshal.c Modified: vendor/wine/dlls/oleaut32/current/typelib.c Modified: vendor/wine/dlls/oleaut32/current/typelib.h Modified: vendor/wine/dlls/oleaut32/current/vartype.c Modified: vendor/wine/dlls/riched20/current/editor.c Modified: vendor/wine/dlls/rpcrt4/current/cpsf.c Modified: vendor/wine/dlls/rpcrt4/current/cpsf.h Modified: vendor/wine/dlls/rpcrt4/current/cstub.c Modified: vendor/wine/dlls/rpcrt4/current/ndr_marshall.c Modified: vendor/wine/dlls/rpcrt4/current/ndr_midl.c Modified: vendor/wine/dlls/rpcrt4/current/ndr_misc.h Modified: vendor/wine/dlls/rpcrt4/current/ndr_ole.c Modified: vendor/wine/dlls/rpcrt4/current/rpc_server.c Modified: vendor/wine/dlls/rpcrt4/current/rpcss_np_client.c Modified: vendor/wine/dlls/shdocvw/current/Makefile.in Modified: vendor/wine/dlls/shdocvw/current/client.c Modified: vendor/wine/dlls/shdocvw/current/dochost.c Modified: vendor/wine/dlls/shdocvw/current/events.c Added: vendor/wine/dlls/shdocvw/current/frame.c Modified: vendor/wine/dlls/shdocvw/current/oleobject.c Modified: vendor/wine/dlls/shdocvw/current/shdocvw.h Modified: vendor/wine/dlls/shdocvw/current/webbrowser.c Modified: vendor/wine/dlls/shell32/current/iconcache.c Modified: vendor/wine/dlls/shell32/current/shell32_main.h Modified: vendor/wine/dlls/shell32/current/shellpath.c Modified: vendor/wine/dlls/shell32/current/shfldr_desktop.c Modified: vendor/wine/dlls/shell32/current/shfldr_unixfs.c Modified: vendor/wine/dlls/shell32/current/shlexec.c Modified: vendor/wine/dlls/shell32/current/shlfolder.c Modified: vendor/wine/dlls/shell32/current/shlview.c Modified: vendor/wine/tools/winebuild/current/relay.c Modified: vendor/wine/tools/winebuild/current/spec16.c Modified: vendor/wine/tools/winebuild/current/utils.c _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Bg.rc --- vendor/wine/dlls/commdlg/current/cdlg_Bg.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Bg.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -143,7 +143,7 @@ GROUPBOX "¤ÞýÕ",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "&?þß¾ÛÓ:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -406,9 +406,9 @@ PD32_OUT_OF_MEMORY "?Õõ¯±?ÞÒ ÝÓ ´ÓýÕ?." PD32_GENERIC_ERROR "¤¯ ÔÞ ±Õ ÒÕ°ÛÓ." PD32_DRIVER_UNKNOWN "?Õ´¯þÝÓ? õÓÚÔÕ þÓ ´ÞÝ?Õ Ó." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "¤ÕõÞ õÓ ý¯µÕ?Õ õÓ ÞþÔ·° ÔÓ?Õ ¯´ÓÕ÷ÞÞ, \ +±Ô·þÓÝÞ ± ´Õ¸Ó? ÛÓ?¯ ÝÓ±?¯ÚÛÓ ÝÓ ±?ÓÝÞ÷Ó?Ó ÞÙÞ Óþ´Õ¸Ó?ÔÓÝÕ ÝÓ õ¯Û¾ýÕÝ?, \ +±Óý¯ ÓÛ¯ ÞýÓ?Õ ÞÝ±?ÓÙÞÓÝ ´ÞÝ?Õ. ?Ý±?ÓÙÞÓÚ?Õ ´ÞÝ?Õ Þ ¯´Þ?ÓÚ?Õ ¯?Ý¯ Ô¯." PD32_DEFAULT_PRINTER "¤ÞÝ?Õ ´¯ ´¯õÓþßÞÓÝÕ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "?ýÓ %d õ¯Û¾ýÕÝ?Ó Ô ¯´Ó°ÛÓ?Ó" _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Ca.rc --- vendor/wine/dlls/commdlg/current/cdlg_Ca.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Ca.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Cn.rc --- vendor/wine/dlls/commdlg/current/cdlg_Cn.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Cn.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "?¥?²",grp2,98,72,120,36,WS_GROUP CTEXT "Íð??ÎÍ?ÕAaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Cs.rc --- vendor/wine/dlls/commdlg/current/cdlg_Cs.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Cs.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -143,7 +143,7 @@ GROUPBOX "Ukßzka",grp2,98,72,120,36,WS_GROUP CTEXT "P°Ýli? ¥lu?ouÞk² k¨? ·pýl ´ßbelskÚ ¾dy",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Da.rc --- vendor/wine/dlls/commdlg/current/cdlg_Da.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Da.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "Eksempel",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_De.rc --- vendor/wine/dlls/commdlg/current/cdlg_De.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_De.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -173,7 +173,7 @@ GROUPBOX "Muster",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc --- vendor/wine/dlls/commdlg/current/cdlg_En.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_En.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -507,7 +507,7 @@ GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Es.rc --- vendor/wine/dlls/commdlg/current/cdlg_Es.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Es.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -143,7 +143,7 @@ GROUPBOX "Ejemplo",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZzÐ±",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Codificaci¾n:",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Fi.rc --- vendor/wine/dlls/commdlg/current/cdlg_Fi.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Fi.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -143,7 +143,7 @@ GROUPBOX "Nõyte",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Fr.rc --- vendor/wine/dlls/commdlg/current/cdlg_Fr.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Fr.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -146,7 +146,7 @@ GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Hu.rc --- vendor/wine/dlls/commdlg/current/cdlg_Hu.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Hu.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -141,7 +141,7 @@ GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz?ßi§?Ú",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_It.rc --- vendor/wine/dlls/commdlg/current/cdlg_It.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_It.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -143,7 +143,7 @@ GROUPBOX "Esempio",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Ja.rc --- vendor/wine/dlls/commdlg/current/cdlg_Ja.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Ja.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "âTâôâvâï",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Nl.rc --- vendor/wine/dlls/commdlg/current/cdlg_Nl.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Nl.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "Voorbeeld",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Schr&ift:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_No.rc --- vendor/wine/dlls/commdlg/current/cdlg_No.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_No.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "ForhÕndsvisning",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -401,9 +401,9 @@ PD32_OUT_OF_MEMORY "Ikke mer minne." PD32_GENERIC_ERROR "En feil har oppstÕtt." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Du mÕ installere en skriver f°r du \ + kan gj°re skriver-relaterte oppgaver som Õ endre \ sideoppsettet og skrive ut et dokument. \ + Installer en og pr°v pÕ nytt." PD32_DEFAULT_PRINTER "Standardskriver; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det er %d dokumenter i k°en" _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Pl.rc --- vendor/wine/dlls/commdlg/current/cdlg_Pl.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Pl.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -144,7 +144,7 @@ GROUPBOX "Przyk?ad",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ypt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Pt.rc --- vendor/wine/dlls/commdlg/current/cdlg_Pt.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Pt.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -143,7 +143,7 @@ GROUPBOX "Exemplo",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Ru.rc --- vendor/wine/dlls/commdlg/current/cdlg_Ru.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Ru.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "?ßÓþÕ÷",grp2,98,72,120,36,WS_GROUP CTEXT "?Ó?ßAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Si.rc --- vendor/wine/dlls/commdlg/current/cdlg_Si.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Si.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "Vzorec",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Sk.rc --- vendor/wine/dlls/commdlg/current/cdlg_Sk.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Sk.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -144,7 +144,7 @@ GROUPBOX "Vzorka",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Sv.rc --- vendor/wine/dlls/commdlg/current/cdlg_Sv.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Sv.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -140,7 +140,7 @@ GROUPBOX "Test",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Uk.rc --- vendor/wine/dlls/commdlg/current/cdlg_Uk.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Uk.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -142,7 +142,7 @@ GROUPBOX "&ÃÓþ¯Û",grp2,98,72,120,36,WS_GROUP CTEXT "?Ó?ßAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "ÐÛÞ´?:",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Wa.rc --- vendor/wine/dlls/commdlg/current/cdlg_Wa.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Wa.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -147,7 +147,7 @@ GROUPBOX "Egzimpe",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz?ÕÃþ?¹",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Zh.rc --- vendor/wine/dlls/commdlg/current/cdlg_Zh.rc 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/cdlg_Zh.rc 2005-12-12 20:26:19 UTC (rev 20113) @@ -93,7 +93,7 @@ GROUPBOX "?á?²",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/printdlg.c --- vendor/wine/dlls/commdlg/current/printdlg.c 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/commdlg/current/printdlg.c 2005-12-12 20:26:19 UTC (rev 20113) @@ -2096,14 +2096,6 @@ lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, lpdm->dmSize + lpdm->dmDriverExtra); } else { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) { - WARN("hDevMode has %d locks on it. Unlocking it now\n", locks); - while(locks--) { - GlobalUnlock(lppd->hDevMode); - TRACE("Now got %d locks\n", locks); - } - } lppd->hDevMode = GlobalReAlloc(lppd->hDevMode, lpdm->dmSize + lpdm->dmDriverExtra, GMEM_MOVEABLE); @@ -2111,14 +2103,6 @@ lpdmReturn = GlobalLock(lppd->hDevMode); memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra); - if (lppd->hDevNames != 0) { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) { - WARN("hDevNames has %d locks on it. Unlocking it now\n", locks); - while(locks--) - GlobalUnlock(lppd->hDevNames); - } - } PRINTDLG_CreateDevNames(&(lppd->hDevNames), di->pDriverPath, pi->pPrinterName, _____ Modified: vendor/wine/dlls/crypt32/current/Makefile.in --- vendor/wine/dlls/crypt32/current/Makefile.in 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/crypt32/current/Makefile.in 2005-12-12 20:26:19 UTC (rev 20113) @@ -10,6 +10,7 @@ C_SRCS = \ cert.c \ encode.c \ + oid.c \ protectdata.c \ main.c _____ Modified: vendor/wine/dlls/crypt32/current/cert.c --- vendor/wine/dlls/crypt32/current/cert.c 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/crypt32/current/cert.c 2005-12-12 20:26:19 UTC (rev 20113) @@ -3285,15 +3285,12 @@ return ret; } -HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, DWORD dwFlags) +BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara, + DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, + BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) { - FIXME("stub: %s %lx\n", debugstr_a(pszFuncName), dwFlags); - return NULL; -} - -BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, - LPCSTR pszFuncName, LPCWSTR pwszDll) -{ - FIXME("stub: %lx %s %s\n", dwEncodingType, debugstr_a(pszFuncName), debugstr_w(pwszDll)); + FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n", + pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, + pbDecoded, pcbDecoded, ppSignerCert); return FALSE; } _____ Modified: vendor/wine/dlls/crypt32/current/crypt32.spec --- vendor/wine/dlls/crypt32/current/crypt32.spec 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/crypt32/current/crypt32.spec 2005-12-12 20:26:19 UTC (rev 20113) @@ -102,13 +102,13 @@ @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr) @ stub CryptFindOIDInfo @ stub CryptFormatObject -@ stub CryptFreeOIDFunctionAddress +@ stdcall CryptFreeOIDFunctionAddress(long long) @ stub CryptGetAsyncParam -@ stub CryptGetDefaultOIDDllList -@ stub CryptGetDefaultOIDFunctionAddress +@ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) +@ stdcall CryptGetDefaultOIDFunctionAddress(long long wstr long ptr ptr) @ stub CryptGetMessageCertificates @ stub CryptGetMessageSignerCount -@ stub CryptGetOIDFunctionAddress +@ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) @ stub CryptHashMessage @@ -118,7 +118,7 @@ @ stdcall CryptImportPublicKeyInfo(long long ptr ptr) @ stdcall CryptImportPublicKeyInfoEx(long long ptr long long ptr ptr) @ stdcall CryptInitOIDFunctionSet(str long) -@ stub CryptInstallOIDFunctionAddress +@ stdcall CryptInstallOIDFunctionAddress(ptr long str long ptr long) @ stub CryptLoadSip @ stdcall CryptMemAlloc(long) @ stdcall CryptMemFree(ptr) @@ -162,16 +162,16 @@ @ stub CryptVerifyDetachedMessageHash @ stub CryptVerifyDetachedMessageSignature @ stub CryptVerifyMessageHash -@ stub CryptVerifyMessageSignature +@ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) @ stub CryptVerifyMessageSignatureWithKey @ stub CryptVerifySignatureU @ stdcall I_CryptAllocTls() -@ stdcall I_CryptCreateLruCache(long long) +@ stdcall I_CryptCreateLruCache(ptr ptr) @ stub I_CryptCreateLruEntry @ stdcall I_CryptDetachTls(long) -@ stdcall I_CryptFindLruEntryData(long) -@ stdcall I_CryptFlushLruCache(long) -@ stdcall I_CryptFreeLruCache(long) +@ stdcall I_CryptFindLruEntryData(long long long) +@ stdcall I_CryptFlushLruCache(ptr long long) +@ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) @ stub I_CryptGetDefaultCryptProv @ stub I_CryptGetDefaultCryptProvForEncrypt _____ Modified: vendor/wine/dlls/crypt32/current/crypt32_private.h --- vendor/wine/dlls/crypt32/current/crypt32_private.h 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/crypt32/current/crypt32_private.h 2005-12-12 20:26:19 UTC (rev 20113) @@ -24,4 +24,7 @@ */ HCRYPTPROV CRYPT_GetDefaultProvider(void); +void CRYPT_InitFunctionSets(void); +void CRYPT_FreeFunctionSets(void); + #endif _____ Modified: vendor/wine/dlls/crypt32/current/encode.c --- vendor/wine/dlls/crypt32/current/encode.c 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/crypt32/current/encode.c 2005-12-12 20:26:19 UTC (rev 20113) @@ -1,5 +1,4 @@ /* - * Copyright 2002 Mike McCormack for CodeWeavers * Copyright 2005 Juan Lang * * This library is free software; you can redistribute it and/or @@ -67,8 +66,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); -static const WCHAR szDllName[] = { 'D','l','l',0 }; - typedef BOOL (WINAPI *CryptEncodeObjectFunc)(DWORD, LPCSTR, const void *, BYTE *, DWORD *); typedef BOOL (WINAPI *CryptEncodeObjectExFunc)(DWORD, LPCSTR, const void *, @@ -182,260 +179,12 @@ return EXCEPTION_CONTINUE_SEARCH; } -static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID) -{ - static const char szEncodingTypeFmt[] = - "Software\\Microsoft\\Cryptography\\OID\\EncodingType %ld\\%s\\%s"; - UINT len; - char numericOID[7]; /* enough for "#65535" */ - const char *oid; - LPSTR szKey; - - /* MSDN says the encoding type is a mask, but it isn't treated that way. - * (E.g., if dwEncodingType were 3, the key names "EncodingType 1" and - * "EncodingType 2" would be expected if it were a mask. Instead native - * stores values in "EncodingType 3". - */ - if (!HIWORD(pszOID)) - { - snprintf(numericOID, sizeof(numericOID), "#%d", LOWORD(pszOID)); - oid = numericOID; - } - else - oid = pszOID; - - /* This is enough: the lengths of the two string parameters are explicitly - * counted, and we need up to five additional characters for the encoding - * type. These are covered by the "%d", "%s", and "%s" characters in the - * format specifier that are removed by sprintf. - */ - len = sizeof(szEncodingTypeFmt) + lstrlenA(pszFuncName) + lstrlenA(oid); - szKey = CryptMemAlloc(len); - if (szKey) - sprintf(szKey, szEncodingTypeFmt, dwEncodingType, pszFuncName, oid); - return szKey; -} - -BOOL WINAPI CryptRegisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID, LPCWSTR pwszDll, LPCSTR pszOverrideFuncName) -{ - LONG r; - HKEY hKey; - LPSTR szKey; - - TRACE("%lx %s %s %s %s\n", dwEncodingType, pszFuncName, pszOID, - debugstr_w(pwszDll), pszOverrideFuncName); - - /* This only registers functions for encoding certs, not messages */ - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - /* Native does nothing pwszDll is NULL */ - if (!pwszDll) - return TRUE; - - /* I'm not matching MS bug for bug here, because I doubt any app depends on - * it: - * - native "succeeds" if pszFuncName is NULL, but the nonsensical entry - * it creates would never be used - * - native returns an HRESULT rather than a Win32 error if pszOID is NULL. - * Instead I disallow both of these with ERROR_INVALID_PARAMETER. - */ - if (!pszFuncName || !pszOID) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - TRACE("Key name is %s\n", debugstr_a(szKey)); - - if (!szKey) - return FALSE; - - r = RegCreateKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if(r != ERROR_SUCCESS) - return FALSE; - - /* write the values */ - if (pszOverrideFuncName) - RegSetValueExA(hKey, "FuncName", 0, REG_SZ, (const BYTE*)pszOverrideFuncName, - lstrlenA(pszOverrideFuncName) + 1); - RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*) pwszDll, - (lstrlenW(pwszDll) + 1) * sizeof (WCHAR)); - - RegCloseKey(hKey); - return TRUE; -} - -BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID) -{ - LPSTR szKey; - LONG rc; - - TRACE("%lx %s %s\n", dwEncodingType, pszFuncName, pszOID); - - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - if (!pszFuncName || !pszOID) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - rc = RegDeleteKeyA(HKEY_LOCAL_MACHINE, szKey); - CryptMemFree(szKey); - if (rc) - SetLastError(rc); - return rc ? FALSE : TRUE; -} - -BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID, LPCWSTR pwszValueName, DWORD *pdwValueType, BYTE *pbValueData, - DWORD *pcbValueData) -{ - LPSTR szKey; - LONG rc; - HKEY hKey; - - TRACE("%lx %s %s %s %p %p %p\n", dwEncodingType, debugstr_a(pszFuncName), - debugstr_a(pszOID), debugstr_w(pwszValueName), pdwValueType, pbValueData, - pcbValueData); - - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - if (!pszFuncName || !pszOID || !pwszValueName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if (rc) - SetLastError(rc); - else - { - rc = RegQueryValueExW(hKey, pwszValueName, NULL, pdwValueType, - pbValueData, pcbValueData); - if (rc) - SetLastError(rc); - RegCloseKey(hKey); - } - return rc ? FALSE : TRUE; -} - -BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID, LPCWSTR pwszValueName, DWORD dwValueType, - const BYTE *pbValueData, DWORD cbValueData) -{ - LPSTR szKey; - LONG rc; - HKEY hKey; - - TRACE("%lx %s %s %s %ld %p %ld\n", dwEncodingType, debugstr_a(pszFuncName), - debugstr_a(pszOID), debugstr_w(pwszValueName), dwValueType, pbValueData, - cbValueData); - - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - if (!pszFuncName || !pszOID || !pwszValueName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if (rc) - SetLastError(rc); - else - { - rc = RegSetValueExW(hKey, pwszValueName, 0, dwValueType, pbValueData, - cbValueData); - if (rc) - SetLastError(rc); - RegCloseKey(hKey); - } - return rc ? FALSE : TRUE; -} - -/* Gets the registered function named szFuncName for dwCertEncodingType and - * lpszStructType, or NULL if one could not be found. *lib will be set to the - * handle of the module it's in, or NULL if no module was loaded. If the - * return value is NULL, *lib will also be NULL, to simplify error handling. - */ -static void *CRYPT_GetFunc(DWORD dwCertEncodingType, LPCSTR lpszStructType, - LPCSTR szFuncName, HMODULE *lib) -{ - void *ret = NULL; - char *szKey = CRYPT_GetKeyName(dwCertEncodingType, szFuncName, - lpszStructType); - const char *funcName; - long r; - HKEY hKey; - DWORD type, size = 0; - - TRACE("(%08lx %s %s %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), - debugstr_a(szFuncName), lib); - - *lib = NULL; - r = RegOpenKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if(r != ERROR_SUCCESS) - return NULL; - - RegQueryValueExA(hKey, "FuncName", NULL, &type, NULL, &size); - if (GetLastError() == ERROR_MORE_DATA && type == REG_SZ) - { - funcName = CryptMemAlloc(size); - RegQueryValueExA(hKey, "FuncName", NULL, &type, (LPBYTE)funcName, - &size); - } - else - funcName = szFuncName; - RegQueryValueExW(hKey, szDllName, NULL, &type, NULL, &size); - if (GetLastError() == ERROR_MORE_DATA && type == REG_SZ) - { - LPWSTR dllName = CryptMemAlloc(size); - - RegQueryValueExW(hKey, szDllName, NULL, &type, (LPBYTE)dllName, - &size); - *lib = LoadLibraryW(dllName); - if (*lib) - { - ret = GetProcAddress(*lib, funcName); - if (!ret) - { - /* Unload the library, the caller doesn't want to unload it - * when the return value is NULL. - */ - FreeLibrary(*lib); - *lib = NULL; - } - } - CryptMemFree(dllName); - } - if (funcName != szFuncName) - CryptMemFree((char *)funcName); - TRACE("returning %p\n", ret); - return ret; -} - BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib; + HCRYPTOIDFUNCADDR hFunc; CryptEncodeObjectFunc pCryptEncodeObject; TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, @@ -449,14 +198,15 @@ } /* Try registered DLL first.. */ - pCryptEncodeObject = - (CryptEncodeObjectFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_ENCODE_OBJECT_FUNC, &lib); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&pCryptEncodeObject, &hFunc); if (pCryptEncodeObject) { ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, pvStructInfo, pbEncoded, pcbEncoded); - FreeLibrary(lib); + CryptFreeOIDFunctionAddress(hFunc, 0); } else { @@ -2272,9 +2022,10 @@ const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, void *pvEncoded, DWORD *pcbEncoded) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib = NULL; CryptEncodeObjectExFunc encodeFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(0x%08lx, %s, %p, 0x%08lx, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, @@ -2384,15 +2135,19 @@ TRACE("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!encodeFunc) - encodeFunc = (CryptEncodeObjectExFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_ENCODE_OBJECT_EX_FUNC, &lib); + { + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&encodeFunc, &hFunc); + } if (encodeFunc) ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); else SetLastError(ERROR_FILE_NOT_FOUND); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } @@ -2400,9 +2155,10 @@ const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib; CryptDecodeObjectFunc pCryptDecodeObject; + HCRYPTOIDFUNCADDR hFunc; TRACE("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, @@ -2415,14 +2171,15 @@ } /* Try registered DLL first.. */ - pCryptDecodeObject = - (CryptDecodeObjectFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_DECODE_OBJECT_FUNC, &lib); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&pCryptDecodeObject, &hFunc); if (pCryptDecodeObject) { ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); - FreeLibrary(lib); + CryptFreeOIDFunctionAddress(hFunc, 0); } else { @@ -5386,9 +5143,10 @@ const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib = NULL; CryptDecodeObjectExFunc decodeFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, @@ -5508,15 +5266,19 @@ TRACE("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!decodeFunc) - decodeFunc = (CryptDecodeObjectExFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_DECODE_OBJECT_EX_FUNC, &lib); + { + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&decodeFunc, &hFunc); + } if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); else SetLastError(ERROR_FILE_NOT_FOUND); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } @@ -5609,9 +5371,10 @@ DWORD dwCertEncodingType, LPSTR pszPublicKeyObjId, DWORD dwFlags, void *pvAuxInfo, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret; ExportPublicKeyInfoExFunc exportFunc = NULL; - HMODULE lib = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(%ld, %ld, %08lx, %s, %08lx, %p, %p, %p)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, @@ -5624,14 +5387,19 @@ } if (pszPublicKeyObjId) - exportFunc = CRYPT_GetFunc(dwCertEncodingType, pszPublicKeyObjId, - CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FUNC, &lib); + { + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FUNC, + 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pszPublicKeyObjId, + 0, (void **)&exportFunc, &hFunc); + } if (!exportFunc) exportFunc = CRYPT_ExportRsaPublicKeyInfoEx; ret = exportFunc(hCryptProv, dwKeySpec, dwCertEncodingType, pszPublicKeyObjId, dwFlags, pvAuxInfo, pInfo, pcbInfo); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } @@ -5682,20 +5450,23 @@ DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret; ImportPublicKeyInfoExFunc importFunc = NULL; - HMODULE lib = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(%ld, %ld, %p, %d, %08lx, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); - importFunc = CRYPT_GetFunc(dwCertEncodingType, pInfo->Algorithm.pszObjId, - CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_FUNC, &lib); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, + pInfo->Algorithm.pszObjId, 0, (void **)&importFunc, &hFunc); if (!importFunc) importFunc = CRYPT_ImportRsaPublicKeyInfoEx; ret = importFunc(hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } _____ Modified: vendor/wine/dlls/crypt32/current/main.c --- vendor/wine/dlls/crypt32/current/main.c 2005-12-12 20:25:02 UTC (rev 20112) +++ vendor/wine/dlls/crypt32/current/main.c 2005-12-12 20:26:19 UTC (rev 20113) @@ -38,7 +38,11 @@ { switch (fdwReason) { + case DLL_PROCESS_ATTACH: + CRYPT_InitFunctionSets(); + break; case DLL_PROCESS_DETACH: + CRYPT_FreeFunctionSets(); if (hDefProv) CryptReleaseContext(hDefProv, 0); break; } @@ -53,30 +57,37 @@ return hDefProv; } -/* this function is called by Internet Explorer when it is about to verify a downloaded component */ -BOOL WINAPI I_CryptCreateLruCache(DWORD x, DWORD y) +typedef void * HLRUCACHE; + +/* this function is called by Internet Explorer when it is about to verify a + * downloaded component. The first parameter appears to be a pointer to an + * unknown type, native fails unless it points to a buffer of at least 20 bytes. + * The second parameter appears to be an out parameter, whatever it's set to is + * passed (by cryptnet.dll) to I_CryptFlushLruCache. + */ +BOOL WINAPI I_CryptCreateLruCache(void *unknown, HLRUCACHE *out) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %p): stub!\n", unknown, out); + *out = (void *)0xbaadf00d; + return TRUE; } -/* these functions all have an unknown number of args */ -BOOL WINAPI I_CryptFindLruEntryData(DWORD x) +BOOL WINAPI I_CryptFindLruEntryData(DWORD unk0, DWORD unk1, DWORD unk2) { - FIXME("stub!\n"); + FIXME("(%08lx, %08lx, %08lx): stub!\n", unk0, unk1, unk2); [truncated at 1000 lines; 8999 more skipped]

1 0

[navaraf] 20112: Replace RtlNtStatusToDosError(STATUS_NO_MEMORY) with ERROR_OUTOFMEMORY.
by navaraf＠svn.reactos.com 12 Dec '05

12 Dec '05

Replace RtlNtStatusToDosError(STATUS_NO_MEMORY) with ERROR_OUTOFMEMORY. Modified: trunk/reactos/lib/user32/windows/class.c _____ Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-12-12 20:24:20 UTC (rev 20111) +++ trunk/reactos/lib/user32/windows/class.c 2005-12-12 20:25:02 UTC (rev 20112) @@ -41,7 +41,7 @@ if ( !str ) { - SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY)); + SetLastError (ERROR_OUTOFMEMORY); return FALSE; } } @@ -69,7 +69,7 @@ str2.Buffer = (PWSTR)HEAP_alloc ( str2.MaximumLength * sizeof(WCHAR) ); if ( !str2.Buffer ) { - SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY)); + SetLastError (ERROR_OUTOFMEMORY); if ( !IS_ATOM(str) ) HEAP_free ( str ); return FALSE; @@ -78,7 +78,7 @@ str3.Buffer = (PWSTR)HEAP_alloc ( str3.MaximumLength * sizeof(WCHAR) ); if ( !str3.Buffer ) { - SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY)); + SetLastError (ERROR_OUTOFMEMORY); HEAP_free ( str2.Buffer ); if ( !IS_ATOM(str) ) HEAP_free ( str );

1 0

[navaraf] 20111: Check for failed allocations. Spotted by Martin Bealby.
by navaraf＠svn.reactos.com 12 Dec '05

12 Dec '05

Check for failed allocations. Spotted by Martin Bealby. Modified: trunk/reactos/lib/user32/windows/prop.c _____ Modified: trunk/reactos/lib/user32/windows/prop.c --- trunk/reactos/lib/user32/windows/prop.c 2005-12-12 20:15:23 UTC (rev 20110) +++ trunk/reactos/lib/user32/windows/prop.c 2005-12-12 20:24:20 UTC (rev 20111) @@ -70,6 +70,11 @@ if(Count > 0) { pli = RtlAllocateHeap(GetProcessHeap(), 0, Count); + if (pli == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return -1; + } Status = NtUserBuildPropList(hWnd, (LPVOID)pli, Count, &Count); if(!NT_SUCCESS(Status)) @@ -132,6 +137,11 @@ if(Count > 0) { pli = RtlAllocateHeap(GetProcessHeap(), 0, Count); + if (pli == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return -1; + } Status = NtUserBuildPropList(hWnd, (LPVOID)pli, Count, &Count); if(!NT_SUCCESS(Status)) @@ -194,6 +204,11 @@ if(Count > 0) { pli = RtlAllocateHeap(GetProcessHeap(), 0, Count); + if (pli == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return -1; + } Status = NtUserBuildPropList(hWnd, (LPVOID)pli, Count, &Count); if(!NT_SUCCESS(Status)) @@ -256,6 +271,11 @@ if(Count > 0) { pli = RtlAllocateHeap(GetProcessHeap(), 0, Count); + if (pli == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return -1; + } Status = NtUserBuildPropList(hWnd, (LPVOID)pli, Count, &Count); if(!NT_SUCCESS(Status))

1 0

[navaraf] 20110: Fix the USER32 DLL initialization and cleanup routines to prevent memory/resource leaks and check for allocation errors.
by navaraf＠svn.reactos.com 12 Dec '05

12 Dec '05

Fix the USER32 DLL initialization and cleanup routines to prevent memory/resource leaks and check for allocation errors. Modified: trunk/reactos/lib/user32/include/menu.h Modified: trunk/reactos/lib/user32/include/message.h Modified: trunk/reactos/lib/user32/include/user32p.h Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/lib/user32/windows/message.c _____ Modified: trunk/reactos/lib/user32/include/menu.h --- trunk/reactos/lib/user32/include/menu.h 2005-12-12 20:01:44 UTC (rev 20109) +++ trunk/reactos/lib/user32/include/menu.h 2005-12-12 20:15:23 UTC (rev 20110) @@ -13,6 +13,8 @@ BOOL MenuInit(VOID); VOID +MenuCleanup(VOID); +VOID MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt); VOID MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key); _____ Modified: trunk/reactos/lib/user32/include/message.h --- trunk/reactos/lib/user32/include/message.h 2005-12-12 20:01:44 UTC (rev 20109) +++ trunk/reactos/lib/user32/include/message.h 2005-12-12 20:15:23 UTC (rev 20110) @@ -10,5 +10,6 @@ #define LIB_USER32_INCLUDE_MESSAGE_H BOOL FASTCALL MessageInit(VOID); +VOID FASTCALL MessageCleanup(VOID); #endif /* LIB_USER32_INCLUDE_MESSAGE_H */ _____ Modified: trunk/reactos/lib/user32/include/user32p.h --- trunk/reactos/lib/user32/include/user32p.h 2005-12-12 20:01:44 UTC (rev 20109) +++ trunk/reactos/lib/user32/include/user32p.h 2005-12-12 20:15:23 UTC (rev 20110) @@ -127,5 +127,10 @@ STDCALL GdiConvertToDevmodeW(DEVMODEA *dm); +/* FIXME: Belongs to some header. */ +BOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID); +void InitStockObjects(void); +VOID DeleteFrameBrushes(VOID); + #endif /* EOF */ _____ Modified: trunk/reactos/lib/user32/misc/dllmain.c --- trunk/reactos/lib/user32/misc/dllmain.c 2005-12-12 20:01:44 UTC (rev 20109) +++ trunk/reactos/lib/user32/misc/dllmain.c 2005-12-12 20:15:23 UTC (rev 20110) @@ -2,106 +2,121 @@ #define NDEBUG #include <debug.h> -/* FIXME: Belongs to some header. */ -BOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID); -void InitStockObjects(void); -VOID DeleteFrameBrushes(VOID); - -extern CRITICAL_SECTION gcsMPH; static ULONG User32TlsIndex; HINSTANCE User32Instance; -HWINSTA ProcessWindowStation; PUSER32_THREAD_DATA User32GetThreadData() { - return((PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex)); + return ((PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex)); } -VOID +BOOL InitThread(VOID) { - PUSER32_THREAD_DATA ThreadData; + PUSER32_THREAD_DATA ThreadData; - ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(USER32_THREAD_DATA)); - TlsSetValue(User32TlsIndex, ThreadData); + ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(USER32_THREAD_DATA)); + if (ThreadData == NULL) + return FALSE; + if (!TlsSetValue(User32TlsIndex, ThreadData)) + return FALSE; + return TRUE; } VOID CleanupThread(VOID) { - PUSER32_THREAD_DATA ThreadData; + PUSER32_THREAD_DATA ThreadData; - ThreadData = (PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex); - HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, ThreadData); - TlsSetValue(User32TlsIndex, 0); + ThreadData = (PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex); + HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, ThreadData); + TlsSetValue(User32TlsIndex, 0); } -VOID +BOOL Init(VOID) { - /* Set up the kernel callbacks. */ - NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_WINDOWPROC] = - (PVOID)User32CallWindowProcFromKernel; - NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_SENDASYNCPROC] = - (PVOID)User32CallSendAsyncProcForKernel; - NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_LOADSYSMENUTEMPLATE] = - (PVOID)User32LoadSysMenuTemplateForKernel; - NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_LOADDEFAULTCURSORS] = - (PVOID)User32SetupDefaultCursors; - NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_HOOKPROC] = - (PVOID)User32CallHookProcFromKernel; + /* Set up the kernel callbacks. */ + NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_WINDOWPROC] = + (PVOID)User32CallWindowProcFromKernel; + NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_SENDASYNCPROC] = + (PVOID)User32CallSendAsyncProcForKernel; + NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_LOADSYSMENUTEMPLATE] = + (PVOID)User32LoadSysMenuTemplateForKernel; + NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_LOADDEFAULTCURSORS] = + (PVOID)User32SetupDefaultCursors; + NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALL BACK_HOOKPROC] = + (PVOID)User32CallHookProcFromKernel; - /* Allocate an index for user32 thread local data. */ - User32TlsIndex = TlsAlloc(); + /* Allocate an index for user32 thread local data. */ + User32TlsIndex = TlsAlloc(); + if (User32TlsIndex != TLS_OUT_OF_INDEXES) + { + if (MessageInit()) + { + if (MenuInit()) + { + InitializeCriticalSection(&U32AccelCacheLock); + GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); + InitStockObjects(); - MenuInit(); - MessageInit(); + return TRUE; + } + MessageCleanup(); + } + TlsFree(User32TlsIndex); + } - InitializeCriticalSection(&U32AccelCacheLock); - InitializeCriticalSection(&gcsMPH); - - GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); - InitStockObjects(); + return FALSE; } VOID Cleanup(VOID) { - GdiDllInitialize(NULL, DLL_PROCESS_DETACH, NULL); - - TlsFree(User32TlsIndex); + DeleteCriticalSection(&U32AccelCacheLock); + MenuCleanup(); + MessageCleanup(); + DeleteFrameBrushes(); + GdiDllInitialize(NULL, DLL_PROCESS_DETACH, NULL); + TlsFree(User32TlsIndex); } - - INT STDCALL DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved - ) + IN PVOID hInstanceDll, + IN ULONG dwReason, + IN PVOID reserved) { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - User32Instance = hinstDll; - hProcessHeap = RtlGetProcessHeap(); - Init(); - InitThread(); - break; - case DLL_THREAD_ATTACH: - InitThread(); - break; - case DLL_THREAD_DETACH: - CleanupThread(); - break; - case DLL_PROCESS_DETACH: - DeleteFrameBrushes(); - CleanupThread(); - Cleanup(); - break; - } - return(1); + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + User32Instance = hInstanceDll; + hProcessHeap = RtlGetProcessHeap(); + if (!Init()) + return FALSE; + if (!InitThread()) + { + Cleanup(); + return FALSE; + } + break; + + case DLL_THREAD_ATTACH: + if (!InitThread()) + return FALSE; + break; + + case DLL_THREAD_DETACH: + CleanupThread(); + break; + + case DLL_PROCESS_DETACH: + CleanupThread(); + Cleanup(); + break; + } + + return TRUE; } _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-12-12 20:01:44 UTC (rev 20109) +++ trunk/reactos/lib/user32/windows/menu.c 2005-12-12 20:15:23 UTC (rev 20110) @@ -1077,6 +1077,8 @@ if(hMenuFontBold == NULL) { DbgPrint("MenuInit(): CreateFontIndirectW(hMenuFontBold) failed!\n"); + DeleteObject(hMenuFont); + hMenuFont = NULL; return FALSE; } } @@ -1085,6 +1087,24 @@ } +VOID +MenuCleanup(VOID) +{ + if (hMenuFont) + { + DeleteObject(hMenuFont); + hMenuFont = NULL; + } + + if (hMenuFontBold) + { + DeleteObject(hMenuFontBold); + hMenuFontBold = NULL; + } +} + + + /*********************************************************************** * MenuCalcItemSize * _____ Modified: trunk/reactos/lib/user32/windows/message.c --- trunk/reactos/lib/user32/windows/message.c 2005-12-12 20:01:44 UTC (rev 20109) +++ trunk/reactos/lib/user32/windows/message.c 2005-12-12 20:15:23 UTC (rev 20110) @@ -2107,14 +2107,22 @@ } -BOOL FASTCALL MessageInit() +BOOL FASTCALL MessageInit(VOID) { InitializeCriticalSection(&DdeCrst); InitializeCriticalSection(&MsgConversionCrst); + InitializeCriticalSection(&gcsMPH); return TRUE; } +VOID FASTCALL MessageCleanup(VOID) +{ + DeleteCriticalSection(&DdeCrst); + DeleteCriticalSection(&MsgConversionCrst); + DeleteCriticalSection(&gcsMPH); +} + /*********************************************************************** * map_wparam_AtoW *

1 0

[gedmurphy] 20109: merge 20108 to branch
by gedmurphy＠svn.reactos.com 12 Dec '05

12 Dec '05

merge 20108 to branch Modified: branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp --- branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp 2005-12-12 19:50:59 UTC (rev 20108) +++ branches/ros-branch-0_2_9/reactos/subsys/system/explorer/taskbar/startme nu.cpp 2005-12-12 20:01:44 UTC (rev 20109) @@ -1546,7 +1546,7 @@ StartMenuRoot::StartMenuRoot(HWND hwnd) - : super(hwnd, true) ///@todo big icons in start menu root + : super(hwnd, false) ///@todo big icons in start menu root { #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCOMMONGROUPS))

1 0

[gedmurphy] 20108: Make start menu icons small until we have 24x24 icons.
by gedmurphy＠svn.reactos.com 12 Dec '05

12 Dec '05

Make start menu icons small until we have 24x24 icons. Thanks to Martin for pointing out this simple change Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-12-12 19:49:08 UTC (rev 20107) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-12-12 19:50:59 UTC (rev 20108) @@ -1546,7 +1546,7 @@ StartMenuRoot::StartMenuRoot(HWND hwnd) - : super(hwnd, true) ///@todo big icons in start menu root + : super(hwnd, false) ///@todo big icons in start menu root { #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCOMMONGROUPS))

1 0

[navaraf] 20107: Implement undocumented listbox messages LB_INSERTSTRING_UPPER, LB_INSERTSTRING_LOWER, LB_ADDSTRING_UPPER, LB_ADDSTRING_LOWER and use them in combobox CB_ADDSTRING and CB_INSERTSTRING implementation.
by navaraf＠svn.reactos.com 12 Dec '05

12 Dec '05

Implement undocumented listbox messages LB_INSERTSTRING_UPPER, LB_INSERTSTRING_LOWER, LB_ADDSTRING_UPPER, LB_ADDSTRING_LOWER and use them in combobox CB_ADDSTRING and CB_INSERTSTRING implementation. Modified: trunk/reactos/lib/user32/controls/combo.c Modified: trunk/reactos/lib/user32/controls/listbox.c Modified: trunk/reactos/lib/user32/include/controls.h _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2005-12-12 19:23:52 UTC (rev 20106) +++ trunk/reactos/lib/user32/controls/combo.c 2005-12-12 19:49:08 UTC (rev 20107) @@ -1842,19 +1842,6 @@ return TRUE; } -static char *strdupA(LPCSTR str) -{ - char *ret; - DWORD len; - - if(!str) return NULL; - - len = strlen(str); - ret = HeapAlloc(GetProcessHeap(), 0, len + 1); - memcpy(ret, str, len + 1); - return ret; -} - /*********************************************************************** * ComboWndProc_common * @@ -2082,33 +2069,14 @@ /* fall through */ #endif case CB_ADDSTRING: - if( unicode ) - { - if( lphc->dwStyle & CBS_LOWERCASE ) - strlwrW((LPWSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - struprW((LPWSTR)lParam); - return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); - } - else /* unlike the unicode version, the ansi version does not overwrite - the string if converting case */ - { - char *string = NULL; - LRESULT ret; - if( lphc->dwStyle & CBS_LOWERCASE ) - { - string = strdupA((LPSTR)lParam); - _strlwr(string); - } - else if( lphc->dwStyle & CBS_UPPERCASE ) - { - string = strdupA((LPSTR)lParam); - _strupr(string); - } - ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); - HeapFree(GetProcessHeap(), 0, string); - return ret; - } + { + UINT msg = LB_ADDSTRING; + if( lphc->dwStyle & CBS_LOWERCASE ) + msg = LB_ADDSTRING_LOWER; + else if( lphc->dwStyle & CBS_UPPERCASE ) + msg = LB_ADDSTRING_UPPER; + return SendMessageW(lphc->hWndLBox, msg, 0, lParam); + } #ifndef __REACTOS__ case CB_INSERTSTRING16: wParam = (INT)(INT16)wParam; @@ -2116,22 +2084,14 @@ /* fall through */ #endif case CB_INSERTSTRING: - if( unicode ) - { - if( lphc->dwStyle & CBS_LOWERCASE ) - strlwrW((LPWSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - struprW((LPWSTR)lParam); - return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); - } - else - { - if( lphc->dwStyle & CBS_LOWERCASE ) - _strlwr((LPSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - _strupr((LPSTR)lParam); - return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); - } + { + UINT msg = LB_INSERTSTRING; + if( lphc->dwStyle & CBS_LOWERCASE ) + msg = LB_INSERTSTRING_LOWER; + else if( lphc->dwStyle & CBS_UPPERCASE ) + msg = LB_INSERTSTRING_UPPER; + return SendMessageW(lphc->hWndLBox, msg, 0, lParam); + } #ifndef __REACTOS__ case CB_DELETESTRING16: #endif _____ Modified: trunk/reactos/lib/user32/controls/listbox.c --- trunk/reactos/lib/user32/controls/listbox.c 2005-12-12 19:23:52 UTC (rev 20106) +++ trunk/reactos/lib/user32/controls/listbox.c 2005-12-12 19:49:08 UTC (rev 20107) @@ -2650,6 +2650,8 @@ /* fall through */ #endif case LB_ADDSTRING: + case LB_ADDSTRING_LOWER: + case LB_ADDSTRING_UPPER: { INT ret; LPWSTR textW; @@ -2662,6 +2664,12 @@ if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } + /* in the unicode the version, the string is really overwritten + during the converting case */ + if (msg == LB_ADDSTRING_LOWER) + strlwrW(textW); + else if (msg == LB_ADDSTRING_UPPER) + struprW(textW); wParam = LISTBOX_FindStringPos( descr, textW, FALSE ); ret = LISTBOX_InsertString( descr, wParam, textW ); if (!unicode && HAS_STRINGS(descr)) @@ -2676,6 +2684,8 @@ /* fall through */ #endif case LB_INSERTSTRING: + case LB_INSERTSTRING_UPPER: + case LB_INSERTSTRING_LOWER: { INT ret; LPWSTR textW; @@ -2688,6 +2698,12 @@ if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } + /* in the unicode the version, the string is really overwritten + during the converting case */ + if (msg == LB_INSERTSTRING_LOWER) + strlwrW(textW); + else if (msg == LB_INSERTSTRING_UPPER) + struprW(textW); ret = LISTBOX_InsertString( descr, wParam, textW ); if(!unicode && HAS_STRINGS(descr)) HeapFree(GetProcessHeap(), 0, textW); _____ Modified: trunk/reactos/lib/user32/include/controls.h --- trunk/reactos/lib/user32/include/controls.h 2005-12-12 19:23:52 UTC (rev 20106) +++ trunk/reactos/lib/user32/include/controls.h 2005-12-12 19:49:08 UTC (rev 20107) @@ -110,4 +110,9 @@ extern BOOL COMBO_FlipListbox( LPHEADCOMBO, BOOL, BOOL ); +#define LB_INSERTSTRING_UPPER 0x1AA +#define LB_INSERTSTRING_LOWER 0x1AB +#define LB_ADDSTRING_UPPER 0x1AC +#define LB_ADDSTRING_LOWER 0x1AD + #endif /* _ROS_CONTROLS_H */

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005