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

Mariusz Pluciński : include: Add new flags to KF_DEFINITION_FLAGS.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: a0afd4cbd95b82acfb5cbc9f98551538c99fe531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0afd4cbd95b82acfb5cbc9f9… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jun 23 18:50:20 2011 +0200 include: Add new flags to KF_DEFINITION_FLAGS. --- include/shobjidl.idl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 40bca76..53afd68 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2924,7 +2924,9 @@ typedef [v1_enum] enum tagKF_DEFINITION_FLAGS { KFDF_LOCAL_REDIRECT_ONLY = 0x00000002, KFDF_ROAMABLE = 0x00000004, - KFDF_PRECREATE = 0x00000008 + KFDF_PRECREATE = 0x00000008, + KFDF_STREAM = 0x00000010, + KFDF_PUBLISHEXPANDEDPATH = 0x00000020 } KF_DEFINITION_FLAGS; typedef struct tagKNOWNFOLDER_DEFINITION

1 0

Jay Yang : shell32: Implement ILIsEmpty.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 583641bc9d1820a66cdcb4d70df19dd7dcf7105a URL: http://source.winehq.org/git/wine.git/?a=commit;h=583641bc9d1820a66cdcb4d70… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Thu Jun 23 14:56:09 2011 -0400 shell32: Implement ILIsEmpty. --- include/shlobj.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index aab93fc..07981b6 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1696,6 +1696,11 @@ HRESULT WINAPI ILLoadFromStream(LPSTREAM,LPITEMIDLIST*); BOOL WINAPI ILRemoveLastID(LPITEMIDLIST); HRESULT WINAPI ILSaveToStream(LPSTREAM,LPCITEMIDLIST); +static inline BOOL ILIsEmpty(LPCITEMIDLIST pidl) +{ + return !(pidl && pidl->mkid.cb); +} + #include <poppack.h>

1 0

Jay Yang : comctl32: Make ComboBoxEx send CBEN_ENDEDIT when selecting from the dropdown list.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 30fa4cb5d0488e8464a5b4e0f22da1908cf4e235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fa4cb5d0488e8464a5b4e0f… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Thu Jun 23 14:56:14 2011 -0400 comctl32: Make ComboBoxEx send CBEN_ENDEDIT when selecting from the dropdown list. --- dlls/comctl32/comboex.c | 8 ++++---- dlls/comctl32/tests/comboex.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 319696d..3402a71 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1120,10 +1120,10 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) switch (command) { case CBN_DROPDOWN: - SetFocus (infoPtr->hwndCombo); - ShowWindow (infoPtr->hwndEdit, SW_HIDE); - return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); - + SetFocus (infoPtr->hwndCombo); + ShowWindow (infoPtr->hwndEdit, SW_HIDE); + infoPtr->flags |= WCBE_ACTEDIT; + return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); case CBN_CLOSEUP: SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); /* diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 59c261c..172e564 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -42,6 +42,8 @@ static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR #define MAX_CHARS 100 static char *textBuffer = NULL; +static BOOL received_end_edit = FALSE; + static HWND createComboEx(DWORD style) { return CreateWindowExA(0, WC_COMBOBOXEXA, NULL, style, 0, 0, 300, 300, hComboExParentWnd, NULL, hMainHinst, NULL); @@ -341,6 +343,7 @@ static void test_WM_LBUTTONDOWN(void) ok(idx == 4 || broken(idx == -1), /* win98 */ "Current Selection: expected %d, got %d\n", 4, idx); + ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); DestroyWindow(hComboEx); } @@ -427,6 +430,30 @@ static void test_WM_WINDOWPOSCHANGING(void) ok(ret, "DestroyWindow failed\n"); } +static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + NMHDR *hdr = (NMHDR*)lParam; + switch(hdr->code){ + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *edit_info = (NMCBEENDEDITA*)hdr; + if(edit_info->iWhy==CBENF_DROPDOWN){ + received_end_edit = TRUE; + } + break; + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *edit_info = (NMCBEENDEDITW*)hdr; + if(edit_info->iWhy==CBENF_DROPDOWN){ + received_end_edit = TRUE; + } + break; + } + } + return 0; +} + static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -434,7 +461,8 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L case WM_DESTROY: PostQuitMessage(0); break; - + case WM_NOTIFY: + return ComboExTestOnNotify(hWnd,msg,wParam,lParam); default: return DefWindowProcA(hWnd, msg, wParam, lParam); }

1 0

Travis Athougies : d3dx9_36: Added stub D3DXCreateCubeTextureFromFileInMemory.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 4434becd039f502fa34b5f28a7366409332c3193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4434becd039f502fa34b5f28a… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jun 23 18:55:16 2011 -0700 d3dx9_36: Added stub D3DXCreateCubeTextureFromFileInMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index f3b4efe..b212b05 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -39,7 +39,7 @@ @ stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) -@ stub D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 1c40d96..20d8880 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1029,6 +1029,16 @@ HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture, return D3D_OK; } +HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 pDevice, LPCVOID pSrcData, UINT SrcDataSize, + UINT Size, UINT MipLevels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey, + D3DXIMAGE_INFO *pSrcInfo, PALETTEENTRY *pPalette, LPDIRECT3DCUBETEXTURE9 *ppCubeTexture) +{ + FIXME("(%p, %p, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): stub\n", pDevice, pSrcData, SrcDataSize, Size, MipLevels, + Usage, Format, Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppCubeTexture); + + return E_NOTIMPL; +} + enum cube_coord { XCOORD = 0,

1 0

Travis Athougies : d3dx9_36: Added stub implementation of D3DXSaveSurfaceToFileInMemoryA and D3DXSaveSurfaceToFileInMemoryW .
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 59e0573a7b34ef56fb4610047df5db9d1d34b190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e0573a7b34ef56fb4610047… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jun 23 18:55:15 2011 -0700 d3dx9_36: Added stub implementation of D3DXSaveSurfaceToFileInMemoryA and D3DXSaveSurfaceToFileInMemoryW. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/surface.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index b212b05..a9b98a7 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -263,9 +263,9 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stub D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) @ stub D3DXSaveTextureToFileA(ptr long ptr ptr) @ stub D3DXSaveTextureToFileInMemory(ptr long ptr ptr) @ stub D3DXSaveTextureToFileW(ptr long ptr ptr) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 77cad08..82e3612 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -939,3 +939,18 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(LPDIRECT3DSURFACE9 pDestSurface, IDirect3DSurface9_UnlockRect(pSrcSurface); return hr; } + + +HRESULT WINAPI D3DXSaveSurfaceToFileA(LPCSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, + LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +{ + FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); + return D3DERR_INVALIDCALL; +} + +HRESULT WINAPI D3DXSaveSurfaceToFileW(LPCWSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, + LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +{ + FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); + return D3DERR_INVALIDCALL; +}

1 0

Jacek Caban : urlmon: Use proper IUri in BindToObject implementation.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 8646cd772b6ee06ffab9cd2eb96d8ab909cdf54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8646cd772b6ee06ffab9cd2eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:44:57 2011 +0200 urlmon: Use proper IUri in BindToObject implementation. --- dlls/urlmon/tests/url.c | 5 +++++ dlls/urlmon/umon.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 4924154..d752759 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3626,6 +3626,11 @@ static void test_StdURLMoniker(void) ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); ok(!unk, "unk = %p\n", unk); + unk = (void*)0xdeadbeef; + hres = IMoniker_BindToObject(mon, bctx, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(!unk, "unk = %p\n", unk); + IMoniker_Release(mon); } diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 0e6c764..d3eb44e 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -227,7 +227,6 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM { URLMoniker *This = impl_from_IMoniker(iface); IRunningObjectTable *obj_tbl; - IUri *uri; HRESULT hres; TRACE("(%p)->(%p,%p,%s,%p): stub\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppv); @@ -238,14 +237,12 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM IRunningObjectTable_Release(obj_tbl); } - 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); + if(!This->uri) { + *ppv = NULL; + return MK_E_SYNTAX; + } - IUri_Release(uri); - return hres; + return bind_to_object(&This->IMoniker_iface, This->uri, pbc, riid, ppv); } static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc,

1 0

Jacek Caban : mshtml: Use CreateURLMonikerEx2 for creating URL moniker.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: f7b8eccd5f3fc8cf51a4a534b69435337f051ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b8eccd5f3fc8cf51a4a534b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:45:18 2011 +0200 mshtml: Use CreateURLMonikerEx2 for creating URL moniker. --- dlls/mshtml/nsio.c | 56 +++++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b97dbe4..9473754 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -69,6 +69,32 @@ struct nsWineURI { BOOL is_doc_uri; }; +static BOOL ensure_uri(nsWineURI *This) +{ + HRESULT hres; + + if(This->uri) + return TRUE; + + if(This->uri_builder) { + hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUriSimple failed: %08x\n", hres); + return FALSE; + } + + return TRUE; + } + + hres = CreateUri(This->wine_url, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return FALSE; + } + + return TRUE; +} + static nsresult create_uri(nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -886,7 +912,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan IMoniker *mon = NULL; HRESULT hres; - hres = CreateURLMoniker(NULL, This->uri->wine_url, &mon); + hres = CreateURLMonikerEx2(NULL, This->uri->uri, &mon, 0); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08x\n", hres); return NS_ERROR_UNEXPECTED; @@ -927,6 +953,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); + if(!ensure_uri(This->uri)) + return NS_ERROR_FAILURE; + if(This->uri->is_doc_uri) { window = get_channel_window(This); if(window) { @@ -1500,31 +1529,6 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_SetChannelIsForDownload }; -static BOOL ensure_uri(nsWineURI *This) -{ - HRESULT hres; - - if(This->uri) - return TRUE; - - if(This->uri_builder) { - hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); - if(FAILED(hres)) { - WARN("CreateUriSimple failed: %08x\n", hres); - return FALSE; - } - - return TRUE; - } - - hres = CreateUri(This->wine_url, 0, 0, &This->uri); - if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); - return FALSE; - } - - return TRUE; -} static void invalidate_uri(nsWineURI *This) {

1 0

Jacek Caban : mshtml: Use IUri instead of wine_url in before_async_open.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 7a0363cd9445285e5e18fe9c7b3e85c1954a40e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0363cd9445285e5e18fe9c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:45:34 2011 +0200 mshtml: Use IUri instead of wine_url in before_async_open. --- dlls/mshtml/nsio.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9473754..b47a643 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -126,7 +126,7 @@ HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) return S_OK; } -static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) +static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url) { IOleCommandTarget *cmdtrg = NULL; HRESULT hres; @@ -136,13 +136,12 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) VARIANT varUrl, varRes; V_VT(&varUrl) = VT_BSTR; - V_BSTR(&varUrl) = SysAllocString(url); + V_BSTR(&varUrl) = url; V_VT(&varRes) = VT_BOOL; hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &varUrl, &varRes); IOleCommandTarget_Release(cmdtrg); - SysFreeString(V_BSTR(&varUrl)); if(SUCCEEDED(hres) && !V_BOOL(&varRes)) { TRACE("got VARIANT_FALSE, do not load\n"); @@ -153,11 +152,10 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) return TRUE; } -static BOOL before_async_open(nsChannel *channel, NSContainer *container) +static nsresult before_async_open(nsChannel *channel, NSContainer *container, BOOL *cancel) { HTMLDocumentObj *doc = container->doc; DWORD hlnf = 0; - BOOL cancel; HRESULT hres; if(!doc) { @@ -169,14 +167,31 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) doc = container_iter->doc; } - if(!doc->client) - return TRUE; + if(!doc->client) { + *cancel = TRUE; + return NS_OK; + } - if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) - return FALSE; + if(!hlnf) { + BSTR display_uri; + BOOL b; + + hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, &cancel); - return FAILED(hres) || cancel; + b = !exec_shldocvw_67(doc, display_uri); + SysFreeString(display_uri); + if(b) { + *cancel = FALSE; + return NS_OK; + } + } + + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, cancel); + if(FAILED(hres)) + *cancel = TRUE; + return NS_OK; } HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, DWORD flags) @@ -948,7 +963,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen { nsChannel *This = impl_from_nsIHttpChannel(iface); HTMLWindow *window = NULL; - BOOL open = TRUE; + BOOL cancel = FALSE; nsresult nsres = NS_OK; TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); @@ -967,7 +982,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(This->uri->container->doc) FIXME("nscontainer->doc = %p\n", This->uri->container->doc); - b = before_async_open(This, This->uri->container); + nsres = before_async_open(This, This->uri->container, &b); + if(NS_FAILED(nsres)) + return nsres; if(b) FIXME("Navigation not cancelled\n"); return NS_ERROR_UNEXPECTED; @@ -1003,17 +1020,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen This->content_type = heap_strdupWtoA(window->doc_obj->mime); } - open = FALSE; + cancel = TRUE; }else { - open = !before_async_open(This, window->doc_obj->nscontainer); - if(!open) { + nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + if(NS_SUCCEEDED(nsres) && cancel) { TRACE("canceled\n"); nsres = NS_ERROR_UNEXPECTED; } } } - if(open) + if(!cancel) nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); if(NS_SUCCEEDED(nsres) && This->load_group) {

1 0

Huw Davies : gdi32/tests: Show that Get/SetDIBits ignore the layout mode.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: e2f1bd4f8fef3bcc1bd5f1a405bf8f25dab43d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f1bd4f8fef3bcc1bd5f1a40… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 23 14:30:03 2011 +0100 gdi32/tests: Show that Get/SetDIBits ignore the layout mode. --- dlls/gdi32/tests/bitmap.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ca53fc7..d21d502 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -33,6 +33,7 @@ #include "wine/test.h" static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } @@ -3080,12 +3081,80 @@ static void test_GetDIBits_top_down(int bpp) DeleteObject(bmptb); } +static void test_GetSetDIBits_rtl(void) +{ + HDC hdc, hdc_mem; + HBITMAP bitmap, orig_bitmap; + BITMAPINFO info; + int ret; + DWORD bits_1[8 * 8], bits_2[8 * 8]; + + if(!pSetLayout) + { + win_skip("Don't have SetLayout\n"); + return; + } + + hdc = GetDC( NULL ); + hdc_mem = CreateCompatibleDC( hdc ); + pSetLayout( hdc_mem, LAYOUT_LTR ); + + bitmap = CreateCompatibleBitmap( hdc, 8, 8 ); + orig_bitmap = SelectObject( hdc_mem, bitmap ); + SetPixel( hdc_mem, 0, 0, RGB(0xff, 0, 0) ); + SelectObject( hdc_mem, orig_bitmap ); + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = 8; + info.bmiHeader.biHeight = 8; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + + /* First show that GetDIBits ignores the layout mode. */ + + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ok(bits_1[56] == 0xff0000, "got %08x\n", bits_1[56]); /* check we have a red pixel */ + + pSetLayout( hdc_mem, LAYOUT_RTL ); + + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + + ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); + + /* Now to show that SetDIBits also ignores the mode, we perform a SetDIBits + followed by a GetDIBits and show that the bits remain unchanged. */ + + pSetLayout( hdc_mem, LAYOUT_LTR ); + + ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); + + pSetLayout( hdc_mem, LAYOUT_RTL ); + + ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); + ok(ret == 8, "got %d\n", ret); + ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); + + DeleteObject( bitmap ); + DeleteDC( hdc_mem ); + ReleaseDC( NULL, hdc ); +} + START_TEST(bitmap) { HMODULE hdll; hdll = GetModuleHandle("gdi32.dll"); pGdiAlphaBlend = (void*)GetProcAddress(hdll, "GdiAlphaBlend"); + pSetLayout = (void*)GetProcAddress(hdll, "SetLayout"); test_createdibitmap(); test_dibsections(); @@ -3112,4 +3181,5 @@ START_TEST(bitmap) test_GetDIBits_top_down(16); test_GetDIBits_top_down(24); test_GetDIBits_top_down(32); + test_GetSetDIBits_rtl(); }

1 0

Jacek Caban : urlmon: Added CoInternetIsFeatureEnabledForUrl stub implementation.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 01653331befa45b05c8c1dfe7130269aa7f76271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01653331befa45b05c8c1dfe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 15:44:28 2011 +0200 urlmon: Added CoInternetIsFeatureEnabledForUrl stub implementation. --- dlls/urlmon/internet.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index c09bace..06a423a 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -693,3 +693,13 @@ HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWOR TRACE("(%d, %08x)\n", FeatureEntry, dwFlags); return get_internet_feature(FeatureEntry, dwFlags); } + +/*********************************************************************** + * CoInternetIsFeatureEnabledForUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags, LPCWSTR szURL, + IInternetSecurityManager *pSecMgr) +{ + FIXME("(%d %08x %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 9765167..3536257 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -21,6 +21,7 @@ @ stdcall CoInternetGetSecurityUrlEx(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetIsFeatureEnabled(long long) +@ stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) diff --git a/include/urlmon.idl b/include/urlmon.idl index f282dbb..a8a0a71 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1977,6 +1977,8 @@ cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DW cpp_quote("HRESULT WINAPI CoInternetParseIUri(IUri*,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") +cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST,DWORD dwFlags);") +cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST,DWORD,LPCWSTR,IInternetSecurityManager*);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri*,IUri**,PSUACTION,DWORD_PTR);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);")

1 0