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

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

May 30, 2012

Module: wine Branch: master Commit: 5665730a32f3803c96a40aa570a7d25a7aa905a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5665730a32f3803c96a40aa57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:54 2012 +0200 mshtml: Added IWindowForBindingUI tests. --- dlls/mshtml/tests/htmldoc.c | 73 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 838e2ae..3a35abf 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -94,7 +94,7 @@ DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa, static IOleDocumentView *view = NULL; -static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; +static HWND container_hwnd = NULL, doc_hwnd = NULL, last_hwnd = NULL; DEFINE_EXPECT(LockContainer); DEFINE_EXPECT(SetActiveObject); @@ -346,7 +346,7 @@ static void test_timer(DWORD flags) if(flags & EXPECT_SETTITLE) SET_EXPECT(Exec_SETTITLE); - while(!*b && GetMessage(&msg, hwnd, 0, 0)) { + while(!*b && GetMessage(&msg, doc_hwnd, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } @@ -1295,6 +1295,45 @@ static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pcb, IMoni return E_NOTIMPL; } +static void test_binding_ui(IUnknown *unk) +{ + IWindowForBindingUI *binding_ui; + IServiceProvider *serv_prov; + HWND binding_hwnd; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&serv_prov); + ok(hres == S_OK, "Could not get IServiceProvider: %08x\n", hres); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, + (void**)&binding_ui); + ok(hres == S_OK, "Could not get IWindowForBindingUI: %08x\n", hres); + + hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IHttpSecurity, &binding_hwnd); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + if(doc_hwnd) + ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); + else + todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); + + hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IAuthenticate, &binding_hwnd); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + if(doc_hwnd) + ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); + else + todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); + + hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IWindowForBindingUI, &binding_hwnd); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + if(doc_hwnd) + ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); + else + todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); + + IWindowForBindingUI_Release(binding_ui); + IServiceProvider_Release(serv_prov); +} + static void continue_binding(IBindStatusCallback *callback) { FORMATETC formatetc = {0xc02d, NULL, 1, -1, TYMED_ISTREAM}; @@ -1303,6 +1342,8 @@ static void continue_binding(IBindStatusCallback *callback) static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + test_binding_ui((IUnknown*)callback); + if(report_mime) { hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); @@ -2162,6 +2203,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08x\n", hres); if(activeobj) { + HWND hwnd = (void*)0xdeadbeef; hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd); @@ -2201,11 +2243,11 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum CHECK_CALLED(ShowUI); if(activeobj) { - hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &doc_hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(hwnd != NULL, "hwnd == NULL\n"); + ok(doc_hwnd != NULL, "hwnd == NULL\n"); if(last_hwnd) - ok(hwnd == last_hwnd, "hwnd != last_hwnd\n"); + ok(doc_hwnd == last_hwnd, "hwnd != last_hwnd\n"); } hres = IOleDocumentView_UIActivate(view, TRUE); @@ -2214,7 +2256,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum if(activeobj) { hres = IOleInPlaceActiveObject_GetWindow(activeobj, &tmp_hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); + ok(tmp_hwnd == doc_hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, doc_hwnd); } } @@ -2253,11 +2295,11 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum CHECK_CALLED(Exec_SETPROGRESSPOS); if(activeobj) { - hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &doc_hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(hwnd != NULL, "hwnd == NULL\n"); + ok(doc_hwnd != NULL, "doc_hwnd == NULL\n"); if(last_hwnd) - ok(hwnd == last_hwnd, "hwnd != last_hwnd\n"); + ok(doc_hwnd == last_hwnd, "doc_hwnd != last_hwnd\n"); } } @@ -6154,7 +6196,7 @@ static void test_Activate(IHTMLDocument2 *doc, DWORD flags) GUID guid; HRESULT hres; - last_hwnd = hwnd; + last_hwnd = doc_hwnd; if(view) IOleDocumentView_Release(view); @@ -6219,10 +6261,10 @@ static void test_Window(IHTMLDocument2 *doc, BOOL expect_success) if(expect_success) { ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); + ok(tmp_hwnd == doc_hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, doc_hwnd); }else { ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); - ok(IsWindow(hwnd), "hwnd is destroyed\n"); + ok(IsWindow(doc_hwnd), "hwnd is destroyed\n"); } IOleInPlaceActiveObject_Release(activeobject); @@ -6574,7 +6616,7 @@ static void test_QueryInterface(IHTMLDocument2 *doc) static void init_test(enum load_state_t ls) { doc_unk = NULL; - hwnd = last_hwnd = NULL; + doc_hwnd = last_hwnd = NULL; set_clientsite = FALSE; load_from_stream = FALSE; call_UIActivate = CallUIActivate_None; @@ -6686,9 +6728,9 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) IOleDocumentView_Release(view); view = NULL; - ok(IsWindow(hwnd), "hwnd is destroyed\n"); + ok(IsWindow(doc_hwnd), "hwnd is destroyed\n"); release_document(doc); - ok(!IsWindow(hwnd), "hwnd is not destroyed\n"); + ok(!IsWindow(doc_hwnd), "hwnd is not destroyed\n"); } static void test_HTMLDocument_hlink(DWORD status) @@ -6820,6 +6862,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_GetCurMoniker((IUnknown*)doc, http_mon, NULL); test_travellog(doc); + test_binding_ui((IUnknown*)doc); nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */ if(support_wbapp) {

1 0

Henri Verbeet : ddraw/tests: Move test_redundant_mode_set() to ddraw7.c.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 5582e1c9fed839f614bf3ad79b2b077a9894b7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5582e1c9fed839f614bf3ad79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:57 2012 +0200 ddraw/tests: Move test_redundant_mode_set() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 61 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0daad33..a51fbd5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3527,66 +3527,6 @@ static void BackBuffer3DAttachmentTest(void) DestroyWindow(window); } -static void test_redundant_mode_set(void) -{ - DDSURFACEDESC2 surface_desc = {0}; - IDirectDraw7 *ddraw7; - HWND window; - HRESULT hr; - RECT r, s; - ULONG ref; - - hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); - if (FAILED(hr)) - { - skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); - return; - } - - window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, - 0, 0, 100, 100, 0, 0, 0, 0); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - if (FAILED(hr)) - { - IDirectDraw7_Release(ddraw7); - DestroyWindow(window); - return; - } - - surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDraw7_GetDisplayMode(ddraw7, &surface_desc); - ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); - - hr = IDirectDraw7_SetDisplayMode(ddraw7, 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 = IDirectDraw7_SetDisplayMode(ddraw7, 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 = IDirectDraw7_Release(ddraw7); - ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); - - DestroyWindow(window); -} - static SIZE screen_size; static LRESULT CALLBACK mode_set_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) @@ -4690,7 +4630,6 @@ START_TEST(d3d) D3D1_releaseObjects(); } - test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); test_coop_level_surf_create(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3d151e1..2b08ecc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1947,6 +1947,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC2 surface_desc = {0}; + IDirectDraw7 *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 = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw7_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 = IDirectDraw7_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 = IDirectDraw7_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -1972,4 +2025,5 @@ START_TEST(ddraw7) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); }

1 0

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

May 30, 2012

Module: wine Branch: master Commit: cb9cc2ccee7f49e5359309f6b8a5ed183125cb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9cc2ccee7f49e5359309f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:15:00 2012 +0200 d3d9: Get rid of IDirect3DSurface9Impl. --- dlls/d3d9/d3d9_private.h | 30 ++---- dlls/d3d9/device.c | 49 +++++----- dlls/d3d9/surface.c | 251 ++++++++++++++++++++++----------------------- dlls/d3d9/swapchain.c | 4 +- dlls/d3d9/texture.c | 12 +- 5 files changed, 164 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb9cc2ccee7f49e535930…

1 0

Jacek Caban : mshtml: Added support for BSCallback::QueryService( IID_IWindowForBindingUI).
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 3c1e2132e5e2efc1ba80fd6cfb6a2715d19c253c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1e2132e5e2efc1ba80fd6cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:28 2012 +0200 mshtml: Added support for BSCallback::QueryService(IID_IWindowForBindingUI). --- dlls/mshtml/navigate.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3697070..1979af3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -582,7 +582,11 @@ static HRESULT WINAPI BSCServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { BSCallback *This = impl_from_IServiceProvider(iface); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(This->doc && IsEqualGUID(guidService, &IID_IWindowForBindingUI)) + return IServiceProvider_QueryService(&This->doc->basedoc.IServiceProvider_iface, guidService, riid, ppv); return E_NOINTERFACE; } @@ -721,6 +725,8 @@ HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bsc TRACE("(%p %p %p %p)\n", window, doc, bscallback, bctx); bscallback->doc = doc; + if(!doc && window) + bscallback->doc = window->doc; /* NOTE: IE7 calls IsSystemMoniker here*/ @@ -992,8 +998,11 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) list_remove(&This->bsc.entry); list_init(&This->bsc.entry); update_window_doc(This->window); - if(This->window->doc != This->bsc.doc) + if(This->window->doc != This->bsc.doc) { + if(This->bsc.doc) + list_remove(&This->bsc.entry); This->bsc.doc = This->window->doc; + } list_add_head(&This->bsc.doc->bindings, &This->bsc.entry); if(This->window->readystate != READYSTATE_LOADING) set_ready_state(This->window, READYSTATE_LOADING);

1 0

Jacek Caban : wininet: Use CRLF separator in INTERNET_CERTIFICATE_INFO.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 37e483d567327fb65c71970fe2992ddd12b7f937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e483d567327fb65c71970fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 12:13:53 2012 +0200 wininet: Use CRLF separator in INTERNET_CERTIFICATE_INFO. --- dlls/wininet/http.c | 8 ++++---- dlls/wininet/tests/http.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 74c9006..54ac0d5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2130,18 +2130,18 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->ftExpiry = context->pCertInfo->NotAfter; info->ftStart = context->pCertInfo->NotBefore; len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); info->lpszSubjectInfo = LocalAlloc(0, len); if(info->lpszSubjectInfo) CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, info->lpszSubjectInfo, len); len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); info->lpszIssuerInfo = LocalAlloc(0, len); if(info->lpszIssuerInfo) CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, info->lpszIssuerInfo, len); info->dwKeySize = NETCON_GetCipherStrength(req->netconn); CertFreeCertificateContext(context); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2e7b693..204c5b7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2878,6 +2878,45 @@ static void release_cert_info(INTERNET_CERTIFICATE_INFOA *info) LocalFree(info->lpszEncryptionAlgName); } +static void test_cert_struct(HINTERNET req) +{ + INTERNET_CERTIFICATE_INFOA info; + DWORD size; + BOOL res; + + static const char ex_subject[] = + "US\r\n" + "Minnesota\r\n" + "Saint Paul\r\n" + "WineHQ\r\n" + "test.winehq.org\r\n" + "webmaster(a)winehq.org"; + + static const char ex_issuer[] = + "US\r\n" + "Minnesota\r\n" + "WineHQ\r\n" + "test.winehq.org\r\n" + "webmaster(a)winehq.org"; + + memset(&info, 0x5, sizeof(&info)); + + size = sizeof(info); + res = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + ok(size == sizeof(info), "size = %u\n", size); + + ok(!strcmp(info.lpszSubjectInfo, ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); + ok(!strcmp(info.lpszIssuerInfo, ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); + ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); + ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); + ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); + todo_wine + ok(info.dwKeySize == 128, "dwKeySize = %u\n", info.dwKeySize); + + release_cert_info(&info); +} + #define test_secflags_option(a,b) _test_secflags_option(__LINE__,a,b) static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) { @@ -3058,6 +3097,8 @@ static void test_security_flags(void) test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA |SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_cert_struct(req); + res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n");

1 0

Jacek Caban : jscript: Added missing port.h include to lex.c.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: de5495ba86e0a99ed94b2894298ea6708dbbbe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5495ba86e0a99ed94b28942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 10:17:18 2012 +0200 jscript: Added missing port.h include to lex.c. --- dlls/jscript/lex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 022c06e..06d0b89 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <math.h> +#include "config.h" +#include "wine/port.h" + #include <limits.h> #include "jscript.h"

1 0

Austin English : wine.inf: Add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinSock2\Parameters\Protocol_Catalog9\Catalog_Entries registry entry .
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: 29cac72d1ad794034bbf424b0e1f30ec634b2976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cac72d1ad794034bbf424b0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 29 11:39:46 2012 -0700 wine.inf: Add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinSock2\Parameters\Protocol_Catalog9\Catalog_Entries registry entry. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index abd5307..b182953 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3047,7 +3047,7 @@ HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 -HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Alexandre Julliard : appwiz.cpl: Specify a default download URL for add-ons .
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: d8b6b01bca3c5bb017518781dd595abb86aa5135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b6b01bca3c5bb017518781d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 13:22:46 2012 +0200 appwiz.cpl: Specify a default download URL for add-ons. --- dlls/appwiz.cpl/addons.c | 53 ++++++++++++++++++++++++++-------------------- dlls/mshtml/mshtml.inf | 6 +---- tools/wine.inf.in | 2 - 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4a5acba..fd48487 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -72,6 +72,7 @@ typedef struct { const char *file_name; const char *subdir_name; const char *sha; + const char *url_default; const char *config_key; const char *url_config_key; const char *dir_config_key; @@ -84,6 +85,7 @@ static const addon_info_t addons_info[] = { "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", GECKO_SHA, + "http://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG) }, @@ -92,6 +94,7 @@ static const addon_info_t addons_info[] = { "wine-mono-" MONO_VERSION ".msi", "mono", MONO_SHA, + "http://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", MAKEINTRESOURCEW(ID_DWL_MONO_DIALOG) } @@ -425,6 +428,22 @@ static const IBindStatusCallbackVtbl InstallCallbackVtbl = { static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; +static void append_url_params( WCHAR *url ) +{ + static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; + static const WCHAR v_formatW[] = {'&','v','='}; + DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR); + DWORD len = strlenW(url); + + memcpy(url+len, arch_formatW, sizeof(arch_formatW)); + len += sizeof(arch_formatW)/sizeof(WCHAR); + len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), + url+len, size/sizeof(WCHAR)-len)-1; + memcpy(url+len, v_formatW, sizeof(v_formatW)); + len += sizeof(v_formatW)/sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); +} + static LPWSTR get_url(void) { DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); @@ -434,36 +453,24 @@ static LPWSTR get_url(void) DWORD returned_size; static const WCHAR httpW[] = {'h','t','t','p'}; - static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; - static const WCHAR v_formatW[] = {'&','v','='}; - - hkey = open_config_key(); - if(!hkey) - return NULL; url = heap_alloc(size); returned_size = size; - config_key = heap_strdupAtoW(addon->url_config_key); - res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); - heap_free(config_key); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { - heap_free(url); - return NULL; + hkey = open_config_key(); + if (hkey) + { + config_key = heap_strdupAtoW(addon->url_config_key); + res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); + heap_free(config_key); + RegCloseKey(hkey); + if(res == ERROR_SUCCESS && type == REG_SZ) goto found; } - if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { - DWORD len; + MultiByteToWideChar( CP_ACP, 0, addon->url_default, -1, url, size / sizeof(WCHAR) ); - len = strlenW(url); - memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += sizeof(arch_formatW)/sizeof(WCHAR); - len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += sizeof(v_formatW)/sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); - } +found: + if (returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) append_url_params( url ); TRACE("Got URL %s\n", debugstr_w(url)); return url; diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 8186c2d..4a650b4 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg, WineGecko.Reg +AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg [UnregisterDll] @@ -69,10 +69,6 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47 HKLM,"Software\Microsoft\Internet Explorer\ActiveX Compatibility","Version",,"6.17" -[WineGecko.Reg] -HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" - - [FileAssoc.Reg] ;; AVI diff --git a/tools/wine.inf.in b/tools/wine.inf.in index b182953..f95d9dc 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -712,8 +712,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" -HKCU,SOFTWARE\Wine\Dotnet,"MonoUrl",,"http://source.winehq.org/winemono.php" - [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,""

1 0

Lucas Zawacki : dinput: Implement GetProperty for JOYSTICKID (Linux driver) .
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: fbfdc6db650b6d1038dd193375b1880a95c0d535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbfdc6db650b6d1038dd19337… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:26 2012 -0300 dinput: Implement GetProperty for JOYSTICKID (Linux driver). --- dlls/dinput/joystick_linux.c | 40 ++++++++++++++++++++++++++++++++++++++-- include/dinput.h | 1 + 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d951e76..5afd07c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -542,6 +542,42 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) } /****************************************************************************** + * GetProperty : get input device properties + */ +static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (!IS_DIPROP(rguid)) return DI_OK; + + switch (LOWORD(rguid)) { + + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + + default: + return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); + } + + return DI_OK; +} + +static HRESULT WINAPI JoystickLinuxAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + +/****************************************************************************** * Unacquire : frees the joystick */ static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) @@ -655,7 +691,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickAGenericImpl_GetProperty, + JoystickLinuxAImpl_GetProperty, JoystickAGenericImpl_SetProperty, JoystickLinuxAImpl_Acquire, JoystickLinuxAImpl_Unacquire, @@ -691,7 +727,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - JoystickWGenericImpl_GetProperty, + JoystickLinuxWImpl_GetProperty, JoystickWGenericImpl_SetProperty, JoystickLinuxWImpl_Acquire, JoystickLinuxWImpl_Unacquire, diff --git a/include/dinput.h b/include/dinput.h index a6cf7e2..3125800 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -905,6 +905,7 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_CALIBRATION MAKEDIPROP(11) #define DIPROP_GUIDANDPATH MAKEDIPROP(12) +#define DIPROP_JOYSTICKID MAKEDIPROP(15) #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_VIDPID MAKEDIPROP(24)

1 0

Oleksij Rempel : krnl386.exe: Fix drive spec in get_media_id call.
by Alexandre Julliard May 30, 2012

May 30, 2012

Module: wine Branch: master Commit: fa3038c6bda292f156d98316d65f5b03433f7b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3038c6bda292f156d98316d… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Tue May 29 23:10:08 2012 +0200 krnl386.exe: Fix drive spec in get_media_id call. --- dlls/krnl386.exe16/int21.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f25194b..3652054 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2609,8 +2609,9 @@ static void INT21_Ioctl_Block( CONTEXT *context ) { WCHAR label[12],fsname[9]; DWORD serial; + TRACE( "GENERIC IOCTL - Get media id - %c:\n", + 'A' + drive ); - drivespec[0] += drive; GetVolumeInformationW(drivespec, label, 12, &serial, NULL, NULL, fsname, 9); *(WORD*)dataptr = 0; memcpy(dataptr+2,&serial,4);

1 0