May 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Add tests for IWICMetadataBlockReader on handler classes.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: a6bf3735f28db26f73241f0e422fbeb9941741bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bf3735f28db26f73241f0e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 30 14:52:53 2012 -0500 windowscodecs: Add tests for IWICMetadataBlockReader on handler classes. --- dlls/windowscodecs/tests/metadata.c | 43 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 721b10e..5cde494 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -156,6 +156,7 @@ static void test_metadata_unknown(void) HRESULT hr; IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; + IWICMetadataBlockReader *blockreader; PROPVARIANT schema, id, value; ULONG items_returned; @@ -197,6 +198,12 @@ static void test_metadata_unknown(void) IWICEnumMetadataItem_Release(enumerator); } + hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + IWICMetadataBlockReader_Release(blockreader); + IWICMetadataReader_Release(reader); } @@ -335,6 +342,7 @@ static void test_metadata_IFD(void) }; HRESULT hr; IWICMetadataReader *reader; + IWICMetadataBlockReader *blockreader; IWICEnumMetadataItem *enumerator; PROPVARIANT schema, id, value; ULONG items_returned, count, i; @@ -427,6 +435,40 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetValueByIndex(reader, count, &schema, NULL, NULL); ok(hr == E_INVALIDARG, "GetValueByIndex should fail\n"); + hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + IWICMetadataBlockReader_Release(blockreader); + + IWICMetadataReader_Release(reader); +} + +static void test_metadata_Exif(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + IWICMetadataBlockReader *blockreader; + UINT count=0; + + hr = CoCreateInstance(&CLSID_WICExifMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + + hr = IWICMetadataReader_GetCount(reader, NULL); + ok(hr == E_INVALIDARG, "GetCount error %#x\n", hr); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 0, "unexpected count %u\n", count); + + hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + IWICMetadataBlockReader_Release(blockreader); + IWICMetadataReader_Release(reader); } @@ -495,6 +537,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); test_metadata_IFD(); + test_metadata_Exif(); test_create_reader(); CoUninitialize(); diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 5cca0a5..55e3654 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -38,12 +38,14 @@ typedef enum WICMetadataCreationOptions { cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatExif, 0x1c3c4f9d,0xb84a,0x467d,0x94,0x93,0x36,0xcf,0xbd,0x59,0xea,0x57);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") +cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") [ object,

1 0

Vincent Povirk : wine.inf: Do not install .NET registry keys and fake dlls.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 7b54917f28edf84c4d9db2e1a52e4dac67dd7e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b54917f28edf84c4d9db2e1a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 29 11:05:15 2012 -0500 wine.inf: Do not install .NET registry keys and fake dlls. --- tools/wine.inf.in | 67 ++++++++++++---------------------------------------- 1 files changed, 16 insertions(+), 51 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d4b53cf..03a748a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -38,7 +38,6 @@ AddReg=\ ControlPanel,\ CurrentVersion,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -63,7 +62,6 @@ AddReg=\ ControlPanel,\ CurrentVersion,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -91,7 +89,6 @@ AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -114,7 +111,6 @@ AddReg=\ CurrentVersionWow64,\ Debugger,\ DirectX,\ - Dotnet,\ MCI,\ Misc,\ Tapi,\ @@ -514,32 +510,6 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Mouse,Beep,2,"No" -[DotNet] -HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" -HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" -HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 - [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00 @@ -696,16 +666,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AA HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" - -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" - HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 @@ -2537,6 +2497,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,mountmgr.sys,- +; skip .NET fake dlls in Wine Mono package +11,,aspnet_regiis.exe,- +11,,ngen.exe,- +11,,fusion.dll,- +11,,regsvcs.exe,- +11,,regasm.exe,- +11,,servicemodelreg.exe,- +11,,presentationfontcache.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll @@ -2565,6 +2533,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys +; skip .NET fake dlls in Wine Mono package +11,,aspnet_regiis.exe,- +11,,ngen.exe,- +11,,fusion.dll,- +11,,regsvcs.exe,- +11,,regasm.exe,- +11,,servicemodelreg.exe,- +11,,presentationfontcache.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll @@ -2572,17 +2548,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml4.dll 11,,msxml6.dll 11,,shdocvw.dll -10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe -10,Microsoft.NET\Framework\v1.1.4322,ngen.exe -10,Microsoft.NET\Framework\v1.1.4322,fusion.dll -10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe -10,Microsoft.NET\Framework\v2.0.50727,ngen.exe -10,Microsoft.NET\Framework\v2.0.50727,fusion.dll -10,Microsoft.NET\Framework\v2.0.50727,regasm.exe -10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe -10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe -10,Microsoft.NET\Framework\v4.0.30319,ngen.exe -10,Microsoft.NET\Framework\v4.0.30319,fusion.dll 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe 16422,Internet Explorer,iexplore.exe

1 0

Jacek Caban : urlmon: Set INTERNET_ERROR_MASK_COMBINED_SEC_CERT flag for HTTP requests.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 586e8b0c616124c61991e8fb371a72db6c338fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e8b0c616124c61991e8fb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 16:53:20 2012 +0200 urlmon: Set INTERNET_ERROR_MASK_COMBINED_SEC_CERT flag for HTTP requests. --- dlls/urlmon/http.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index a081ad0..e1ac49c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -276,7 +276,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques LPOLESTR accept_mimes[257]; const WCHAR **accept_types; BYTE security_id[512]; - DWORD len, port; + DWORD len, port, flags; ULONG num, error; BOOL res, b; HRESULT hres; @@ -419,10 +419,15 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques } } + flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT; + res = InternetSetOptionW(This->base.request, INTERNET_OPTION_ERROR_MASK, &flags, sizeof(flags)); + if(!res) + WARN("InternetSetOption(INTERNET_OPTION_ERROR_MASK) failed: %u\n", GetLastError()); + b = TRUE; res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); if(!res) - WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %08x\n", GetLastError()); + WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %u\n", GetLastError()); do { error = send_http_request(This);

1 0

Jacek Caban : urlmon: Correctly handle BINDF_NO_UI in handle_http_error.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 45a6619e445cc1b0a1a86811b6ec1e1bbb56b90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a6619e445cc1b0a1a86811b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 16:53:32 2012 +0200 urlmon: Correctly handle BINDF_NO_UI in handle_http_error. --- dlls/urlmon/http.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index e1ac49c..7ec93fc 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -119,6 +119,9 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) IWindowForBindingUI *wfb_ui; IHttpSecurity *http_security; BOOL security_problem; + DWORD dlg_flags; + HWND hwnd; + DWORD res; HRESULT hres; switch(error) { @@ -183,7 +186,6 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); if(SUCCEEDED(hres)) { - HWND hwnd; const IID *iid_reason; if(security_problem) @@ -194,26 +196,20 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) iid_reason = &IID_IWindowForBindingUI; hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); - if(SUCCEEDED(hres) && hwnd) - { - DWORD res; - - res = InternetErrorDlg(hwnd, This->base.request, error, - FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA, - NULL); - - if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS) - hres = RPC_E_RETRY; - else - hres = E_FAIL; - } IWindowForBindingUI_Release(wfb_ui); + if(FAILED(hres)) + hwnd = NULL; } IServiceProvider_Release(serv_prov); - if(hres == RPC_E_RETRY) - return hres; + dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA; + if(This->base.bindf & BINDF_NO_UI) + dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI; + + res = InternetErrorDlg(hwnd, This->base.request, error, dlg_flags, NULL); + if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS) + return RPC_E_RETRY; return internet_error_to_hres(error); }

1 0

Rico Schüller : d3dx9: Crop the input in ID3DXBaseEffect::SetBool().
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: f658aabfd5a49506d2b916805e3df7556442853e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f658aabfd5a49506d2b916805… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 30 14:36:18 2012 +0200 d3dx9: Crop the input in ID3DXBaseEffect::SetBool(). --- dlls/d3dx9_36/effect.c | 2 ++ dlls/d3dx9_36/tests/effect.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index def73a0..5ac79d1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1725,6 +1725,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { + /* crop input */ + b = b ? TRUE : FALSE; set_number(param->data, param->type, &b, D3DXPT_BOOL); return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index eb52f7e..c4046c7 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1857,11 +1857,12 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); /* SetBool */ - bvalue = 1; + bvalue = 5; memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); hr = effect->lpVtbl->SetBool(effect, parameter, bvalue); if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) { + bvalue = bvalue ? TRUE : FALSE; set_number(expected_value, res_desc->Type, &bvalue, D3DXPT_BOOL); ok(hr == D3D_OK, "%u - %s: SetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); }

1 0

Jacek Caban : mshtml: Added IWindowForBindingUI stub implementation.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: cf9d0d320c0603018d3c463f8daa69cbfd68a755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9d0d320c0603018d3c463f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:15 2012 +0200 mshtml: Added IWindowForBindingUI stub implementation. --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/mshtml_private.h | 3 ++ dlls/mshtml/service.c | 5 +++ dlls/mshtml/view.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 05eb664..a0ab79d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2428,6 +2428,8 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->usermode = UNKNOWN_USERMODE; + init_binding_ui(doc); + hres = create_nscontainer(doc, &doc->nscontainer); if(FAILED(hres)) { ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n"); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7eaaa57..3eb81b9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -453,6 +453,8 @@ struct HTMLDocumentObj { ICustomDoc ICustomDoc_iface; ITargetContainer ITargetContainer_iface; + IWindowForBindingUI IWindowForBindingUI_iface; + LONG ref; NSContainer *nscontainer; @@ -657,6 +659,7 @@ void HTMLDocument_Service_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Hlink_Init(HTMLDocument*) DECLSPEC_HIDDEN; void TargetContainer_Init(HTMLDocumentObj*) DECLSPEC_HIDDEN; +void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 9cafbf0..56744e6 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -254,6 +254,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IHTMLDocument2_QueryInterface(&This->IHTMLDocument2_iface, riid, ppv); } + if(IsEqualGUID(&IID_IWindowForBindingUI, guidService)) { + TRACE("IID_IWindowForBindingUI\n"); + return IWindowForBindingUI_QueryInterface(&This->doc_obj->IWindowForBindingUI_iface, riid, ppv); + } + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 3852046..6701987 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -912,3 +912,59 @@ void HTMLDocument_View_Init(HTMLDocument *This) This->IOleDocumentView_iface.lpVtbl = &OleDocumentViewVtbl; This->IViewObjectEx_iface.lpVtbl = &ViewObjectVtbl; } + +static inline HTMLDocumentObj *impl_from_IWindowForBindingUI(IWindowForBindingUI *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentObj, IWindowForBindingUI_iface); +} + +static HRESULT WINAPI WindowForBindingUI_QueryInterface(IWindowForBindingUI *iface, REFIID riid, void **ppv) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWindowForBindingUI_iface; + }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { + TRACE("(%p)->(IID_IWindowForBindingUI %p)\n", This, ppv); + *ppv = &This->IWindowForBindingUI_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WindowForBindingUI_AddRef(IWindowForBindingUI *iface) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + return htmldoc_addref(&This->basedoc); +} + +static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + return htmldoc_release(&This->basedoc); +} + +static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); + return E_NOTIMPL; +} + +static const IWindowForBindingUIVtbl WindowForBindingUIVtbl = { + WindowForBindingUI_QueryInterface, + WindowForBindingUI_AddRef, + WindowForBindingUI_Release, + WindowForBindingUI_GetWindow +}; + +void init_binding_ui(HTMLDocumentObj *doc) +{ + doc->IWindowForBindingUI_iface.lpVtbl = &WindowForBindingUIVtbl; +}

1 0

Jacek Caban : mshtml: Forward BSCallback::QueryService call to document.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 0847563dd410916f3a1095bff3afc2fb71981064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0847563dd410916f3a1095bff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:41 2012 +0200 mshtml: Forward BSCallback::QueryService call to document. --- dlls/mshtml/view.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 6701987..08c5332 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -953,8 +953,11 @@ static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd) { HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); + + *phwnd = This->hwnd; + return S_OK; } static const IWindowForBindingUIVtbl WindowForBindingUIVtbl = {

1 0

Henri Verbeet : wined3d: Use NAN.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 1a93983bd4baed5a7e1a6ac522236c16509027c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a93983bd4baed5a7e1a6ac52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:56 2012 +0200 wined3d: Use NAN. --- dlls/wined3d/drawprim.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2e30175..c8944e5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -25,6 +25,8 @@ */ #include "config.h" +#include "wine/port.h" + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dc63d8b..f8f301a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -25,6 +25,8 @@ */ #include "config.h" +#include "wine/port.h" + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 096fe60..6632f6e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -200,7 +200,7 @@ static inline float float_16_to_32(const unsigned short *in) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + else return NAN; } } @@ -222,7 +222,7 @@ static inline float float_24_to_32(DWORD in) else { if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + else return NAN; } }

1 0

Henri Verbeet : ddraw/tests: Add test_redundant_mode_set() for older ddraw versions.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 643a68f6929096ca9a41645be47e5805d12a85ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=643a68f6929096ca9a41645be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:58 2012 +0200 ddraw/tests: Add test_redundant_mode_set() for older ddraw versions. --- dlls/ddraw/tests/ddraw1.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e53a1cd..f27fb8a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1877,6 +1877,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC surface_desc = {0}; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -1892,4 +1945,5 @@ START_TEST(ddraw1) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7f1ae88..1f690aa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2014,6 +2014,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC surface_desc = {0}; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw2_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw2_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw2_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -2031,4 +2084,5 @@ START_TEST(ddraw2) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6f00b41..9d9a1bf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2138,6 +2138,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC2 surface_desc = {0}; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw4_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw4_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw4_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2156,4 +2209,5 @@ START_TEST(ddraw4) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DSwapChain9Impl.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: d4c5c03cbb744cfa0c5f7a529471dff0da5f6b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c5c03cbb744cfa0c5f7a529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:59 2012 +0200 d3d9: Get rid of IDirect3DSwapChain9Impl. --- dlls/d3d9/d3d9_private.h | 18 ++---- dlls/d3d9/device.c | 6 +- dlls/d3d9/swapchain.c | 157 +++++++++++++++++++++++----------------------- 3 files changed, 86 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4c5c03cbb744cfa0c5f7…

1 0