February 2006 - Wine-Commits

Eric Pouech : winedbg: A couple of fixes after running valgrind.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: a7ff2f671c5ff57645dc5f875c1e370ed9ceaf87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7ff2f671c5ff57645dc5f8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Feb 16 12:06:43 2006 +0100 winedbg: A couple of fixes after running valgrind. --- programs/winedbg/stack.c | 3 ++- programs/winedbg/winedbg.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index f506f5f..91796c8 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -84,6 +84,7 @@ static BOOL stack_set_frame_internal(int static BOOL stack_get_frame(int nf, IMAGEHLP_STACK_FRAME* ihsf) { + memset(ihsf, 0, sizeof(*ihsf)); ihsf->InstructionOffset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_pc); ihsf->FrameOffset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_frame); return TRUE; @@ -229,7 +230,7 @@ static void stack_print_addr_and_args(in DWORD disp; dbg_printf(" %s", si->Name); - if (disp) dbg_printf("+0x%lx", (DWORD_PTR)disp64); + if (disp64) dbg_printf("+0x%lx", (DWORD_PTR)disp64); SymSetContext(dbg_curr_process->handle, &ihsf, NULL); se.tmp = tmp; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 3a1caef..fae7a42 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -397,6 +397,7 @@ struct dbg_thread* dbg_add_thread(struct t->frames = NULL; t->num_frames = 0; t->curr_frame = -1; + t->addr_mode = AddrModeFlat; snprintf(t->name, sizeof(t->name), "0x%08lx", tid);

1 0

Jeff Latimer : usp10: Implement ScriptGetProperties.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 0ba307d25227fc36fe6476ba4ec3f8d141b449a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ba307d25227fc36fe6476b… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Feb 16 12:06:18 2006 +0100 usp10: Implement ScriptGetProperties. --- dlls/usp10/tests/usp10.c | 11 +++++------ dlls/usp10/usp10.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 683f938..83c297a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -79,12 +79,11 @@ START_TEST(usp10) * by checking a known value in the table */ hr = ScriptGetProperties(&ppSp, &iMaxProps); trace("number of script properties %d\n", iMaxProps); - todo_wine { - ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); - if (iMaxProps > 0) - ok( ppSp[5]->langid == 9, "Langid[5] not = to 9\n"); /* Check a known value to ensure */ - /* ptrs work */ - } + ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); + if (iMaxProps > 0) + ok( ppSp[5]->langid == 9, "Langid[5] not = to 9\n"); /* Check a known value to ensure */ + /* ptrs work */ + /* This set of tests are to check that the various edits in ScriptIemize work */ cInChars = 5; /* Length of test without NULL */ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6fe2f6c..dd26867 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -39,6 +39,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); +#define MAX_SCRIPTS 8 + +/* Set up a default for ScriptGetProperties */ +static const SCRIPT_PROPERTIES Default_Script_0 = {0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_1 = {0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_2 = {0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_3 = {9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_4 = {9, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_5 = {9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_6 = {9, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0}; +static const SCRIPT_PROPERTIES Default_Script_7 = {8, 0, 0, 0, 0, 161, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; +static const SCRIPT_PROPERTIES *Global_Script[MAX_SCRIPTS] = + {&Default_Script_0, + &Default_Script_1, + &Default_Script_2, + &Default_Script_3, + &Default_Script_4, + &Default_Script_5, + &Default_Script_6, + &Default_Script_7}; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { @@ -69,9 +98,13 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CA */ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts) { - FIXME("%p,%p\n",ppSp,piNumScripts); + TRACE("%p,%p\n",ppSp, piNumScripts); - if (piNumScripts) *piNumScripts = 0; +/* Set up a sensible default and intialise pointers */ + *piNumScripts = MAX_SCRIPTS; + *ppSp = Global_Script; + TRACE("ppSp:%p, *ppSp:%p, **ppSp:%p, %d\n", ppSp, *ppSp, **ppSp, + *piNumScripts); return 0; }

1 0

lostwages/ include/winehq.conf news/2006021501.xml
by WineHQ Feb. 15, 2006

Feb. 15, 2006

ChangeSet ID: 23074 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/02/15 15:40:13 Modified files: include : winehq.conf Added files: news : 2006021501.xml Log message: news about Wine 0.9.8 Patch: http://cvs.winehq.org/patch.py?id=23074 Old revision New revision Changes Path 1.31 1.32 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006021501.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.31 lostwages/include/winehq.conf:1.32 --- lostwages/include/winehq.conf:1.31 15 Feb 2006 21:40:13 -0000 +++ lostwages/include/winehq.conf 15 Feb 2006 21:40:13 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.7 +snapshot_date: 0.9.8 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006021501.xml diff -u -p /dev/null lostwages/news/2006021501.xml:1.1 --- /dev/null 15 Feb 2006 21:40:13 -0000 +++ lostwages/news/2006021501.xml 15 Feb 2006 21:40:13 -0000 @@ -0,0 +1,25 @@ +<news> + <date>February 15, 2006</date> + <title>Wine 0.9.8 Released</title> + <body> +<p> +Wine 0.9.8 was released today. Some bug fixes for problems affecting +some common applications may be in this release, including one for Photoshop. +The following major additions were noted: +<ul> + <li>Better Web browser support.</li> + <li>Beginnings of a Wordpad application.</li> + <li>Many richedit improvements.</li> + <li>A number of Direct3D fixes.</li> + <li>A few more options in winecfg.</li> +</ul> +<p> + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.8.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.112">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + </body> +</news>

1 0

Tag wine-0.9.8 : Alexandre Julliard : Release 0.9.8
by Alexandre Julliard Feb. 15, 2006

Feb. 15, 2006

Module: wine Branch: refs/tags/wine-0.9.8 Tag: 1af7541f8a7d621f077fc3345f5104a4a6444645 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=1af7541f8a7d621f077fc3345f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 15 17:02:22 2006 +0100 Release 0.9.8

1 0

Alexandre Julliard : Release 0.9.8.
by Alexandre Julliard Feb. 15, 2006

Feb. 15, 2006

Module: wine Branch: refs/heads/master Commit: 0aa8f3a9810ae5d5bf44fe38f0ed8db527ab0231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0aa8f3a9810ae5d5bf44fe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 15 17:02:21 2006 +0100 Release 0.9.8. --- ANNOUNCE | 16 - ChangeLog | 1716 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1734 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0aa8f3a9810ae5d5bf4…

1 0

lostwages/templates/en contributing.template s ...
by Jeremy Newman Feb. 15, 2006

Feb. 15, 2006

ChangeSet ID: 23072 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/15 09:49:20 Modified files: templates/en : contributing.template status_dlls.template Log message: Tom Wickline <twickline(a)gmail.com> remove reference to Google's summer of code, fix a typo Patch: http://cvs.winehq.org/patch.py?id=23072 Old revision New revision Changes Path 1.31 1.32 +0 -4 lostwages/templates/en/contributing.template 1.38 1.39 +1 -1 lostwages/templates/en/status_dlls.template Index: lostwages/templates/en/contributing.template diff -u -p lostwages/templates/en/contributing.template:1.31 lostwages/templates/en/contributing.template:1.32 --- lostwages/templates/en/contributing.template:1.31 15 Feb 2006 15:49:20 -0000 +++ lostwages/templates/en/contributing.template 15 Feb 2006 15:49:20 -0000 @@ -2,10 +2,6 @@ <h1>Contributing to Wine</h1> -<p>The Wine project is proud participant of Google's <a href="http://code.google.com/summerofcode.html">summer of code</a> program. -If you are interested in participating in the summer of code please visit our <a href="http://wiki.winehq.org/SummerOfCode">Summer of Code</a> page -for up to date information and proposed projects. -</p> <p>It's easy to be a bit overwhelmed when you're new to Wine. Yes there may be a lot of things to do but where should you start? Is there anything simple that can get you started? Is there anything you can do that does not require an intimate knowledge of the Windows API and of Index: lostwages/templates/en/status_dlls.template diff -u -p lostwages/templates/en/status_dlls.template:1.38 lostwages/templates/en/status_dlls.template:1.39 --- lostwages/templates/en/status_dlls.template:1.38 15 Feb 2006 15:49:20 -0000 +++ lostwages/templates/en/status_dlls.template 15 Feb 2006 15:49:20 -0000 @@ -415,7 +415,7 @@ <td><a href="{$root}/site/?issue=126#TransGaming%20Releasing%20Code">#126</a>, <a href="{$root}/site/?issue=170#Separating%2016/32%20Bit%20OLE%20Functions">#170</a>, <a href="{$root}/site/?issue=299#VB%20Apps%20&%20OLEAUT32">#299</a></td> - <td class="pct90">90% complete</td> + <td class="pct80">80% complete</td> <td>Robert Shearman,<br>CodeWeavers</td> </tr> <tr>

1 0

Emmanuel Maillard : loader: Reserve memory area on Darwin ( based on Steve Zellers patch).
by Alexandre Julliard Feb. 15, 2006

Feb. 15, 2006

Module: wine Branch: refs/heads/master Commit: aaae6606cbda69b29de16faa7d2de6be561b2481 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aaae6606cbda69b29de16fa… Author: Emmanuel Maillard <mahanuu(a)opendarwin.org> Date: Wed Feb 15 13:52:02 2006 +0100 loader: Reserve memory area on Darwin (based on Steve Zellers patch). --- configure | 13 +++---------- configure.ac | 7 +------ libs/wine/Makefile.in | 2 +- loader/main.c | 13 +++++++++++++ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 6ac3e97..493f0d3 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB LDLIBWINEFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' # Initialize some variables set by options. @@ -12882,18 +12882,12 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6 IOKITLIB="-framework IOKit -framework CoreFoundation" - case $host_cpu in - *i[3456789]86*) - LDEXECFLAGS="-image_base 0x7bf00000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7ffe0000" - ;; + case $host_cpu in *powerpc*) CFLAGS="$CFLAGS -ffixed-r13" LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" - LDEXECFLAGS="-seg1addr 0x120000" - - LDLIBWINEFLAGS="-seg1addr 0x140000" - ;; esac @@ -19863,7 +19857,6 @@ s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t s,@LDEXECFLAGS@,$LDEXECFLAGS,;t t s,@COREFOUNDATIONLIB@,$COREFOUNDATIONLIB,;t t s,@IOKITLIB@,$IOKITLIB,;t t -s,@LDLIBWINEFLAGS@,$LDLIBWINEFLAGS,;t t s,@CROSSTEST@,$CROSSTEST,;t t s,@CROSSCC@,$CROSSCC,;t t s,@CROSSWINDRES@,$CROSSWINDRES,;t t diff --git a/configure.ac b/configure.ac index 38d2e4f..de05da6 100644 --- a/configure.ac +++ b/configure.ac @@ -1020,16 +1020,11 @@ case $host_os in dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7ffe0000"]) case $host_cpu in - *i[[3456789]]86*) - AC_SUBST(LDEXECFLAGS,"-image_base 0x7bf00000") - ;; *powerpc*) CFLAGS="$CFLAGS -ffixed-r13" LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" - dnl Relocate wine executable (FIXME: is this really needed?) - AC_SUBST(LDEXECFLAGS,"-seg1addr 0x120000") - AC_SUBST(LDLIBWINEFLAGS,"-seg1addr 0x140000") ;; esac diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 34b6400..3e77cb7 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -6,7 +6,7 @@ LIBRARY = wine SOVERSION = 1 VERSCRIPT = $(SRCDIR)/wine.map EXTRADEFS = -D__WINESRC__ -DBINDIR="\"$(bindir)\"" -DLIBDIR="\"$(libdir)\"" -DDLLDIR="\"$(dlldir)\"" -EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ @LDLIBWINEFLAGS@ +EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ C_SRCS = \ config.c \ diff --git a/loader/main.c b/loader/main.c index 8880198..0998393 100644 --- a/loader/main.c +++ b/loader/main.c @@ -23,8 +23,21 @@ #include "wine/library.h" #include "main.h" +#ifdef __APPLE__ +asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x20000000"); +asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x01020000"); +extern char __wine_dos[0x20000000], __wine_shared_heap[0x01020000]; + +static const struct wine_preload_info wine_main_preload_info[] = +{ + { __wine_dos, sizeof(__wine_dos) }, /* DOS area + PE exe */ + { __wine_shared_heap, sizeof(__wine_shared_heap) }, /* shared user data + shared heap */ + { 0, 0 } /* end of list */ +}; +#else /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL; +#endif /********************************************************************** * main

1 0

Thomas Kho : riched20: Extend EM_FINDTEXT conformance tests and fix 2 problems they expose.
by Alexandre Julliard Feb. 15, 2006

Feb. 15, 2006

Module: wine Branch: refs/heads/master Commit: 087af502ea547d4fa804bca688e00cb351ed13f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=087af502ea547d4fa804bca… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Feb 15 13:37:31 2006 +0100 riched20: Extend EM_FINDTEXT conformance tests and fix 2 problems they expose. --- dlls/riched20/editor.c | 17 ++- dlls/riched20/tests/editor.c | 227 +++++++++++++++++++++++------------------- 2 files changed, 139 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=087af502ea547d4fa80…

1 0

Eric Pouech : shdocvw: Implemented a couple of forwards to shlwapi.
by Alexandre Julliard Feb. 15, 2006

Feb. 15, 2006

Module: wine Branch: refs/heads/master Commit: dd7e08cc7c34b492f706e250a943469dd0f5b054 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd7e08cc7c34b492f706e25… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 15 13:37:18 2006 +0100 shdocvw: Implemented a couple of forwards to shlwapi. --- dlls/shdocvw/Makefile.in | 2 + dlls/shdocvw/shdocvw.spec | 9 +++--- dlls/shdocvw/shdocvw_main.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 74a671e..2372d8a 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shdocvw.dll IMPORTLIB = libshdocvw.$(IMPLIBEXT) -IMPORTS = user32 advapi32 kernel32 +IMPORTS = shlwapi user32 advapi32 kernel32 DELAYIMPORTS = urlmon ole32 oleaut32 EXTRALIBS = -luuid diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 9b41f58..636461c 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -2,7 +2,7 @@ 101 stub -noname IEWinMain 102 stub -noname CreateShortcutInDirA 103 stub -noname CreateShortcutInDirW -104 stub -noname WhichPlatformFORWARD +104 stdcall -noname WhichPlatformFORWARD() 105 stub -noname CreateShortcutInDirEx 106 stub HlinkFindFrame 107 stub SetShellOfflineState @@ -15,9 +15,10 @@ 118 stdcall -noname ShellDDEInit(long) 119 stub -noname SHCreateDesktop 120 stub -noname SHDesktopMessageLoop -121 stub -noname StopWatchModeFORWARD -122 stub -noname StopWatchFlushFORWARD -123 stub -noname StopWatchFORWARD +121 stdcall -noname StopWatchModeFORWARD() +122 stdcall -noname StopWatchFlushFORWARD() +123 stdcall -noname StopWatchAFORWARD(long str long long long) +124 stdcall -noname StopWatchWFORWARD(long wstr long long long) 125 stdcall -noname RunInstallUninstallStubs() 130 stub -noname RunInstallUninstallStubs2 131 stub -noname SHCreateSplashScreen diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 179d34a..83b03d0 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -586,3 +586,73 @@ void WINAPI OpenURL(HWND hWnd, HINSTANCE { FIXME("%p %p %s %d\n", hWnd, hInst, debugstr_a(lpcstrUrl), nShowCmd); } + +/********************************************************************** + * Some forwards (by ordinal) to SHLWAPI + */ + +static void* fetch_shlwapi_ordinal(unsigned ord) +{ + static const WCHAR shlwapiW[] = {'s','h','l','w','a','p','i','.','d','l','l','\0'}; + static HANDLE h; + + if (!h && !(h = GetModuleHandleW(shlwapiW))) return NULL; + return (void*)GetProcAddress(h, (const char*)ord); +} + +/****************************************************************** + * WhichPlatformFORWARD (SHDOCVW.@) + */ +DWORD WINAPI WhichPlatformFORWARD(void) +{ + static DWORD (*WINAPI p)(void); + + if (p || (p = fetch_shlwapi_ordinal(276))) return p(); + return 1; /* not integrated, see shlwapi.WhichPlatform */ +} + +/****************************************************************** + * StopWatchModeFORWARD (SHDOCVW.@) + */ +void WINAPI StopWatchModeFORWARD(void) +{ + static void (*WINAPI p)(void); + + if (p || (p = fetch_shlwapi_ordinal(241))) p(); +} + +/****************************************************************** + * StopWatchFlushFORWARD (SHDOCVW.@) + */ +void WINAPI StopWatchFlushFORWARD(void) +{ + static void (*WINAPI p)(void); + + if (p || (p = fetch_shlwapi_ordinal(242))) p(); +} + +/****************************************************************** + * StopWatchWFORWARD (SHDOCVW.@) + */ +DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, + DWORD dwMode, DWORD dwTimeStamp) +{ + static DWORD (*WINAPI p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); + + if (p || (p = fetch_shlwapi_ordinal(243))) + return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************** + * StopWatchAFORWARD (SHDOCVW.@) + */ +DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, + DWORD dwMode, DWORD dwTimeStamp) +{ + static DWORD (*WINAPI p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); + + if (p || (p = fetch_shlwapi_ordinal(244))) + return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Jacek Caban : winecfg: glut32.dll may be configured as native.
by Alexandre Julliard Feb. 15, 2006

Feb. 15, 2006

Module: wine Branch: refs/heads/master Commit: 0a5a8813cbf61a0d436009d11c1bb15ba0fc6c27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a5a8813cbf61a0d436009d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 13:36:52 2006 +0100 winecfg: glut32.dll may be configured as native. --- programs/winecfg/libraries.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 2d9e60d..f4f4a80 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -50,7 +50,6 @@ static const char * const builtin_only[] "ddraw", "gdi32", "glu32", - "glut32", "icmp", "iphlpapi", "joystick.drv",

1 0