June 2006 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Initialize url variable in IPersistMoniker::Load.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 1c64c20d9accb52125f02855c8d03e5932a9e100 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c64c20d9accb52125f0285… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 20 19:01:33 2006 +0200 mshtml: Initialize url variable in IPersistMoniker::Load. --- dlls/mshtml/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 7127091..656c023 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -155,7 +155,7 @@ static HRESULT WINAPI PersistMoniker_Loa { HTMLDocument *This = PERSISTMON_THIS(iface); BSCallback *bscallback; - LPOLESTR url; + LPOLESTR url = NULL; HRESULT hres; nsresult nsres;

1 0

Jacek Caban : mshtml: Added IPropertyNotifySink connection point.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: f05284501373a2b4b1b83e847eda606881f032a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f05284501373a2b4b1b83e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 20 18:55:13 2006 +0200 mshtml: Added IPropertyNotifySink connection point. --- dlls/mshtml/conpoint.c | 3 +++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 5384185..2ff410c 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -199,6 +199,9 @@ static HRESULT WINAPI ConnectionPointCon }else if(IsEqualGUID(&DIID_HTMLDocumentEvents2, riid)) { TRACE("(%p)->(DIID_HTMLDocumentEvents2 %p)\n", This, ppCP); *ppCP = CONPOINT(This->cp_htmldocevents2); + }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); + *ppCP = CONPOINT(This->cp_htmldocevents); } if(*ppCP) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 654c0e2..508b717 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -86,6 +86,7 @@ typedef struct { ConnectionPoint *cp_htmldocevents; ConnectionPoint *cp_htmldocevents2; + ConnectionPoint *cp_propnotif; HTMLDOMNode *nodes; } HTMLDocument;

1 0

Paul Vriens : winecfg: Create Resources directory when adding themes.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 35d24315e76357e4cf327eef54062ea4ffe2fab1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35d24315e76357e4cf327ee… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Jun 20 17:16:43 2006 +0200 winecfg: Create Resources directory when adding themes. --- programs/winecfg/theme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 8c7f819..faad641 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -529,7 +529,7 @@ static void on_theme_install(HWND dialog WCHAR themeFilePath[MAX_PATH]; SHFILEOPSTRUCTW shfop; - if (FAILED (SHGetFolderPathW (NULL, CSIDL_RESOURCES, NULL, + if (FAILED (SHGetFolderPathW (NULL, CSIDL_RESOURCES|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, themeFilePath))) return; PathRemoveExtensionW (filetitle);

1 0

Juan Lang : shlwapi: Small cleanups.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 8076d1cf12ced624af191542801f7b26706f25f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8076d1cf12ced624af19154… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 20 08:23:12 2006 -0700 shlwapi: Small cleanups. - forward MLGetUILanguage to kernel32 - correct type of parameter to MLLoadLibrary --- dlls/shlwapi/ordinal.c | 26 +++++++------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index af5950e..669cff0 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3394,32 +3394,20 @@ HICON WINAPI ExtractIconWrapW(HINSTANCE } /************************************************************************* - * @ [SHLWAPI.376] - */ -LANGID WINAPI MLGetUILanguage(void) -{ - FIXME("() stub\n"); - /* FIXME: This should be a forward in the .spec file to the win2k function - * kernel32.GetUserDefaultUILanguage, however that function isn't there yet. - */ - return GetUserDefaultLangID(); -} - -/************************************************************************* * @ [SHLWAPI.377] * * Load a library from the directory of a particular process. * * PARAMS - * new_mod [I] Library name - * inst_hwnd [I] Module whose directory is to be used - * dwFlags [I] Flags controlling the load + * new_mod [I] Library name + * inst_hwnd [I] Module whose directory is to be used + * bCrossCodePage [I] Should be FALSE (currently ignored) * * RETURNS * Success: A handle to the loaded module * Failure: A NULL handle. */ -HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) +HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) { /* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for * each call here. @@ -3443,7 +3431,7 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new LPSTR ptr; DWORD len; - FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwFlags); + FIXME("(%s,%p,%d) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, bCrossCodePage); len = GetModuleFileNameA(inst_hwnd, mod_path, sizeof(mod_path)); if (!len || len >= sizeof(mod_path)) return NULL; @@ -3461,13 +3449,13 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new * * Unicode version of MLLoadLibraryA. */ -HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) +HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) { WCHAR mod_path[2*MAX_PATH]; LPWSTR ptr; DWORD len; - FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwFlags); + FIXME("(%s,%p,%d) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, bCrossCodePage); len = GetModuleFileNameW(inst_hwnd, mod_path, sizeof(mod_path) / sizeof(WCHAR)); if (!len || len >= sizeof(mod_path) / sizeof(WCHAR)) return NULL; diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index e7a9d9f..0295e1b 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -373,7 +373,7 @@ 373 stdcall -noname DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW 374 stub -noname SHCheckDiskForMediaA 375 stub -noname SHCheckDiskForMediaW -376 stdcall -noname MLGetUILanguage() # kernel32.GetUserDefaultUILanguage +376 stdcall -noname MLGetUILanguage() kernel32.GetUserDefaultUILanguage 377 stdcall MLLoadLibraryA(str long long) 378 stdcall MLLoadLibraryW(wstr long long) 379 stub -noname Shell_GetCachedImageIndexWrapW

1 0

Juan Lang : crypt32: Rearrange functions a bit.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 6f75b5e4ad741e3bc7d7c4c5ae15684a318cf760 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f75b5e4ad741e3bc7d7c4c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 20 06:23:49 2006 -0700 crypt32: Rearrange functions a bit. --- dlls/crypt32/tests/.gitignore | 1 dlls/crypt32/tests/Makefile.in | 1 dlls/crypt32/tests/cert.c | 769 +++++++++++++++++++++++++++++- dlls/crypt32/tests/crl.c | 382 +++++++++++++++ dlls/crypt32/tests/store.c | 1009 ---------------------------------------- 5 files changed, 1107 insertions(+), 1055 deletions(-) create mode 100644 dlls/crypt32/tests/crl.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6f75b5e4ad741e3bc7d…

1 0

Jeremy White : configure: Probe more carefully for soname support, primarily for Solaris support.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 0ebeb530aacc10294d58ce7f7a0540b9efb1826b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ebeb530aacc10294d58ce7… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jun 20 13:18:41 2006 +0200 configure: Probe more carefully for soname support, primarily for Solaris support. --- configure | 6818 ++++++++++++++++++++++++++++++++++++++++++---------------- configure.ac | 20 2 files changed, 4929 insertions(+), 1909 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0ebeb530aacc10294d5…

1 0

Alexandre Julliard : configure: Default to using wine-pthread on all platforms.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 40bbcfb0a10714e7b2f6147a2c74ff81bd2d507d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40bbcfb0a10714e7b2f6147… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 20 13:44:19 2006 +0200 configure: Default to using wine-pthread on all platforms. --- configure | 11 ++--------- configure.ac | 6 +----- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/configure b/configure index b35568c..cb824be 100755 --- a/configure +++ b/configure @@ -17266,7 +17266,8 @@ case $host_os in ;; esac -case $host_cpu in +MAIN_BINARY="wine-pthread" + case $host_cpu in *i[3456789]86*) case $host_os in linux* | k*bsd*-gnu) @@ -17274,16 +17275,8 @@ case $host_cpu in EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader" ;; - darwin*|freebsd*) - MAIN_BINARY="wine-pthread" - ;; - *) - MAIN_BINARY="wine-kthread" - ;; esac ;; - *) MAIN_BINARY="wine-pthread" - ;; esac diff --git a/configure.ac b/configure.ac index 009cd13..e88a506 100644 --- a/configure.ac +++ b/configure.ac @@ -1215,19 +1215,15 @@ case $host_os in ;; esac +AC_SUBST(MAIN_BINARY,"wine-pthread") dnl Default value case $host_cpu in *i[[3456789]]86*) case $host_os in linux* | k*bsd*-gnu) AC_SUBST(MAIN_BINARY,"wine-glibc") AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;; - darwin*|freebsd*) - AC_SUBST(MAIN_BINARY,"wine-pthread") ;; - *) - AC_SUBST(MAIN_BINARY,"wine-kthread") ;; esac ;; - *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;; esac dnl **** Get the soname for libraries that we load dynamically ****

1 0

Alexandre Julliard : libwine: Better memory reservation algorithm for platforms that use try_mmap_fixed.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 0e2fcd4ba836d523bbad59cbeab12f5de1a86ca2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e2fcd4ba836d523bbad59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 20 19:07:03 2006 +0200 libwine: Better memory reservation algorithm for platforms that use try_mmap_fixed. --- libs/wine/mmap.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index bbfaea2..16bf302 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -229,7 +229,7 @@ static inline int mmap_reserve( void *ad #ifdef MAP_TRYFIXED flags |= MAP_TRYFIXED; -#elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) +#elif defined(__APPLE__) return try_mmap_fixed( addr, size, PROT_NONE, flags, get_fdzero(), 0 ); #endif ptr = mmap( addr, size, PROT_NONE, flags, get_fdzero(), 0 ); @@ -242,12 +242,34 @@ #endif * reserve_area * * Reserve as much memory as possible in the given area. - * FIXME: probably needs a different algorithm for Solaris */ static void reserve_area( void *addr, void *end ) { size_t size = (char *)end - (char *)addr; +#if (defined(__svr4__) || defined(__NetBSD__)) && !defined(MAP_TRYFIXED) + /* try_mmap_fixed is inefficient when using vfork, so we need a different algorithm here */ + /* we assume no other thread is running at this point */ + size_t i, pagesize = getpagesize(); + char vec; + + while (size) + { + for (i = 0; i < size; i += pagesize) + if (mincore( (caddr_t)addr + i, pagesize, &vec ) != -1) break; + + i &= ~granularity_mask; + if (i && mmap( addr, i, PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, + get_fdzero(), 0 ) != (void *)-1) + wine_mmap_add_reserved_area( addr, i ); + + i += granularity_mask + 1; + if ((char *)addr + i < (char *)addr) break; /* overflow */ + addr = (char *)addr + i; + if (addr >= end) break; + size = (char *)end - (char *)addr; + } +#else if (!size) return; if (mmap_reserve( addr, size )) @@ -261,6 +283,7 @@ static void reserve_area( void *addr, vo reserve_area( addr, (char *)addr + new_size ); reserve_area( (char *)addr + new_size, end ); } +#endif } @@ -298,7 +321,7 @@ void mmap_init(void) #if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ char stack; char * const stack_ptr = &stack; - char *user_space_limit = (char *)0x80000000; + char *user_space_limit = (char *)0x7ffe0000; /* check for a reserved area starting at the user space limit */ /* to avoid wasting time trying to allocate it again */

1 0

Alexandre Julliard : ntdll: Fixed tape.c compilation on Solaris.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 74b750d81b39639615e95a023c0db7d37047170f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74b750d81b39639615e95a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 20 20:20:45 2006 +0200 ntdll: Fixed tape.c compilation on Solaris. --- dlls/ntdll/tape.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 2767d1d..01cf797 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -36,6 +36,12 @@ #endif #if !defined(MTSETBLK) && defined(MTSETBSIZ) #define MTSETBLK MTSETBSIZ #endif +#if !defined(MTSETBLK) && defined(MTSRSZ) +#define MTSETBLK MTSRSZ +#endif +#ifndef MT_ST_BLKSIZE_MASK +#define MT_ST_BLKSIZE_MASK 0xffffff +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT

1 0

Huw Davies : rpcrt4: Don't use a short to hold the packet length, since it can
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 3a56eca1c7f67e166f00ecf19d5c8e980114138b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a56eca1c7f67e166f00ecf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 20 14:27:00 2006 +0100 rpcrt4: Don't use a short to hold the packet length, since it can result in premature termination of the send. --- dlls/rpcrt4/rpc_message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 06b17d3..fb6187f 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -282,7 +282,7 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon Header->common.flags &= ~RPC_FLG_LAST; while (!(Header->common.flags & RPC_FLG_LAST)) { unsigned char auth_pad_len = AuthLength ? ROUND_UP_AMOUNT(BufferLength, AUTH_ALIGNMENT) : 0; - unsigned short pkt_size = BufferLength + hdr_size + alen + auth_pad_len; + unsigned int pkt_size = BufferLength + hdr_size + alen + auth_pad_len; /* decide if we need to split the packet into fragments */ if (pkt_size <= Connection->MaxTransmissionSize) {

1 0