January 2012 - Wine-commits

André Hentschel : po: Update German translation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: a86b765a50cdf76e66c8993977f892d825f52ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86b765a50cdf76e66c899397… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 5 19:35:14 2012 +0100 po: Update German translation. --- po/de.po | 149 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 75 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a86b765a50cdf76e66c89…

1 0

Piotr Caban : msvcp60: Added full basic_string::_Grow implementation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 568c3215b005fb3a428b19e31ba62f5066a2fd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=568c3215b005fb3a428b19e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 5 16:04:11 2012 +0100 msvcp60: Added full basic_string::_Grow implementation. --- dlls/msvcp60/string.c | 166 +++++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 82 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 056f915..5b9eeb5 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -167,7 +167,48 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil memset(this, 0, sizeof(*this)); } -MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char*, MSVCP_size_t, MSVCP_bool); +/* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAE_NI_N(a)Z */ +/* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAA_N_K_N(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char__Grow, 12) +MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, MSVCP_size_t new_size, MSVCP_bool trim) +{ + if(!new_size) { + if(trim) + basic_string_char__Tidy(this, TRUE); + else if(this->ptr) + basic_string_char__Eos(this, 0); + } else if(this->res<new_size || trim || + (this->ptr && this->ptr[-1] && (unsigned char)this->ptr[-1]!=FROZEN)) { + MSVCP_size_t new_res = new_size, len = this->size; + char *ptr; + + if(!trim && this->ptr && !this->ptr[-1]) { + new_res |= 0xf; + if(new_res/3 < this->res/2) + new_res = this->res + this->res/2; + } + + ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+2); + if(!ptr) { + new_res = new_size; + ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+2); + } + if(!ptr) { + ERR("Out of memory\n"); + return FALSE; + } + + *ptr = 0; + if(this->ptr) + char_traits_char__Copy_s(ptr+1, new_size, this->ptr, this->size); + basic_string_char__Tidy(this, TRUE); + this->ptr = ptr+1; + this->res = new_res; + basic_string_char__Eos(this, len>new_res ? new_res : len); + } + + return new_size>0; +} /* ?_Split@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEXXZ */ /* ?_Split@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAXXZ */ @@ -191,46 +232,6 @@ void __thiscall basic_string_char__Split(basic_string_char *this) } } -/* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAE_NI_N(a)Z */ -/* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAA_N_K_N(a)Z */ -DEFINE_THISCALL_WRAPPER(basic_string_char__Grow, 12) -MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, MSVCP_size_t new_size, MSVCP_bool trim) -{ - /* Fixme: grow string using one reallocation, don't ignore trim flag */ - basic_string_char__Split(this); - - if(this->res < new_size) { - MSVCP_size_t new_res = new_size, len = this->size; - char *ptr; - - new_res |= 0xf; - - if(new_res/3 < this->res/2) - new_res = this->res + this->res/2; - - ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+1); - if(!ptr) - ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+1); - else - new_size = new_res; - if(!ptr) { - ERR("Out of memory\n"); - basic_string_char__Tidy(this, TRUE); - return FALSE; - } - - if(this->ptr) - char_traits_char__Copy_s(ptr, new_size, this->ptr, this->size); - basic_string_char__Tidy(this, TRUE); - this->ptr = ptr; - this->res = new_size; - basic_string_char__Eos(this, len); - } else if(new_size == 0) - basic_string_char__Eos(this, 0); - - return (new_size>0); -} - /* ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEXXZ */ /* ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAXXZ */ DEFINE_THISCALL_WRAPPER(basic_string_char__Freeze, 4) @@ -1862,7 +1863,48 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu memset(this, 0, sizeof(*this)); } -MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar*, MSVCP_size_t, MSVCP_bool); +/* ?_Grow@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAE_NI_N(a)Z */ +/* ?_Grow@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAA_N_K_N(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_wchar__Grow, 12) +MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, MSVCP_size_t new_size, MSVCP_bool trim) +{ + if(!new_size) { + if(trim) + basic_string_wchar__Tidy(this, TRUE); + else if(this->ptr) + basic_string_wchar__Eos(this, 0); + } else if(this->res<new_size || trim || + (this->ptr && this->ptr[-1] && (unsigned short)this->ptr[-1]!=FROZEN)) { + MSVCP_size_t new_res = new_size, len = this->size; + wchar_t *ptr; + + if(!trim && this->ptr && !this->ptr[-1]) { + new_res |= 0xf; + if(new_res/3 < this->res/2) + new_res = this->res + this->res/2; + } + + ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+2); + if(!ptr) { + new_res = new_size; + ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+2); + } + if(!ptr) { + ERR("Out of memory\n"); + return FALSE; + } + + *ptr = 0; + if(this->ptr) + char_traits_wchar__Copy_s(ptr+1, new_size, this->ptr, this->size); + basic_string_wchar__Tidy(this, TRUE); + this->ptr = ptr+1; + this->res = new_res; + basic_string_wchar__Eos(this, len>new_res ? new_res : len); + } + + return new_size>0; +} /* ?_Split@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEXXZ */ /* ?_Split@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAAXXZ */ @@ -1886,46 +1928,6 @@ void __thiscall basic_string_wchar__Split(basic_string_wchar *this) } } -/* ?_Grow@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAE_NI_N(a)Z */ -/* ?_Grow@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAA_N_K_N(a)Z */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar__Grow, 12) -MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, MSVCP_size_t new_size, MSVCP_bool trim) -{ - /* Fixme: grow string using one reallocation, don't ignore trim flag */ - basic_string_wchar__Split(this); - - if(this->res < new_size) { - MSVCP_size_t new_res = new_size, len = this->size; - wchar_t *ptr; - - new_res |= 0xf; - - if(new_res/3 < this->res/2) - new_res = this->res + this->res/2; - - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+1); - if(!ptr) - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+1); - else - new_size = new_res; - if(!ptr) { - ERR("Out of memory\n"); - basic_string_wchar__Tidy(this, TRUE); - return FALSE; - } - - if(this->ptr) - char_traits_wchar__Copy_s(ptr, new_size, this->ptr, this->size); - basic_string_wchar__Tidy(this, TRUE); - this->ptr = ptr; - this->res = new_size; - basic_string_wchar__Eos(this, len); - } else if(new_size == 0) - basic_string_wchar__Eos(this, 0); - - return (new_size>0); -} - /* ?_Freeze@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEXXZ */ /* ?_Freeze@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAAXXZ */ DEFINE_THISCALL_WRAPPER(basic_string_wchar__Freeze, 4)

1 0

Daniel Lehman : msvcp90: Make type_info::mangled larger.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: c20fd880acad6a79250e672c25b82bf76f15402d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20fd880acad6a79250e672c2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 3 17:10:17 2012 -0800 msvcp90: Make type_info::mangled larger. --- dlls/msvcp90/msvcp90.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index bdeaa80..a57eedf 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -172,8 +172,8 @@ void set_exception_vtable(void); typedef struct __type_info { const vtable_ptr *vtable; - char *name; /* Unmangled name, allocated lazily */ - char mangled[64]; /* Variable length, but we declare it large enough for static RTTI */ + char *name; /* Unmangled name, allocated lazily */ + char mangled[128]; /* Variable length, but we declare it large enough for static RTTI */ } type_info; /* offsets for computing the this pointer */

1 0

Daniel Lehman : msvcp90: Add num_get<wchar_t> stubs.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 0af4827e11d6a821a7c6833a04f4899de76a271b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af4827e11d6a821a7c6833a0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 3 16:37:16 2012 -0800 msvcp90: Add num_get<wchar_t> stubs. --- dlls/msvcp90/locale.c | 344 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 132 +++++++++--------- 2 files changed, 410 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0af4827e11d6a821a7c68…

1 0

Daniel Lehman : msvcp90: basic_string<>::rfind(ch) should call rfind.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 8e755152c2117842bdd9312d772718672f809dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e755152c2117842bdd9312d7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Dec 30 09:25:47 2011 -0800 msvcp90: basic_string<>::rfind(ch) should call rfind. --- dlls/msvcp90/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 1479780..5815197 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1658,7 +1658,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_rfind_ch, 12) MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_ch( const basic_string_char *this, char ch, MSVCP_size_t pos) { - return MSVCP_basic_string_char_find_cstr_substr(this, &ch, pos, 1); + return MSVCP_basic_string_char_rfind_cstr_substr(this, &ch, pos, 1); } /* ?find_first_of@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z */ @@ -3652,7 +3652,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_rfind_ch, 12) MSVCP_size_t __thiscall MSVCP_basic_string_wchar_rfind_ch( const basic_string_wchar *this, wchar_t ch, MSVCP_size_t pos) { - return MSVCP_basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); + return MSVCP_basic_string_wchar_rfind_cstr_substr(this, &ch, pos, 1); } /* ?find_first_of@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z */

1 0

Jörg Höhle : winmm: Fix conversion to MMTIME, avoid floating point arithmetic.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 9ef4a0099c95abf458f22d29c73b8421a33546b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef4a0099c95abf458f22d29c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 4 20:54:48 2012 +0100 winmm: Fix conversion to MMTIME, avoid floating point arithmetic. --- dlls/winmm/tests/wave.c | 8 ++++---- dlls/winmm/waveform.c | 27 ++++++++++----------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 55bd8be..a7614a5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -471,10 +471,10 @@ DWORD time_to_bytes(LPMMTIME mmtime, LPWAVEFORMATEX pwfx) else if (mmtime->wType == TIME_MS) return mmtime->u.ms * pwfx->nAvgBytesPerSec / 1000; else if (mmtime->wType == TIME_SMPTE) - return ((mmtime->u.smpte.hour * 60.0 * 60.0) + - (mmtime->u.smpte.min * 60.0) + - (mmtime->u.smpte.sec) + - (mmtime->u.smpte.frame / 30.0)) * pwfx->nAvgBytesPerSec; + return ((mmtime->u.smpte.hour * 60 * 60) + + (mmtime->u.smpte.min * 60) + + (mmtime->u.smpte.sec)) * pwfx->nAvgBytesPerSec + + mmtime->u.smpte.frame * pwfx->nAvgBytesPerSec / 30; trace("FIXME: time_to_bytes() type not supported\n"); return -1; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 041b63f..b940b4f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1723,32 +1723,25 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, time->u.sample = played_frames; return MMSYSERR_NOERROR; case TIME_MS: - time->u.ms = (DWORD)((played_frames / (double)sample_rate) * 1000); + time->u.ms = (UINT64)played_frames * 1000 / sample_rate; return MMSYSERR_NOERROR; case TIME_SMPTE: time->u.smpte.fps = 30; - if(played_frames >= sample_rate){ - time->u.smpte.sec = played_frames / (double)sample_rate; - time->u.smpte.min = time->u.smpte.sec / 60; - time->u.smpte.hour = time->u.smpte.min / 60; - time->u.smpte.sec %= 60; - time->u.smpte.min %= 60; - played_frames %= sample_rate; - }else{ - time->u.smpte.sec = 0; - time->u.smpte.min = 0; - time->u.smpte.hour = 0; - } - time->u.smpte.frame = (played_frames / (double)sample_rate) * 30; + played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */ + time->u.smpte.frame = (played_frames % sample_rate) * time->u.smpte.fps / sample_rate; + played_frames /= sample_rate; /* yields seconds */ + time->u.smpte.sec = played_frames % 60; + played_frames /= 60; + time->u.smpte.min = played_frames % 60; + time->u.smpte.hour= played_frames / 60; return MMSYSERR_NOERROR; - case TIME_BYTES: default: time->wType = TIME_BYTES; + /* fall through */ + case TIME_BYTES: time->u.cb = played_frames * bytes_per_frame; return MMSYSERR_NOERROR; } - - return MMSYSERR_ERROR; } static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time)

1 0

Francois Gouget : wineboot: Store the RunKey names in regular string variables.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: a0f04767078764636d1bc58c2df0dbd689012469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f04767078764636d1bc58c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 5 19:05:51 2012 +0100 wineboot: Store the RunKey names in regular string variables. --- programs/wineboot/wineboot.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index d020f37..aac17ec 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -570,18 +570,6 @@ end: return res; } -enum runkeys { - RUNKEY_RUN, RUNKEY_RUNONCE, RUNKEY_RUNSERVICES, RUNKEY_RUNSERVICESONCE -}; - -static const WCHAR runkeys_names[][30]= -{ - {'R','u','n',0}, - {'R','u','n','O','n','c','e',0}, - {'R','u','n','S','e','r','v','i','c','e','s',0}, - {'R','u','n','S','e','r','v','i','c','e','s','O','n','c','e',0} -}; - #define INVALID_RUNCMD_RETURN -1 /* * This function runs the specified command in the specified dir. @@ -1132,6 +1120,10 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { extern HANDLE CDECL __wine_make_process_system(void); + static const WCHAR RunW[] = {'R','u','n',0}; + static const WCHAR RunOnceW[] = {'R','u','n','O','n','c','e',0}; + static const WCHAR RunServicesW[] = {'R','u','n','S','e','r','v','i','c','e','s',0}; + static const WCHAR RunServicesOnceW[] = {'R','u','n','S','e','r','v','i','c','e','s','O','n','c','e',0}; static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0}; /* First, set the current directory to SystemRoot */ @@ -1212,23 +1204,23 @@ int main( int argc, char *argv[] ) pendingRename(); ProcessWindowsFileProtection(); - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE ); + ProcessRunKeys( HKEY_LOCAL_MACHINE, RunServicesOnceW, TRUE, FALSE ); if (init || (kill && !restart)) { - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); + ProcessRunKeys( HKEY_LOCAL_MACHINE, RunServicesW, FALSE, FALSE ); start_services_process(); } if (init || update) update_wineprefix( update ); create_volatile_environment_registry_key(); - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); + ProcessRunKeys( HKEY_LOCAL_MACHINE, RunOnceW, TRUE, TRUE ); if (!init && !restart) { - ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE ); - ProcessRunKeys( HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE ); + ProcessRunKeys( HKEY_LOCAL_MACHINE, RunW, FALSE, FALSE ); + ProcessRunKeys( HKEY_CURRENT_USER, RunW, FALSE, FALSE ); ProcessStartupItems(); }

1 0

Jacek Caban : mshtml: Use a helper function for QueryService calls in hlink_frame_navigate.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 6363796e098c33b159295dc7f7ffb8c0a29075dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6363796e098c33b159295dc7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 18:30:27 2012 +0100 mshtml: Use a helper function for QueryService calls in hlink_frame_navigate. --- dlls/mshtml/main.c | 14 ++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/navigate.c | 9 +-------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index a00c274..e82e8e2 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -125,6 +125,20 @@ void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) heap_free(p); } +HRESULT do_query_service(IUnknown *unk, REFGUID guid_service, REFIID riid, void **ppv) +{ + IServiceProvider *sp; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&sp); + if(FAILED(hres)) + return hres; + + hres = IServiceProvider_QueryService(sp, guid_service, riid, ppv); + IServiceProvider_Release(sp); + return hres; +} + HINSTANCE get_shdoclc(void) { static const WCHAR wszShdoclc[] = diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8ca248a..0c6d73f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -828,6 +828,8 @@ void do_ns_command(HTMLDocument*,const char*,nsICommandParams*) DECLSPEC_HIDDEN; void update_doc(HTMLDocument*,DWORD) DECLSPEC_HIDDEN; void update_title(HTMLDocumentObj*) DECLSPEC_HIDDEN; +HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN; + /* editor */ void init_editor(HTMLDocument*) DECLSPEC_HIDDEN; void handle_edit_event(HTMLDocument*,nsIDOMEvent*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9556a00..bfee591 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1981,7 +1981,6 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne { IHlinkFrame *hlink_frame; nsChannelBSC *callback; - IServiceProvider *sp; IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; @@ -1989,14 +1988,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne *cancel = FALSE; - hres = IOleClientSite_QueryInterface(doc->doc_obj->client, &IID_IServiceProvider, - (void**)&sp); - if(FAILED(hres)) - return S_OK; - - hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, + hres = do_query_service((IUnknown*)doc->doc_obj->client, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hlink_frame); - IServiceProvider_Release(sp); if(FAILED(hres)) return S_OK;

1 0

Jacek Caban : mshtml: Use QueryService helper function in SetClientSite implementation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 986800701b2c7a1d1963fe68d5a193bb5047735e URL: http://source.winehq.org/git/wine.git/?a=commit;h=986800701b2c7a1d1963fe68d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 18:30:36 2012 +0100 mshtml: Use QueryService helper function in SetClientSite implementation. --- dlls/mshtml/oleobj.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index e5c0235..e207066 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -203,41 +203,34 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; if(!hostui_setup) { - IServiceProvider *sp; + IDocObjectService *doc_object_service; + IBrowserService *browser_service; + IWebBrowser2 *wb; V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)&This->window->IHTMLWindow2_iface; IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); - hres = IOleClientSite_QueryInterface(pClientSite, &IID_IServiceProvider, (void**)&sp); + hres = do_query_service((IUnknown*)pClientSite, &IID_IShellBrowser, + &IID_IBrowserService, (void**)&browser_service); if(SUCCEEDED(hres)) { - IDocObjectService *doc_object_service; - IBrowserService *browser_service; - IWebBrowser2 *wb; - - hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, - &IID_IBrowserService, (void**)&browser_service); + hres = IBrowserService_QueryInterface(browser_service, + &IID_IDocObjectService, (void**)&doc_object_service); if(SUCCEEDED(hres)) { - hres = IBrowserService_QueryInterface(browser_service, - &IID_IDocObjectService, (void**)&doc_object_service); + This->doc_obj->doc_object_service = doc_object_service; + + /* + * Some embedding routines, esp. in regards to use of IDocObjectService, differ if + * embedder supports IWebBrowserApp. + */ + hres = do_query_service((IUnknown*)pClientSite, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); if(SUCCEEDED(hres)) { - This->doc_obj->doc_object_service = doc_object_service; - - /* - * Some embedding routines, esp. in regards to use of IDocObjectService, differ if - * embedder supports IWebBrowserApp. - */ - hres = IServiceProvider_QueryService(sp, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); - if(SUCCEEDED(hres)) { - This->doc_obj->is_webbrowser = TRUE; - IWebBrowser2_Release(wb); - } + This->doc_obj->is_webbrowser = TRUE; + IWebBrowser2_Release(wb); } IBrowserService_Release(browser_service); } - - IServiceProvider_Release(sp); } }

1 0

Jacek Caban : mshtml: Use do_query_service in QueryService implementation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: d0f6e349b012e4ab3155bc046a755d6e3485f561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f6e349b012e4ab3155bc046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 18:30:46 2012 +0100 mshtml: Use do_query_service in QueryService implementation. --- dlls/mshtml/service.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index df05245..ed95f49 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -252,18 +252,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { - IServiceProvider *sp; HRESULT hres; - hres = IOleClientSite_QueryInterface(This->doc_obj->client, - &IID_IServiceProvider, (void**)&sp); - if(SUCCEEDED(hres)) { - hres = IServiceProvider_QueryService(sp, guidService, riid, ppv); - IServiceProvider_Release(sp); - - if(SUCCEEDED(hres)) - return hres; - } + hres = do_query_service((IUnknown*)This->doc_obj->client, guidService, riid, ppv); + if(SUCCEEDED(hres)) + return hres; } FIXME("unknown service %s\n", debugstr_guid(guidService));

1 0