November 2010 - Wine-Commits

Henri Verbeet : wined3d: Add a trace to IWineD3DSurfaceImpl_SetMem().
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 44b9712cd67b4ae8506d1817b7777460bf1a293e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b9712cd67b4ae8506d1817b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 15 13:43:34 2010 +0100 wined3d: Add a trace to IWineD3DSurfaceImpl_SetMem(). --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bef7688..485f255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2583,6 +2583,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, enum static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("iface %p, mem %p.\n", iface, Mem); + if (This->flags & (SFLAG_LOCKED | SFLAG_DCINUSE)) { WARN("Surface is locked or the HDC is in use\n");

1 0

Austin Lund : gdi32/tests: Skip GetGlyphIndices tests for non-ANSI codepages.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: a9aafec28a9ba18f89b1994962d46dd3fbb6f8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9aafec28a9ba18f89b199496… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Nov 15 10:03:28 2010 +1000 gdi32/tests: Skip GetGlyphIndices tests for non-ANSI codepages. --- dlls/gdi32/tests/font.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b200ca1..c87b062 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1017,16 +1017,28 @@ static void test_GetGlyphIndices(void) hdc = GetDC(0); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 16; + lf.lfCharSet = ANSI_CHARSET; + + hfont = CreateFontIndirectA(&lf); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); - flags |= GGI_MARK_NONEXISTING_GLYPHS; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); - flags = 0; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + if (textm.tmCharSet == ANSI_CHARSET) + { + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); + flags = 0; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); + } + else + /* FIXME: Write tests for non-ANSI charsets. */ + skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); if(!is_font_installed("Tahoma")) {

1 0

Jacek Caban : oleaut32: Added LoadTypeLib failure test.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 9de2ed97c978d23034b005a07382d933abca5522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de2ed97c978d23034b005a07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 17:45:35 2010 +0100 oleaut32: Added LoadTypeLib failure test. --- dlls/oleaut32/tests/typelib.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ce40cb9..6a66e33 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2813,6 +2813,17 @@ static void test_register_typelib(BOOL system_registration) DeleteFileA( filenameA ); } +static void test_LoadTypeLib(void) +{ + ITypeLib *tl; + HRESULT hres; + + static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + + hres = LoadTypeLib(kernel32_dllW, &tl); + ok(hres == TYPE_E_CANTLOADLIBRARY, "LoadTypeLib returned: %08x, expected TYPE_E_CANTLOADLIBRARY\n", hres); +} + START_TEST(typelib) { const char *filename; @@ -2839,5 +2850,5 @@ START_TEST(typelib) test_register_typelib(TRUE); test_register_typelib(FALSE); test_create_typelibs(); - + test_LoadTypeLib(); }

1 0

Henri Verbeet : wined3d: Rename the IWineD3DPaletteImpl "Flags" field to " flags".
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 60b5dc04b73708398d795cbd0b8f584d9d94a87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b5dc04b73708398d795cbd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 15 13:43:33 2010 +0100 wined3d: Rename the IWineD3DPaletteImpl "Flags" field to "flags". --- dlls/wined3d/palette.c | 15 ++++++++------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_base.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 2b7ce2c..68f823f 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -93,10 +93,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); if (Flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (Start + Count > IWineD3DPaletteImpl_Size(This->Flags)) + if (Start + Count > IWineD3DPaletteImpl_Size(This->flags)) return WINED3DERR_INVALIDCALL; - if (This->Flags & WINEDDPCAPS_8BITENTRIES) + if (This->flags & WINEDDPCAPS_8BITENTRIES) { unsigned int i; LPBYTE entry = (LPBYTE)PalEnt; @@ -117,9 +117,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, IWineD3DResourceImpl *res; TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); - TRACE("Palette flags: %#x\n", This->Flags); + TRACE("Palette flags: %#x.\n", This->flags); - if (This->Flags & WINEDDPCAPS_8BITENTRIES) { + if (This->flags & WINEDDPCAPS_8BITENTRIES) + { unsigned int i; const BYTE* entry = (const BYTE*)PalEnt; @@ -130,7 +131,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, memcpy(This->palents+Start, PalEnt, Count * sizeof(PALETTEENTRY)); /* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */ - if(!(This->Flags & WINEDDPCAPS_ALLOW256)) + if (!(This->flags & WINEDDPCAPS_ALLOW256)) { TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n"); This->palents[0].peRed = 0; @@ -171,7 +172,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetCaps(IWineD3DPalette *iface, DWORD IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; TRACE("(%p)->(%p)\n", This, Caps); - *Caps = This->Flags; + *Caps = This->flags; return WINED3D_OK; } @@ -204,7 +205,7 @@ HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *d palette->ref = 1; palette->parent = parent; palette->device = device; - palette->Flags = flags; + palette->flags = flags; palette->palNumEntries = IWineD3DPaletteImpl_Size(flags); palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 570b100..bef7688 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2267,7 +2267,7 @@ void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL { table[i][3] = 0x00; } - else if(pal->Flags & WINEDDPCAPS_ALPHA) + else if (pal->flags & WINEDDPCAPS_ALPHA) { table[i][3] = pal->palents[i].peFlags; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f907ae8..7960b6c 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -221,14 +221,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD if (This->palette) if (This->resource.usage & WINED3DUSAGE_RENDERTARGET) - This->palette->Flags &= ~WINEDDPCAPS_PRIMARYSURFACE; + This->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE; This->palette = PalImpl; if (PalImpl) { if (This->resource.usage & WINED3DUSAGE_RENDERTARGET) - PalImpl->Flags |= WINEDDPCAPS_PRIMARYSURFACE; + PalImpl->flags |= WINEDDPCAPS_PRIMARYSURFACE; return IWineD3DSurface_RealizePalette(iface); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f143009..2278cb7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2978,7 +2978,7 @@ struct IWineD3DPaletteImpl { PALETTEENTRY palents[256]; /*| */ /* This is to store the palette in 'screen format' */ int screen_palents[256]; - DWORD Flags; + DWORD flags; }; HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device,

1 0

Jörg Höhle : winecoreaudio: OSStatus is not necessarily a FOURCC.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 2e54019391572d354d9a3295ee941df3cb536897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e54019391572d354d9a3295e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 13 18:05:18 2010 +0100 winecoreaudio: OSStatus is not necessarily a FOURCC. --- dlls/winecoreaudio.drv/coreaudio.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.h b/dlls/winecoreaudio.drv/coreaudio.h index 4cf2b03..68b5250 100644 --- a/dlls/winecoreaudio.drv/coreaudio.h +++ b/dlls/winecoreaudio.drv/coreaudio.h @@ -32,10 +32,13 @@ extern LONG CoreAudio_MixerInit(void); extern void CoreAudio_MixerRelease(void); /* fourcc is in native order, where MSB is the first character. */ -static inline const char* wine_dbgstr_fourcc(unsigned long fourcc) +static inline const char* wine_dbgstr_fourcc(INT32 fourcc) { char buf[4] = { (char) (fourcc >> 24), (char) (fourcc >> 16), (char) (fourcc >> 8), (char) fourcc }; + /* OSStatus is a signed decimal except in parts of CoreAudio */ + if ((buf[0] < 32) || (buf[1] < 32) || (buf[2] < 32) || (buf[3] < 32)) + return wine_dbg_sprintf("%d", fourcc); return wine_dbgstr_an(buf, sizeof(buf)); }

1 0

Henri Verbeet : include: Add the tagBIND_OPTS3 structure.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: ce4de8ff9ccceb31d6b303a69a6f6c712596aaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4de8ff9ccceb31d6b303a69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 15 13:43:32 2010 +0100 include: Add the tagBIND_OPTS3 structure. --- include/objidl.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index 70f93ab..a3896e9 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -345,6 +345,18 @@ interface IBindCtx : IUnknown COSERVERINFO *pServerInfo; } BIND_OPTS2, *LPBIND_OPTS2; + typedef struct tagBIND_OPTS3 { + DWORD cbStruct; + DWORD grfFlags; + DWORD grfMode; + DWORD dwTickCountDeadline; + DWORD dwTrackFlags; + DWORD dwClassContext; + LCID locale; + COSERVERINFO *pServerInfo; + HWND hwnd; + } BIND_OPTS3, *LPBIND_OPTS3; + typedef enum tagBIND_FLAGS { BIND_MAYBOTHERUSER = 1, BIND_JUSTTESTEXISTENCE = 2

1 0

Jörg Höhle : mciavi: MCI_OPEN @ NNNN should use an open AVIFile/Stream handle.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 3412b41924cc73e5ae7c693d90f7b474fe33544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3412b41924cc73e5ae7c693d9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 3 20:04:32 2010 +0100 mciavi: MCI_OPEN @NNNN should use an open AVIFile/Stream handle. --- dlls/mciavi32/mciavi.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 731083e..c78ddc0 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -26,11 +26,13 @@ * - synchronization between audio and video (especially for interleaved * files) * - robustness when reading file can be enhanced - * - better move the AVI handling part to avifile DLL and make use of it + * - reimplement the AVI handling part with avifile DLL because + * "open @1122334 type avivideo alias a" expects an AVIFile/Stream + * and MCI_DGV_SET|STATUS_SPEED maps to Rate/Scale * - some files appear to have more than one audio stream (we only play the * first one) * - some files contain an index of audio/video frame. Better use it, - * instead of rebuilding it + * instead of rebuilding it (AVIFile does that already) * - stopping while playing a file with sound blocks until all buffered * audio is played... still should be stopped ASAP */ @@ -256,6 +258,12 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); strcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); + if (lpOpenParms->lpstrElementName[0] == '@') { + /* The file name @11223344 encodes an AVIFile handle in decimal notation + * in Win3.1 and w2k/NT, but this feature is absent in win95 (KB140750). + * wma->hFile = LongToHandle(strtolW(lpOpenParms->lpstrElementName+1, NULL, 10)); */ + FIXME("Using AVIFile/Stream %s NIY\n", debugstr_w(lpOpenParms->lpstrElementName)); + } wma->hFile = mmioOpenW(lpOpenParms->lpstrElementName, NULL, MMIO_ALLOCBUF | MMIO_DENYWRITE | MMIO_READ);

1 0

Jacek Caban : urlmon: Make Binding object IUri-based.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 29692adf40eb0ca9daad8665ca168688475b64af URL: http://source.winehq.org/git/wine.git/?a=commit;h=29692adf40eb0ca9daad8665c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 12:38:06 2010 +0100 urlmon: Make Binding object IUri-based. --- dlls/urlmon/binding.c | 75 ++++++++++++++++++++------------------------- dlls/urlmon/umon.c | 21 +++++++++++- dlls/urlmon/urlmon_main.h | 4 +- 3 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c27213a..699bf98 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -18,6 +18,7 @@ #include "urlmon_main.h" #include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -889,10 +890,9 @@ static ULONG WINAPI Binding_Release(IBinding *iface) ReleaseBindInfo(&This->bindinfo); This->section.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->section); + SysFreeString(This->url); heap_free(This->mime); heap_free(This->redirect_url); - heap_free(This->url); - heap_free(This); URLMON_UnlockModule(); @@ -1264,7 +1264,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, return hres; } case BINDSTRING_URL: { - DWORD size = (strlenW(This->url)+1) * sizeof(WCHAR); + DWORD size = (SysStringLen(This->url)+1) * sizeof(WCHAR); if(!ppwzStr || !pcElFetched) return E_INVALIDARG; @@ -1399,42 +1399,29 @@ static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback) return hres; } -static BOOL is_urlmon_protocol(LPCWSTR url) -{ - static const WCHAR wszCdl[] = {'c','d','l'}; - static const WCHAR wszFile[] = {'f','i','l','e'}; - static const WCHAR wszFtp[] = {'f','t','p'}; - static const WCHAR wszGopher[] = {'g','o','p','h','e','r'}; - static const WCHAR wszHttp[] = {'h','t','t','p'}; - static const WCHAR wszHttps[] = {'h','t','t','p','s'}; - static const WCHAR wszMk[] = {'m','k'}; - - static const struct { - LPCWSTR scheme; - int len; - } protocol_list[] = { - {wszCdl, sizeof(wszCdl) /sizeof(WCHAR)}, - {wszFile, sizeof(wszFile) /sizeof(WCHAR)}, - {wszFtp, sizeof(wszFtp) /sizeof(WCHAR)}, - {wszGopher, sizeof(wszGopher)/sizeof(WCHAR)}, - {wszHttp, sizeof(wszHttp) /sizeof(WCHAR)}, - {wszHttps, sizeof(wszHttps) /sizeof(WCHAR)}, - {wszMk, sizeof(wszMk) /sizeof(WCHAR)} - }; - - unsigned int i; - int len = lstrlenW(url); +static BOOL is_urlmon_protocol(IUri *uri) +{ + DWORD scheme; + HRESULT hres; - for(i=0; i < sizeof(protocol_list)/sizeof(protocol_list[0]); i++) { - if(len >= protocol_list[i].len - && !memcmp(url, protocol_list[i].scheme, protocol_list[i].len*sizeof(WCHAR))) - return TRUE; + hres = IUri_GetScheme(uri, &scheme); + if(FAILED(hres)) + return FALSE; + + switch(scheme) { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_MK: + return TRUE; } return FALSE; } -static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, IBindCtx *pbc, +static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBindCtx *pbc, BOOL to_obj, REFIID riid, Binding **binding) { Binding *ret; @@ -1512,11 +1499,15 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, if(!(ret->bindf & BINDF_ASYNCHRONOUS)) { ret->bindf |= BINDF_NEEDFILE; ret->use_cache_file = TRUE; - }else if(!is_urlmon_protocol(url)) { + }else if(!is_urlmon_protocol(uri)) { ret->bindf |= BINDF_NEEDFILE; } - ret->url = heap_strdupW(url); + hres = IUri_GetDisplayUri(uri, &ret->url); + if(FAILED(hres)) { + IBinding_Release(BINDING(ret)); + return hres; + } if(binding_ctx) { ret->stgmed_buf = binding_ctx->stgmed_buf; @@ -1543,14 +1534,14 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, return S_OK; } -static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, IBindCtx *pbc, +static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBindCtx *pbc, BOOL to_obj, REFIID riid, Binding **ret) { Binding *binding = NULL; HRESULT hres; MSG msg; - hres = Binding_Create(mon, binding_ctx, url, pbc, to_obj, riid, &binding); + hres = Binding_Create(mon, binding_ctx, uri, pbc, to_obj, riid, &binding); if(FAILED(hres)) return hres; @@ -1569,7 +1560,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I report_data(binding, BSCF_FIRSTDATANOTIFICATION | (binding_ctx->download_state == END_DOWNLOAD ? BSCF_LASTDATANOTIFICATION : 0), 0, 0); }else { - hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), + hres = IInternetProtocolEx_StartEx(binding->protocol, uri, PROTSINK(binding), BINDINF(binding), PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); TRACE("start ret %08x\n", hres); @@ -1595,7 +1586,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I return S_OK; } -HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) +HRESULT bind_to_storage(IUri *uri, IBindCtx *pbc, REFIID riid, void **ppv) { Binding *binding = NULL, *binding_ctx; HRESULT hres; @@ -1604,7 +1595,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) binding_ctx = get_bctx_binding(pbc); - hres = start_binding(NULL, binding_ctx, url, pbc, FALSE, riid, &binding); + hres = start_binding(NULL, binding_ctx, uri, pbc, FALSE, riid, &binding); if(binding_ctx) IBinding_Release(BINDING(binding_ctx)); if(FAILED(hres)) @@ -1626,14 +1617,14 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) return hres; } -HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) +HRESULT bind_to_object(IMoniker *mon, IUri *uri, IBindCtx *pbc, REFIID riid, void **ppv) { Binding *binding; HRESULT hres; *ppv = NULL; - hres = start_binding(mon, NULL, url, pbc, TRUE, riid, &binding); + hres = start_binding(mon, NULL, uri, pbc, TRUE, riid, &binding); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index fea7b21..fbb00a4 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -200,6 +200,7 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM { URLMoniker *This = MONIKER_THIS(iface); IRunningObjectTable *obj_tbl; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p,%p,%s,%p): stub\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppv); @@ -210,20 +211,36 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM IRunningObjectTable_Release(obj_tbl); } - return bind_to_object(iface, This->URLName, pbc, riid, ppv); + hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = bind_to_object(iface, uri, pbc, riid, ppv); + + IUri_Release(uri); + return hres; } static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, void **ppvObject) { URLMoniker *This = MONIKER_THIS(iface); + IUri *uri; + HRESULT hres; TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); if(pmkToLeft) FIXME("Unsupported pmkToLeft\n"); - return bind_to_storage(This->URLName, pbc, riid, ppvObject); + hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = bind_to_storage(uri, pbc, riid, ppvObject); + + IUri_Release(uri); + return hres; } static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 2d719cb..ea33f15 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -74,8 +74,8 @@ HINTERNET get_internet_session(IInternetBindInfo*); LPWSTR get_useragent(void); void free_session(void); -HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); -HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); +HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**); +HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv); HRESULT create_binding_protocol(BOOL,IInternetProtocolEx**); void set_binding_sink(IInternetProtocolEx*,IInternetProtocolSink*,IInternetBindInfo*);

1 0

Jacek Caban : urlmon: Store BindProtocol as IInternetProtocolEx.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: b54ac3c62881e27a96120017fa68e063ab8419b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54ac3c62881e27a96120017f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 12:37:03 2010 +0100 urlmon: Store BindProtocol as IInternetProtocolEx. --- dlls/urlmon/binding.c | 8 ++++---- dlls/urlmon/bindprot.c | 14 +++++++------- dlls/urlmon/session.c | 10 +++++++++- dlls/urlmon/urlmon_main.h | 6 +++--- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 99aaf02..c27213a 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -42,7 +42,7 @@ typedef struct { LONG ref; - IInternetProtocol *protocol; + IInternetProtocolEx *protocol; BYTE buf[1024*8]; DWORD size; @@ -88,7 +88,7 @@ struct Binding { LONG ref; IBindStatusCallback *callback; - IInternetProtocol *protocol; + IInternetProtocolEx *protocol; IServiceProvider *service_provider; stgmed_buf_t *stgmed_buf; @@ -427,7 +427,7 @@ static const IUnknownVtbl StgMedUnkVtbl = { StgMedUnk_Release }; -static stgmed_buf_t *create_stgmed_buf(IInternetProtocol *protocol) +static stgmed_buf_t *create_stgmed_buf(IInternetProtocolEx *protocol) { stgmed_buf_t *ret = heap_alloc(sizeof(*ret)); @@ -1487,7 +1487,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, ret->protocol = binding_ctx->protocol; IInternetProtocol_AddRef(ret->protocol); }else { - hres = create_binding_protocol(url, TRUE, &ret->protocol); + hres = create_binding_protocol(TRUE, &ret->protocol); if(FAILED(hres)) { WARN("Could not get protocol handler\n"); IBinding_Release(BINDING(ret)); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 2e103e3..4acef40 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -388,7 +388,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) if(This->uri) IUri_Release(This->uri); - set_binding_sink((IInternetProtocol*)PROTOCOLEX(This), NULL, NULL); + set_binding_sink(PROTOCOLEX(This), NULL, NULL); if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); @@ -581,7 +581,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(urlmon_protocol) IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); - set_binding_sink((IInternetProtocol*)PROTOCOLEX(This), pOIProtSink, pOIBindInfo); + set_binding_sink(PROTOCOLEX(This), pOIProtSink, pOIBindInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { @@ -607,7 +607,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr return hres; } -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info) +void set_binding_sink(IInternetProtocolEx *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info) { BindProtocol *This = PROTOCOL_THIS(bind_protocol); IInternetProtocolSink *prev_sink; @@ -632,7 +632,7 @@ void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *s IInternetBindInfo_Release(bind_info); } -IWinInetInfo *get_wininet_info(IInternetProtocol *bind_protocol) +IWinInetInfo *get_wininet_info(IInternetProtocolEx *bind_protocol) { BindProtocol *This = PROTOCOL_THIS(bind_protocol); @@ -728,7 +728,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->filter_proxy = NULL; } - set_binding_sink((IInternetProtocol*)PROTOCOLEX(This), NULL, NULL); + set_binding_sink(PROTOCOLEX(This), NULL, NULL); if(This->bind_info) { IInternetBindInfo_Release(This->bind_info); @@ -1340,7 +1340,7 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { BPServiceProvider_QueryService }; -HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol) +HRESULT create_binding_protocol(BOOL from_urlmon, IInternetProtocolEx **protocol) { BindProtocol *ret = heap_alloc_zero(sizeof(BindProtocol)); @@ -1361,6 +1361,6 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol URLMON_LockModule(); - *protocol = (IInternetProtocol*)PROTOCOLEX(ret); + *protocol = PROTOCOLEX(ret); return S_OK; } diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index ef1881c..4c9281a 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -421,13 +421,21 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface, LPBC pBC, LPCWSTR szUrl, IUnknown *pUnkOuter, IUnknown **ppUnk, IInternetProtocol **ppOInetProt, DWORD dwOption) { + IInternetProtocolEx *protocol; + HRESULT hres; + TRACE("(%p %s %p %p %p %08x)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk, ppOInetProt, dwOption); if(pBC || pUnkOuter || ppUnk || dwOption) FIXME("Unsupported arguments\n"); - return create_binding_protocol(szUrl, FALSE, ppOInetProt); + hres = create_binding_protocol(FALSE, &protocol); + if(FAILED(hres)) + return hres; + + *ppOInetProt = (IInternetProtocol*)protocol; + return S_OK; } static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 215a868..239182e 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -77,9 +77,9 @@ void free_session(void); HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); -HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info); -IWinInetInfo *get_wininet_info(IInternetProtocol*); +HRESULT create_binding_protocol(BOOL,IInternetProtocolEx**); +void set_binding_sink(IInternetProtocolEx*,IInternetProtocolSink*,IInternetBindInfo*); +IWinInetInfo *get_wininet_info(IInternetProtocolEx*); HRESULT create_default_callback(IBindStatusCallback**); HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**);

1 0

Jacek Caban : urlmon: BindProocol's protocol handler doesn' t need IInternetProtocolEx iface.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 5c61a34a7acd1eaf2bfc09de57f32bf1d2731bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c61a34a7acd1eaf2bfc09de5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 12:36:41 2010 +0100 urlmon: BindProocol's protocol handler doesn't need IInternetProtocolEx iface. --- dlls/urlmon/bindprot.c | 49 +++++++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index cdc6ea4..2e103e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -40,7 +40,7 @@ struct BindProtocol { const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl; const IWinInetHttpInfoVtbl *lpIWinInetHttpInfoVtbl; - const IInternetProtocolExVtbl *lpIInternetProtocolHandlerVtbl; + const IInternetProtocolVtbl *lpIInternetProtocolHandlerVtbl; LONG ref; @@ -78,7 +78,7 @@ struct BindProtocol { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTOCOLEX(x) ((IInternetProtocolEx*) &(x)->lpIInternetProtocolExVtbl) -#define PROTOCOLHANDLER(x) ((IInternetProtocolEx*) &(x)->lpIInternetProtocolHandlerVtbl) +#define PROTOCOLHANDLER(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolHandlerVtbl) #define BUFFER_SIZE 2048 #define MIME_TEST_SIZE 255 @@ -233,7 +233,7 @@ static HRESULT handle_mime_filter(BindProtocol *This, IInternetProtocol *mime_fi if(FAILED(hres)) return hres; - hres = create_protocol_proxy((IInternetProtocol*)PROTOCOLHANDLER(This), This->protocol_sink, &filter_proxy); + hres = create_protocol_proxy(PROTOCOLHANDLER(This), This->protocol_sink, &filter_proxy); if(FAILED(hres)) { IInternetProtocolSink_Release(protocol_sink); return hres; @@ -381,7 +381,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) IInternetProtocol_Release(This->protocol); if(This->bind_info) IInternetBindInfo_Release(This->bind_info); - if(This->protocol_handler && This->protocol_handler != (IInternetProtocol*)PROTOCOLHANDLER(This)) + if(This->protocol_handler && This->protocol_handler != PROTOCOLHANDLER(This)) IInternetProtocol_Release(This->protocol_handler); if(This->filter_proxy) IInternetProtocol_Release(PROTOCOL(This->filter_proxy)); @@ -660,25 +660,25 @@ static const IInternetProtocolExVtbl BindProtocolVtbl = { #define PROTOCOLHANDLER_THIS(iface) DEFINE_THIS(BindProtocol, IInternetProtocolHandler, iface) -static HRESULT WINAPI ProtocolHandler_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ProtocolHandler_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { ERR("should not be called\n"); return E_NOINTERFACE; } -static ULONG WINAPI ProtocolHandler_AddRef(IInternetProtocolEx *iface) +static ULONG WINAPI ProtocolHandler_AddRef(IInternetProtocol *iface) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); return IInternetProtocolEx_AddRef(PROTOCOLEX(This)); } -static ULONG WINAPI ProtocolHandler_Release(IInternetProtocolEx *iface) +static ULONG WINAPI ProtocolHandler_Release(IInternetProtocol *iface) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); return IInternetProtocolEx_Release(PROTOCOLEX(This)); } -static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocolEx *iface, LPCWSTR szUrl, +static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) { @@ -686,7 +686,7 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocolEx *iface, LPCWSTR return E_NOTIMPL; } -static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocolEx *iface, PROTOCOLDATA *pProtocolData) +static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); HRESULT hres; @@ -699,7 +699,7 @@ static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocolEx *iface, PROTO return hres; } -static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocolEx *iface, HRESULT hrReason, +static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); @@ -712,7 +712,7 @@ static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocolEx *iface, HRESULT return S_OK; } -static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocolEx *iface, DWORD dwOptions) +static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD dwOptions) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); @@ -738,21 +738,21 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocolEx *iface, DWOR return S_OK; } -static HRESULT WINAPI ProtocolHandler_Suspend(IInternetProtocolEx *iface) +static HRESULT WINAPI ProtocolHandler_Suspend(IInternetProtocol *iface) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ProtocolHandler_Resume(IInternetProtocolEx *iface) +static HRESULT WINAPI ProtocolHandler_Resume(IInternetProtocol *iface) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocolEx *iface, void *pv, +static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); @@ -786,7 +786,7 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocolEx *iface, void *pv, return hres; } -static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocolEx *iface, LARGE_INTEGER dlibMove, +static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); @@ -794,7 +794,7 @@ static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocolEx *iface, LARGE_INT return E_NOTIMPL; } -static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocolEx *iface, DWORD dwOptions) +static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); @@ -803,7 +803,7 @@ static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocolEx *iface, DW return IInternetProtocol_LockRequest(This->protocol, dwOptions); } -static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocolEx *iface) +static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocol *iface) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); @@ -812,17 +812,9 @@ static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocolEx *iface) return IInternetProtocol_UnlockRequest(This->protocol); } -static HRESULT WINAPI ProtocolHandler_StartEx(IInternetProtocolEx *iface, IUri *pUri, - IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, HANDLE *dwReserved) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - #undef PROTOCOL_THIS -static const IInternetProtocolExVtbl InternetProtocolHandlerVtbl = { +static const IInternetProtocolVtbl InternetProtocolHandlerVtbl = { ProtocolHandler_QueryInterface, ProtocolHandler_AddRef, ProtocolHandler_Release, @@ -835,8 +827,7 @@ static const IInternetProtocolExVtbl InternetProtocolHandlerVtbl = { ProtocolHandler_Read, ProtocolHandler_Seek, ProtocolHandler_LockRequest, - ProtocolHandler_UnlockRequest, - ProtocolHandler_StartEx + ProtocolHandler_UnlockRequest }; #define BINDINFO_THIS(iface) DEFINE_THIS(BindProtocol, InternetBindInfo, iface) @@ -1365,7 +1356,7 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol ret->from_urlmon = from_urlmon; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); - ret->protocol_handler = (IInternetProtocol*)PROTOCOLHANDLER(ret); + ret->protocol_handler = PROTOCOLHANDLER(ret); InitializeCriticalSection(&ret->section); URLMON_LockModule();

1 0