September 2012 - Wine-Commits

Jacek Caban : jscript: Fixed conversion in place in IVariantChangeType:: ChangeType.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: c0d2029560372974001f75acbbaebda54473a51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d2029560372974001f75acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 18:00:33 2012 +0200 jscript: Fixed conversion in place in IVariantChangeType::ChangeType. --- dlls/jscript/jscript.c | 14 +++++++++++--- dlls/jscript/tests/caller.c | 10 ++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9704e4e..e38987c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1007,20 +1007,28 @@ static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) { JScript *This = impl_from_IVariantChangeType(iface); + VARIANT res; HRESULT hres; - TRACE("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + TRACE("(%p)->(%p %p%s %x %d)\n", This, dst, src, debugstr_variant(src), lcid, vt); if(!This->ctx) { FIXME("Object uninitialized\n"); return E_UNEXPECTED; } - hres = VariantClear(dst); + hres = variant_change_type(This->ctx, &res, src, vt); if(FAILED(hres)) return hres; - return variant_change_type(This->ctx, dst, src, vt); + hres = VariantClear(dst); + if(FAILED(hres)) { + VariantClear(&res); + return hres; + } + + *dst = res; + return S_OK; } static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 6fef7f1..f09ad90 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -168,6 +168,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_disp) { VARIANT v, dst; + BSTR str; HRESULT hres; static const conv_results_t bool_results[] = { @@ -214,6 +215,15 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di hres = IVariantChangeType_ChangeType(change_type, &dst, &v, 0, VT_I4); ok(hres == DISP_E_BADVARTYPE, "ChangeType failed: %08x, expected DISP_E_BADVARTYPE\n", hres); ok(V_VT(&dst) == 0xdead, "V_VT(dst) = %d\n", V_VT(&dst)); + + /* Test conversion in place */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = str = a2bstr("test"); + hres = IVariantChangeType_ChangeType(change_type, &v, &v, 0, VT_BSTR); + ok(hres == S_OK, "ChangeType failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BSTR(&v) != str, "V_BSTR(v) == str\n"); + ok(!strcmp_wa(V_BSTR(&v), "test"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); } static void test_caller(IServiceProvider *caller, IDispatch *arg_obj)

1 0

Christian Costa : dmusic: Rename params in IDirectMusic8Impl_GetDefaultPort .
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 27b2868899288613acd6378f93e8143afee2b239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b2868899288613acd6378f9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 21 11:46:57 2012 +0200 dmusic: Rename params in IDirectMusic8Impl_GetDefaultPort. --- dlls/dmusic/dmusic.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index b4b35ec..2977cd9 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -248,29 +248,30 @@ static HRESULT WINAPI IDirectMusic8Impl_Activate(LPDIRECTMUSIC8 iface, BOOL enab return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPGUID pguidPort) +static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPGUID guid_port) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - HKEY hkGUID; - DWORD returnTypeGUID, sizeOfReturnBuffer = 50; - char returnBuffer[51]; - GUID defaultPortGUID; - WCHAR buff[51]; - - TRACE("(%p, %p)\n", This, pguidPort); - if ((RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\DirectMusic\\Defaults" , 0, KEY_READ, &hkGUID) != ERROR_SUCCESS) || - (RegQueryValueExA(hkGUID, "DefaultOutputPort", NULL, &returnTypeGUID, (LPBYTE)returnBuffer, &sizeOfReturnBuffer) != ERROR_SUCCESS)) - { - WARN(": registry entry missing\n" ); - *pguidPort = CLSID_DirectMusicSynth; - return S_OK; - } - /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff) / sizeof(WCHAR)); - CLSIDFromString(buff, &defaultPortGUID); - *pguidPort = defaultPortGUID; - - return S_OK; + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + HKEY hkGUID; + DWORD returnTypeGUID, sizeOfReturnBuffer = 50; + char returnBuffer[51]; + GUID defaultPortGUID; + WCHAR buff[51]; + + TRACE("(%p)->(%p)\n", This, guid_port); + + if ((RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\DirectMusic\\Defaults" , 0, KEY_READ, &hkGUID) != ERROR_SUCCESS) || + (RegQueryValueExA(hkGUID, "DefaultOutputPort", NULL, &returnTypeGUID, (LPBYTE)returnBuffer, &sizeOfReturnBuffer) != ERROR_SUCCESS)) + { + WARN(": registry entry missing\n" ); + *guid_port = CLSID_DirectMusicSynth; + return S_OK; + } + /* FIXME: Check return types to ensure we're interpreting data right */ + MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff) / sizeof(WCHAR)); + CLSIDFromString(buff, &defaultPortGUID); + *guid_port = defaultPortGUID; + + return S_OK; } static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(LPDIRECTMUSIC8 iface, LPDIRECTSOUND dsound, HWND wnd)

1 0

Huw Davies : comdlg32: Make the unicode copy the same size as the ansi version.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 914353d3dcf2f554e5cc5294d81499efa81a13d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914353d3dcf2f554e5cc5294d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:46 2012 +0100 comdlg32: Make the unicode copy the same size as the ansi version. --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index f0763c5..dcef99e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -758,7 +758,6 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, { UNICODE_STRING usBuffer; - ofnW->lStructSize = sizeof(OPENFILENAMEW); ofnW->hwndOwner = ofnA->hwndOwner; ofnW->hInstance = ofnA->hInstance; if (ofnA->lpstrFilter) @@ -935,7 +934,8 @@ static PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) if (lfs->ofnA->Flags & OFN_ENABLEHOOK) if (lfs->ofnA->lpfnHook) lfs->hook = TRUE; - lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lfs->ofnW)); + lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lfs->ofnA->lStructSize); + lfs->ofnW->lStructSize = lfs->ofnA->lStructSize; FD31_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open); }

1 0

Huw Davies : comdlg32: Add structure size checks.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 4c47385ea57ddcd35262590d6ee8d2a7bc2a3e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c47385ea57ddcd35262590d6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:51 2012 +0100 comdlg32: Add structure size checks. --- dlls/comdlg32/filedlg.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 3df67df..9ccd25c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -4024,6 +4024,12 @@ static void MemFree(void *mem) HeapFree(GetProcessHeap(),0,mem); } +static inline BOOL valid_struct_size( DWORD size ) +{ + return (size == OPENFILENAME_SIZE_VERSION_400W) || + (size == sizeof( OPENFILENAMEW )); +} + static inline BOOL is_win16_looks(DWORD flags) { return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) && @@ -4047,6 +4053,12 @@ BOOL WINAPI GetOpenFileNameA( { TRACE("flags %08x\n", ofn->Flags); + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; @@ -4072,6 +4084,12 @@ BOOL WINAPI GetOpenFileNameW( { TRACE("flags %08x\n", ofn->Flags); + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; @@ -4096,6 +4114,12 @@ BOOL WINAPI GetOpenFileNameW( BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + if (is_win16_looks(ofn->Flags)) return GetFileName31A(ofn, SAVE_DIALOG); else @@ -4115,6 +4139,12 @@ BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + if (is_win16_looks(ofn->Flags)) return GetFileName31W(ofn, SAVE_DIALOG); else

1 0

Alexandre Julliard : include: Fix the CDSIZEOF_STRUCT definition to avoid warnings on 64-bit.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: b037bd7bffb22d79ccdacbe2314b000d65e4dc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b037bd7bffb22d79ccdacbe23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 18:29:09 2012 +0200 include: Fix the CDSIZEOF_STRUCT definition to avoid warnings on 64-bit. --- include/commdlg.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index 3ab7078..1a6e1d9 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -130,7 +130,7 @@ DECL_WINELIB_TYPE_AW(OPENFILENAME) DECL_WINELIB_TYPE_AW(LPOPENFILENAME) #ifndef CDSIZEOF_STRUCT -#define CDSIZEOF_STRUCT(type,field) ((int)&(((type *)0)->field) + sizeof(((type*)0)->field)) +#define CDSIZEOF_STRUCT(type,field) ((INT_PTR)&(((type *)0)->field) + sizeof(((type*)0)->field)) #endif #define OPENFILENAME_SIZE_VERSION_400A CDSIZEOF_STRUCT(OPENFILENAMEA,lpTemplateName)

1 0

Huw Davies : commdlg: Set the nt40 version size.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: ac347c7e40d75217439ef43f381666a6658d7017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac347c7e40d75217439ef43f3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:48 2012 +0100 commdlg: Set the nt40 version size. --- dlls/commdlg.dll16/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 3de8b90..7e2fda7 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -73,7 +73,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w if (!lpofn) return FALSE; - ofn32.lStructSize = sizeof(ofn32); + ofn32.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn32.hwndOwner = HWND_32( lpofn->hwndOwner ); ofn32.lpstrFilter = MapSL( lpofn->lpstrFilter ); ofn32.lpstrCustomFilter = MapSL( lpofn->lpstrCustomFilter ); @@ -126,7 +126,7 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w if (!lpofn) return FALSE; - ofn32.lStructSize = sizeof(ofn32); + ofn32.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn32.hwndOwner = HWND_32( lpofn->hwndOwner ); ofn32.lpstrFilter = MapSL( lpofn->lpstrFilter ); ofn32.lpstrCustomFilter = MapSL( lpofn->lpstrCustomFilter );

1 0

Huw Davies : comdlg32/tests: Explicitly set the structure size to the nt40 version size.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 37975ba776de3d45c5a73d7ba4476881e0d9f1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=37975ba776de3d45c5a73d7ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 13:22:47 2012 +0100 comdlg32/tests: Explicitly set the structure size to the nt40 version size. --- dlls/comdlg32/tests/filedlg.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index c9bf52a..b701956 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -93,7 +93,7 @@ static void test_DialogCancel(void) ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.hwndOwner = NULL; ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; ofn.lpstrFile = szFileName; @@ -266,7 +266,7 @@ static void test_create_view_window2(void) char filename[1024] = {0}; DWORD ret; - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = create_view_window2_hook; @@ -283,7 +283,7 @@ static void test_create_view_template(void) char filename[1024] = {0}; DWORD ret; - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; @@ -531,7 +531,7 @@ todo_wine static void test_resize(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; DWORD ret; int i; @@ -633,7 +633,7 @@ static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARA static void test_ok(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; char tmpfilename[ MAX_PATH]; char curdir[MAX_PATH]; @@ -843,7 +843,7 @@ static void test_arrange(void) return; } - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook_arrange; @@ -916,7 +916,7 @@ static void test_getfolderpath(void) ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.hwndOwner = NULL; ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; ofn.lpstrFile = szFileName; @@ -948,7 +948,7 @@ static void test_resizable2(void) skip( "some interactive resizable dialog tests (set WINETEST_INTERACTIVE=1)\n"); return; } - ofn.lStructSize = sizeof(ofn); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; ofn.lpfnHook = NULL; @@ -983,7 +983,7 @@ static void test_resizable2(void) static void test_mru(void) { ok_wndproc_testcase testcase = {0}; - OPENFILENAME ofn = {sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; const char *test_dir_name = "C:\\mru_test"; const char *test_file_name = "test.txt"; const char *test_full_path = "C:\\mru_test\\test.txt"; @@ -1069,7 +1069,7 @@ static void test_extension_helper(OPENFILENAME* ofn, const char *filter, static void test_extension(void) { - OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + OPENFILENAME ofn = { OPENFILENAME_SIZE_VERSION_400 }; char filename[1024] = {0}; char curdir[MAX_PATH]; unsigned int i; @@ -1093,7 +1093,6 @@ static void test_extension(void) boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); ok(boolret, "Failed to get current dir err %d\n", GetLastError()); - ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = NULL; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; @@ -1176,7 +1175,7 @@ static void test_null_filename(void) 'A','l','l','\0','*','\0','\0'}; DWORD ret; - ofnA.lStructSize = sizeof(ofnA); + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofnA.lpstrFile = NULL; ofnA.nMaxFile = 0; ofnA.nFileOffset = 0xdead; @@ -1207,7 +1206,7 @@ static void test_null_filename(void) ok(ofnA.nFileExtension == 0, "ofnA.nFileExtension is 0x%x, should be 0\n", ofnA.nFileExtension); /* unicode tests */ - ofnW.lStructSize = sizeof(ofnW); + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; ofnW.lpstrFile = NULL; ofnW.nMaxFile = 0; ofnW.nFileOffset = 0xdead;

1 0

Christian Costa : dmusic: Rename params in SynthPortImpl_IDirectMusicPort_QueryInterface.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 699fa23bd293346d3f576388eed401e41cdd5e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699fa23bd293346d3f576388e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 21 11:47:06 2012 +0200 dmusic: Rename params in SynthPortImpl_IDirectMusicPort_QueryInterface. --- dlls/dmusic/port.c | 50 ++++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index cfe4265..b6489a7 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -39,31 +39,33 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus } /* SynthPortImpl IDirectMusicPort IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectMusicPort) || - IsEqualGUID(riid, &IID_IDirectMusicPort8)) { - *ppobj = &This->IDirectMusicPort_iface; - IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ppobj); - return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) || - IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) { - *ppobj = &This->IDirectMusicPortDownload_iface; - IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ppobj); - return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicThru) || - IsEqualGUID(riid, &IID_IDirectMusicThru8)) { - *ppobj = &This->IDirectMusicThru_iface; - IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ppobj); - return S_OK; - } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; + TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectMusicPort) || + IsEqualGUID(riid, &IID_IDirectMusicPort8)) { + *ret_iface = &This->IDirectMusicPort_iface; + IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface); + return S_OK; + } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) || + IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) { + *ret_iface = &This->IDirectMusicPortDownload_iface; + IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface); + return S_OK; + } else if (IsEqualGUID(riid, &IID_IDirectMusicThru) || + IsEqualGUID(riid, &IID_IDirectMusicThru8)) { + *ret_iface = &This->IDirectMusicThru_iface; + IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); + return S_OK; + } + + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; } static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface)

1 0

Jacek Caban : include: Added uiautomation.h.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 40e7f7522e82223ad4faf9f6b59dd83f173ba766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e7f7522e82223ad4faf9f6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 11:16:21 2012 +0200 include: Added uiautomation.h. --- include/Makefile.in | 1 + include/uiautomation.h | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index a4f00a3..8536a07 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -519,6 +519,7 @@ SRCDIR_INCLUDES = \ traffic.h \ twain.h \ udpmib.h \ + uiautomation.h \ userenv.h \ usp10.h \ uuids.h \ diff --git a/include/uiautomation.h b/include/uiautomation.h new file mode 100644 index 0000000..8bd2b55 --- /dev/null +++ b/include/uiautomation.h @@ -0,0 +1,21 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <uiautomationcore.h> +/* #include <uiautomationclient.h> */ +/* #include <uiautomationcoreapi.h> */

1 0

Jacek Caban : mshtml: Use IUri as base URL in navigate_url.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: e75683b85860b33ba88c663147821ece6b4eafc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75683b85860b33ba88c66314… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 12:24:37 2012 +0200 mshtml: Use IUri as base URL in navigate_url. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlframebase.c | 2 +- dlls/mshtml/htmllocation.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 98 ++++++++++++++++++++++++----------------- dlls/mshtml/nsio.c | 2 +- 8 files changed, 65 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 0053e75..4d19c46 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -103,7 +103,7 @@ HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_ nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; -HRESULT create_doc_uri(HTMLOuterWindow*,WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; +HRESULT create_doc_uri(HTMLOuterWindow*,const WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index fac2d63..b0ec97e 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -121,7 +121,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) if(*href) { if(!window) window = This->element.node.doc->basedoc.window; - hres = navigate_url(window, href, window->url); + hres = navigate_url(window, href, window->uri); }else { TRACE("empty href\n"); hres = S_OK; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a6bb56d..ff917d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -609,7 +609,7 @@ static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) return E_FAIL; } - return navigate_url(This->window, v, This->window->url); + return navigate_url(This->window, v, This->window->uri); } static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index bc00761..55a56db 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -135,7 +135,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) return E_FAIL; } - return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->url); + return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri); } static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index cde1fee..3ce0978 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -170,7 +170,7 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) return E_FAIL; } - return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->url); + return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->uri); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -570,7 +570,7 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) return E_FAIL; } - return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->url); + return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->uri); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fa4e073..aec754f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -775,7 +775,7 @@ void init_node_cc(void); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; -HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; void call_property_onchanged(ConnectionPoint*,DISPID) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 15c9e85..3b618e2 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2245,61 +2245,28 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne return hres; } -HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, const WCHAR *base_url) +HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) { - WCHAR url[INTERNET_MAX_URL_LENGTH]; - nsWineURI *uri; + nsWineURI *nsuri; HRESULT hres; - if(!new_url) { - *url = 0; - }else if(base_url) { - DWORD len = 0; - - hres = CoInternetCombineUrl(base_url, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, - url, sizeof(url)/sizeof(WCHAR), &len, 0); - if(FAILED(hres)) - return hres; - }else { - strcpyW(url, new_url); - } - - if(window->doc_obj && window->doc_obj->hostui) { - OLECHAR *translated_url = NULL; - - hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, url, - &translated_url); - if(hres == S_OK) { - TRACE("%08x %s -> %s\n", hres, debugstr_w(url), debugstr_w(translated_url)); - strcpyW(url, translated_url); - CoTaskMemFree(translated_url); - } - } - if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { BOOL cancel = FALSE; - IUri *uri; - hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, url, 0x40, + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, NULL, NULL, 0, NULL, TRUE, &cancel); if(SUCCEEDED(hres) && cancel) { TRACE("Navigation canceled\n"); return S_OK; } - hres = CreateUri(url, 0, 0, &uri); - if(FAILED(hres)) - return hres; - - hres = super_navigate(window, uri, NULL, NULL, 0); - IUri_Release(uri); - return hres; + return super_navigate(window, uri, NULL, NULL, 0); } if(window->doc_obj && window == window->doc_obj->basedoc.window) { BOOL cancel; - hres = hlink_frame_navigate(&window->base.inner_window->doc->basedoc, url, NULL, 0, &cancel); + hres = hlink_frame_navigate(&window->base.inner_window->doc->basedoc, display_uri, NULL, 0, &cancel); if(FAILED(hres)) return hres; @@ -2309,11 +2276,60 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, const WCHAR } } - hres = create_doc_uri(window, url, &uri); + hres = create_doc_uri(window, display_uri, &nsuri); + if(FAILED(hres)) + return hres; + + hres = load_nsuri(window, nsuri, NULL, LOAD_FLAGS_NONE); + nsISupports_Release((nsISupports*)nsuri); + return hres; +} + +HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri) +{ + BSTR display_uri; + IUri *uri; + HRESULT hres; + + if(new_url && base_uri) + hres = CoInternetCombineUrlEx(base_uri, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, + &uri, 0); + else + hres = CreateUri(new_url, 0, 0, &uri); if(FAILED(hres)) return hres; - hres = load_nsuri(window, uri, NULL, LOAD_FLAGS_NONE); - nsISupports_Release((nsISupports*)uri); + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) { + IUri_Release(uri); + return hres; + } + + if(window->doc_obj && window->doc_obj->hostui) { + OLECHAR *translated_url = NULL; + + hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, display_uri, + &translated_url); + if(hres == S_OK) { + TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url)); + SysFreeString(display_uri); + IUri_Release(uri); + hres = CreateUri(translated_url, 0, 0, &uri); + CoTaskMemFree(translated_url); + if(FAILED(hres)) + return hres; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) { + IUri_Release(uri); + return hres; + } + } + } + + hres = navigate_uri(window, uri, display_uri); + + IUri_Release(uri); + SysFreeString(display_uri); return hres; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4b247ee..cf71ec5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2867,7 +2867,7 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c return NS_OK; } -HRESULT create_doc_uri(HTMLOuterWindow *window, WCHAR *url, nsWineURI **ret) +HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **ret) { nsWineURI *uri; IUri *iuri;

1 0