March 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msvcrt: Add __daylight() call export.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 78dc7af9ce625196f05179048acccfb6765e2731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78dc7af9ce625196f05179048… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 02:35:59 2011 +0300 msvcrt: Add __daylight() call export. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/time.c | 26 ++++++++++++++++++++++++++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1570fd4..1eca092 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -392,7 +392,7 @@ @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW -@ stub __daylight +@ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 65f9510..e7b26e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -205,7 +205,7 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW -@ stub __daylight +@ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index badfe65..9ba5bbc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -202,7 +202,7 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW -@ stub __daylight +@ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5d07736..440eeb8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -179,7 +179,7 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) -# stub __daylight +@ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno # stub __dstbias diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a56f53c..950042c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -42,6 +42,8 @@ static errno_t (__cdecl *p_strtime_s)(char*,size_t); static errno_t (__cdecl *p_strdate_s)(char*,size_t); static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); +static int* (__cdecl *p__daylight)(void); +static int* (__cdecl *p___p__daylight)(void); static void init(void) { @@ -54,6 +56,8 @@ static void init(void) p_strdate_s = (void*)GetProcAddress(hmod, "_strdate_s"); p_localtime32_s = (void*)GetProcAddress(hmod, "_localtime32_s"); p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); + p__daylight = (void*)GetProcAddress(hmod, "__daylight"); + p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); } static int get_test_year(time_t *start) @@ -543,6 +547,27 @@ static void test_localtime64_s(void) tm.tm_isdst); } +static void test_daylight(void) +{ + int *ret1, *ret2; + + if (!p__daylight) + { + win_skip("__daylight() not available\n"); + return; + } + + if (!p___p__daylight) + { + win_skip("__p__daylight not available\n"); + return; + } + + ret1 = p__daylight(); + ret2 = p___p__daylight(); + ok(ret1 && ret1 == ret2, "got %p\n", ret1); +} + START_TEST(time) { init(); @@ -557,4 +582,5 @@ START_TEST(time) test_wstrtime(); test_localtime32_s(); test_localtime64_s(); + test_daylight(); }

1 0

Nikolay Sivov : msvcrt: Add _findfirst32() implementation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: cd7f0962107f0630b72a2b9480394e660c983b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7f0962107f0630b72a2b948… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 03:01:43 2011 +0300 msvcrt: Add _findfirst32() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1eca092..c3dfa7d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -617,7 +617,7 @@ @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64 @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose -@ stub _findfirst32 +@ cdecl _findfirst32(str ptr) msvcrt._findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e7b26e7..a615c0d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -458,7 +458,7 @@ @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64 @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose -@ stub _findfirst32 +@ cdecl _findfirst32(str ptr) msvcrt._findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9ba5bbc..6b3e766 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -450,7 +450,7 @@ @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64 @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose -@ stub _findfirst32 +@ cdecl _findfirst32(str ptr) msvcrt._findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index a5c4974..712ffa9 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -56,6 +56,26 @@ static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata_t strcpy(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAA to finddata32_t */ +static void msvcrt_fttofd32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata32_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = fd->nFileSizeLow; + strcpy(ft->name, fd->cFileName); +} + /* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata_t */ static void msvcrt_wfttofd( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata_t* ft) { @@ -326,6 +346,25 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst(const char * fspec, struct MSVCRT__findd } /********************************************************************* + * _findfirst32 (MSVCRT.@) + */ +MSVCRT_intptr_t CDECL MSVCRT__findfirst32(const char * fspec, struct MSVCRT__finddata32_t* ft) +{ + WIN32_FIND_DATAA find_data; + HANDLE hfind; + + hfind = FindFirstFileA(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_fttofd32(&find_data, ft); + TRACE(":got handle %p\n", hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirst (MSVCRT.@) * * Unicode version of _findfirst. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 440eeb8..a4656a7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -411,6 +411,7 @@ @ cdecl _fileno(ptr) MSVCRT__fileno @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst +@ cdecl _findfirst32(str ptr) MSVCRT__findfirst32 @ cdecl _findfirst64(str ptr) MSVCRT__findfirst64 @ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64

1 0

Nikolay Sivov : msvcrt: Added _findnext32() implementation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 82763983dcffb5b8a72f1076ea6a350fac2f0298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82763983dcffb5b8a72f1076e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 03:06:17 2011 +0300 msvcrt: Added _findnext32() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c3dfa7d..7f6ac97 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -621,7 +621,7 @@ @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 -@ stub _findnext32 +@ cdecl _findnext32(long ptr) msvcrt._findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a615c0d..e4cf5cd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -462,7 +462,7 @@ @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 -@ stub _findnext32 +@ cdecl _findnext32(long ptr) msvcrt._findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6b3e766..515a6bd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -454,7 +454,7 @@ @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 -@ stub _findnext32 +@ cdecl _findnext32(long ptr) msvcrt._findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 712ffa9..fc7241f 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -542,6 +542,23 @@ int CDECL MSVCRT__findnext(MSVCRT_intptr_t hand, struct MSVCRT__finddata_t * ft) } /********************************************************************* + * _findnext32 (MSVCRT.@) + */ +int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t * ft) +{ + WIN32_FIND_DATAA find_data; + + if (!FindNextFileA((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_fttofd32(&find_data, ft); + return 0; +} + +/********************************************************************* * _wfindnext (MSVCRT.@) * * Unicode version of _findnext. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a4656a7..68eab2e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -416,6 +416,7 @@ @ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64 @ cdecl _findnext(long ptr) MSVCRT__findnext +@ cdecl _findnext32(long ptr) MSVCRT__findnext32 @ cdecl _findnext64(long ptr) MSVCRT__findnext64 @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64

1 0

Piotr Caban : shdocvw: Added IDocObjectService interface stub.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: d83dca09dfadc1b71a775f9b3a0a15175b53f8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83dca09dfadc1b71a775f9b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:58 2011 +0100 shdocvw: Added IDocObjectService interface stub. --- dlls/shdocvw/shellbrowser.c | 152 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shellbrowser.c b/dlls/shdocvw/shellbrowser.c index 6c86611..2715bcc 100644 --- a/dlls/shdocvw/shellbrowser.c +++ b/dlls/shdocvw/shellbrowser.c @@ -21,12 +21,14 @@ #include "wine/debug.h" #include "shdocvw.h" #include "shdeprecated.h" +#include "docobjectservice.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); typedef struct { IShellBrowser IShellBrowser_iface; IBrowserService IBrowserService_iface; + IDocObjectService IDocObjectService_iface; LONG ref; } ShellBrowser; @@ -49,6 +51,8 @@ static HRESULT WINAPI ShellBrowser_QueryInterface( *ppvObject = &This->IShellBrowser_iface; else if(IsEqualGUID(&IID_IBrowserService, riid)) *ppvObject = &This->IBrowserService_iface; + else if(IsEqualGUID(&IID_IDocObjectService, riid)) + *ppvObject = &This->IDocObjectService_iface; if(*ppvObject) { TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); @@ -606,6 +610,153 @@ static const IBrowserServiceVtbl BrowserServiceVtbl = { BrowserService_RegisterWindow }; +static inline ShellBrowser *impl_from_IDocObjectService(IDocObjectService *iface) +{ + return CONTAINING_RECORD(iface, ShellBrowser, IDocObjectService_iface); +} + +static HRESULT WINAPI DocObjectService_QueryInterface( + IDocObjectService* iface, + REFIID riid, + void **ppvObject) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + return IShellBrowser_QueryInterface(&This->IShellBrowser_iface, riid, ppvObject); +} + +static ULONG WINAPI DocObjectService_AddRef( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + return IShellBrowser_AddRef(&This->IShellBrowser_iface); +} + +static ULONG WINAPI DocObjectService_Release( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + return IShellBrowser_Release(&This->IShellBrowser_iface); +} + +static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( + IDocObjectService* iface, + IDispatch *pDispatch, + LPCWSTR lpszUrl, + DWORD dwFlags, + LPCWSTR lpszFrameName, + BYTE *pPostData, + DWORD cbPostData, + LPCWSTR lpszHeaders, + BOOL fPlayNavSound, + BOOL *pfCancel) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), + dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, + debugstr_w(lpszHeaders), fPlayNavSound, pfCancel); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireNavigateComplete2( + IDocObjectService* iface, + IHTMLWindow2 *pHTMLWindow2, + DWORD dwFlags) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p %x\n", This, pHTMLWindow2, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadBegin( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadComplete( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDocumentComplete( + IDocObjectService* iface, + IHTMLWindow2 *pHTMLWindow, + DWORD dwFlags) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p %x\n", This, pHTMLWindow, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( + IDocObjectService* iface, + IHTMLWindow2 *pHTMLWindow) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pHTMLWindow); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetPendingUrl( + IDocObjectService* iface, + BSTR *pbstrPendingUrl) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pbstrPendingUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_ActiveElementChanged( + IDocObjectService* iface, + IHTMLElement *pHTMLElement) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pHTMLElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetUrlSearchComponent( + IDocObjectService* iface, + BSTR *pbstrSearch) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pbstrSearch); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_IsErrorUrl( + IDocObjectService* iface, + LPCWSTR lpszUrl, + BOOL *pfIsError) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %s %p\n", This, debugstr_w(lpszUrl), pfIsError); + + *pfIsError = FALSE; + return S_OK; +} + +static const IDocObjectServiceVtbl DocObjectServiceVtbl = { + DocObjectService_QueryInterface, + DocObjectService_AddRef, + DocObjectService_Release, + DocObjectService_FireBeforeNavigate2, + DocObjectService_FireNavigateComplete2, + DocObjectService_FireDownloadBegin, + DocObjectService_FireDownloadComplete, + DocObjectService_FireDocumentComplete, + DocObjectService_UpdateDesktopComponent, + DocObjectService_GetPendingUrl, + DocObjectService_ActiveElementChanged, + DocObjectService_GetUrlSearchComponent, + DocObjectService_IsErrorUrl +}; + HRESULT ShellBrowser_Create(IShellBrowser **ppv) { ShellBrowser *sb = heap_alloc(sizeof(ShellBrowser)); @@ -614,6 +765,7 @@ HRESULT ShellBrowser_Create(IShellBrowser **ppv) sb->IShellBrowser_iface.lpVtbl = &ShellBrowserVtbl; sb->IBrowserService_iface.lpVtbl = &BrowserServiceVtbl; + sb->IDocObjectService_iface.lpVtbl = &DocObjectServiceVtbl; sb->ref = 1;

1 0

Piotr Caban : shdocvw: Use IID_IBrowserService2 defined in header.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: f1f645b345f8c47b4669ef5cb82c41847775aca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f645b345f8c47b4669ef5cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:50:08 2011 +0100 shdocvw: Use IID_IBrowserService2 defined in header. --- dlls/shdocvw/tests/webbrowser.c | 3 +-- dlls/shdocvw/webbrowser.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1088065..e54e35d 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -36,6 +36,7 @@ #include "olectl.h" #include "mshtmdid.h" #include "shobjidl.h" +#include "shdeprecated.h" #include "shlguid.h" #include "exdispid.h" #include "mimeinfo.h" @@ -2643,8 +2644,6 @@ static void test_IServiceProvider(IUnknown *unk) IServiceProvider *servprov = (void*)0xdeadbeef; HRESULT hres; IUnknown *ret = NULL; - static const IID IID_IBrowserService2 = - {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index a0a8020..5df1f03 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -23,6 +23,7 @@ #include "shdocvw.h" #include "exdispid.h" #include "mshtml.h" +#include "shdeprecated.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -1140,8 +1141,6 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider REFGUID guidService, REFIID riid, void **ppv) { WebBrowser *This = impl_from_IServiceProvider(iface); - static const IID IID_IBrowserService2 = - {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; if(*ppv) ppv = NULL;

1 0

Piotr Caban : shdocvw/tests: Added IShellBrowser, IBrowserService and IDocObjectService existence tests.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: a13fce16a44909249f2252c01674c71021d56c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13fce16a44909249f2252c01… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:50:18 2011 +0100 shdocvw/tests: Added IShellBrowser, IBrowserService and IDocObjectService existence tests. --- dlls/shdocvw/tests/webbrowser.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index e54e35d..e433b13 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -41,6 +41,7 @@ #include "exdispid.h" #include "mimeinfo.h" #include "hlink.h" +#include "docobjectservice.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); @@ -2963,6 +2964,18 @@ static void test_dochost_qs(IUnknown *unk) ok(iface_cmp(service, unk), "service != unk\n"); IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IShellBrowser, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + IUnknown_Release(service); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IBrowserService, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + IUnknown_Release(service); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IDocObjectService, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + IUnknown_Release(service); + IServiceProvider_Release(serv_prov); }

1 0

Vincent Povirk : gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 77f5a07c1bd351524fe294b051aee7f37a7f77ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f5a07c1bd351524fe294b05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:17:20 2011 -0600 gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion. We can always do a fill directly to the image bits when gdi32 can do it. --- dlls/gdiplus/graphics.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 29dea0a..4d059f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3919,9 +3919,6 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if (stat == NotImplemented) stat = SOFTWARE_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented && graphics->image) - stat = GDI32_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented) { FIXME("not implemented for brushtype %i\n", brush->bt);

1 0

Vincent Povirk : gdiplus: Call GdiAlphaBlend only once per GdipFillRegion call.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 833316f91d428955744f88ee02c71f4bad38e4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=833316f91d428955744f88ee0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 15:58:22 2011 -0600 gdiplus: Call GdiAlphaBlend only once per GdipFillRegion call. --- dlls/gdiplus/graphics.c | 93 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 72 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4d059f8..83e0f24 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3856,39 +3856,90 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, if (stat == Ok) { - UINT max_size=0; - - for (i=0; i<scans_count; i++) + if (!graphics->image) { - UINT size = scans[i].Width * scans[i].Height; + /* If we have to go through gdi32, use as few alpha blends as possible. */ + INT min_x, min_y, max_x, max_y; + UINT data_width, data_height; - if (size > max_size) - max_size = size; - } + min_x = scans[0].X; + min_y = scans[0].Y; + max_x = scans[0].X+scans[0].Width; + max_y = scans[0].Y+scans[0].Height; - pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); - if (!pixel_data) - stat = OutOfMemory; + for (i=1; i<scans_count; i++) + { + min_x = min(min_x, scans[i].X); + min_y = min(min_y, scans[i].Y); + max_x = max(max_x, scans[i].X+scans[i].Width); + max_y = max(max_y, scans[i].Y+scans[i].Height); + } - if (stat == Ok) - { - for (i=0; i<scans_count; i++) + data_width = max_x - min_x; + data_height = max_y - min_y; + + pixel_data = GdipAlloc(sizeof(*pixel_data) * data_width * data_height); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) { - stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], - scans[i].Width); + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, + pixel_data + (scans[i].X - min_x) + (scans[i].Y - min_y) * data_width, + &scans[i], data_width); + + if (stat != Ok) + break; + } if (stat == Ok) { - stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, - (BYTE*)pixel_data, scans[i].Width, scans[i].Height, - scans[i].Width * 4); + stat = alpha_blend_pixels(graphics, min_x, min_y, + (BYTE*)pixel_data, data_width, data_height, + data_width * 4); } - if (stat != Ok) - break; + GdipFree(pixel_data); } + } + else + { + UINT max_size=0; - GdipFree(pixel_data); + for (i=0; i<scans_count; i++) + { + UINT size = scans[i].Width * scans[i].Height; + + if (size > max_size) + max_size = size; + } + + pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) + { + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], + scans[i].Width); + + if (stat == Ok) + { + stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, + (BYTE*)pixel_data, scans[i].Width, scans[i].Height, + scans[i].Width * 4); + } + + if (stat != Ok) + break; + } + + GdipFree(pixel_data); + } } GdipFree(scans);

1 0

Vincent Povirk : gdiplus: Add software implementation of GdipFillPath.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: b5c2015999853030905ddae129a26a512825064b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c2015999853030905ddae12… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:16:26 2011 -0600 gdiplus: Add software implementation of GdipFillPath. --- dlls/gdiplus/graphics.c | 66 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 83e0f24..978e12b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3402,24 +3402,13 @@ GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x return GdipFillEllipse(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height); } -GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { INT save_state; GpStatus retval; - TRACE("(%p, %p, %p)\n", graphics, brush, path); - - if(!brush || !graphics || !path) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } + if(!graphics->hdc || !brush_can_fill_path(brush)) + return NotImplemented; save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); @@ -3444,6 +3433,55 @@ end: return retval; } +static GpStatus SOFTWARE_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + GpStatus stat; + GpRegion *rgn; + + if (!brush_can_fill_pixels(brush)) + return NotImplemented; + + /* FIXME: This could probably be done more efficiently without regions. */ + + stat = GdipCreateRegionPath(path, &rgn); + + if (stat == Ok) + { + stat = GdipFillRegion(graphics, brush, rgn); + + GdipDeleteRegion(rgn); + } + + return stat; +} + +GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + GpStatus stat = NotImplemented; + + TRACE("(%p, %p, %p)\n", graphics, brush, path); + + if(!brush || !graphics || !path) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if (!graphics->image) + stat = GDI32_GdipFillPath(graphics, brush, path); + + if (stat == NotImplemented) + stat = SOFTWARE_GdipFillPath(graphics, brush, path); + + if (stat == NotImplemented) + { + FIXME("Not implemented for brushtype %i\n", brush->bt); + stat = Ok; + } + + return stat; +} + GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) {

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillEllipse.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4aa99eaf3b1981f89632674dbb7b2adbce163aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa99eaf3b1981f89632674db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:29:08 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillEllipse. --- dlls/gdiplus/graphics.c | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 978e12b..6682f74 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3355,9 +3355,8 @@ GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[2]; - POINT pti[2]; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height); @@ -3367,31 +3366,19 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 2); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathEllipse(path, x, y, width, height); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x,

1 0