December 2009 - Wine-commits

Juan Lang : wininet: Store hostname for secure connection in its SSL context.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 880133d24877b1afbdd46854672bfa8f06578003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880133d24877b1afbdd468546… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Dec 13 15:31:24 2009 -0800 wininet: Store hostname for secure connection in its SSL context. --- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c528193..e5b9dc3 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -427,7 +427,7 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, DWORD NETCON_close(WININET_NETCONNECTION *connection); DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, unsigned int addrlen); -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname); +DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname); DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, int *sent /* out */); DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b73df94..6650359 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -113,6 +113,7 @@ static void *OpenSSL_crypto_handle; static SSL_METHOD *meth; static SSL_CTX *ctx; +static int hostname_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -130,6 +131,8 @@ MAKE_FUNCPTR(SSL_shutdown); MAKE_FUNCPTR(SSL_write); MAKE_FUNCPTR(SSL_read); MAKE_FUNCPTR(SSL_pending); +MAKE_FUNCPTR(SSL_get_ex_new_index); +MAKE_FUNCPTR(SSL_set_ex_data); MAKE_FUNCPTR(SSL_get_verify_result); MAKE_FUNCPTR(SSL_get_peer_certificate); MAKE_FUNCPTR(SSL_CTX_get_timeout); @@ -220,6 +223,8 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_write); DYNSSL(SSL_read); DYNSSL(SSL_pending); + DYNSSL(SSL_get_ex_new_index); + DYNSSL(SSL_set_ex_data); DYNSSL(SSL_get_verify_result); DYNSSL(SSL_get_peer_certificate); DYNSSL(SSL_CTX_get_timeout); @@ -258,6 +263,8 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + hostname_idx = pSSL_get_ex_new_index(0, (void *)"hostname index", + NULL, NULL, NULL); pCRYPTO_set_id_callback(ssl_thread_id); ssl_locks = HeapAlloc(GetProcessHeap(), 0, @@ -435,7 +442,7 @@ static BOOL check_hostname(X509 *cert, LPCWSTR hostname) * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) +DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -473,6 +480,7 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } + pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname); cert = pSSL_get_peer_certificate(connection->ssl_s); if (!cert) {

1 0

Nikolay Sivov : comctl32/treeview: Implement NM_SETCURSOR notification.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: e81f2642f16d108cfdf086eb8d5196c95f399c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81f2642f16d108cfdf086eb8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 12 12:34:23 2009 +0300 comctl32/treeview: Implement NM_SETCURSOR notification. --- dlls/comctl32/treeview.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 4a8ced3..51af5aa 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -28,7 +28,7 @@ * We use callbackMask to keep track of fields to be updated. * * TODO: - * missing notifications: NM_SETCURSOR, TVN_GETINFOTIP, TVN_KEYDOWN, + * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, * TVN_SETDISPINFO, TVN_SINGLEEXPAND * * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, @@ -5449,13 +5449,27 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { POINT pt; TREEVIEW_ITEM * item; + NMMOUSE nmmouse; GetCursorPos(&pt); ScreenToClient(infoPtr->hwnd, &pt); item = TREEVIEW_HitTestPoint(infoPtr, pt); - /* FIXME: send NM_SETCURSOR */ + memset(&nmmouse, 0, sizeof(nmmouse)); + nmmouse.hdr.hwndFrom = infoPtr->hwnd; + nmmouse.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + nmmouse.hdr.code = NM_SETCURSOR; + if (item) + { + nmmouse.dwItemSpec = (DWORD_PTR)item; + nmmouse.dwItemData = item->lParam; + } + nmmouse.pt.x = 0; + nmmouse.pt.y = 0; + nmmouse.dwHitInfo = lParam; + if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, (LPARAM)&nmmouse)) + return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) {

1 0

Alexander Nicolaysen Sørnes : appwiz.cpl : Update Norwegian Bokmål translation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: e71f69a65dadb34ccd0cb65722a7a8ee6a825340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71f69a65dadb34ccd0cb6572… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 13 22:28:45 2009 +0100 appwiz.cpl: Update Norwegian Bokmål translation. --- dlls/appwiz.cpl/No.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index a6106a4..1abc0cb 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -41,7 +41,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Installasjonsprogrammer\0*instal*.exe;*setup*.exe;*.msi\0Programmer (*.exe)\0*.exe\0Alle filer (*.*)\0*.*\0\0" IDS_REMOVE, "Fje&rn..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Endre/Fjern ..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -53,10 +53,10 @@ FONT 8, "MS Shell Dlg" CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Følgende programmer kan fjernes automatisk. Merk et program og trykk «Legg til/Fjern» for å fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Følgende programmer kan fjernes automatisk. Merk et program og trykk Endre/Fjern for å fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Støtteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 98, 198, 70, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Endre...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "Fje&rn...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål translation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9e76a701d7623f1ea0b0a981bc38381430321686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e76a701d7623f1ea0b0a981b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 13 22:41:53 2009 +0100 winecfg: Update Norwegian Bokmål translation. --- programs/winecfg/No.rc | 89 +++++++++++++++++++++++++++-------------------- 1 files changed, 51 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e76a701d7623f1ea0b0a…

1 0

Alexander Nicolaysen Sørnes : oleacc: Add Norwegian Bokmål translation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9178a948687a096aea1664c98e8b6aa6baf4dad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9178a948687a096aea1664c98… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 13 23:02:57 2009 +0100 oleacc: Add Norwegian Bokmål translation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/oleacc_No.rc | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 4fc8d51..1aca0cf 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ oleacc_Ko.rc \ oleacc_Lt.rc \ oleacc_Nl.rc \ + oleacc_No.rc \ oleacc_Pl.rc \ oleacc_Pt.rc \ oleacc_Ro.rc diff --git a/dlls/oleacc/oleacc_No.rc b/dlls/oleacc/oleacc_No.rc new file mode 100644 index 0000000..1bbadf0 --- /dev/null +++ b/dlls/oleacc/oleacc_No.rc @@ -0,0 +1,95 @@ +/* + * Norwegian Bokmål resources for oleacc + * + * Copyright 2009 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "oleacc.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE DISCARDABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "tittellinje" + ROLE_SYSTEM_MENUBAR "menylinje" + ROLE_SYSTEM_SCROLLBAR "rullefelt" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "lyd" + ROLE_SYSTEM_CURSOR "peker" + ROLE_SYSTEM_CARET "markør" + ROLE_SYSTEM_ALERT "varsel" + ROLE_SYSTEM_WINDOW "vindu" + ROLE_SYSTEM_CLIENT "klient" + ROLE_SYSTEM_MENUPOPUP "sprettoppmeny" + ROLE_SYSTEM_MENUITEM "menyelement" + ROLE_SYSTEM_TOOLTIP "verktøytips" + ROLE_SYSTEM_APPLICATION "program" + ROLE_SYSTEM_DOCUMENT "dokument" + ROLE_SYSTEM_PANE "panel" + ROLE_SYSTEM_CHART "diagram" + ROLE_SYSTEM_DIALOG "meldingsvindu" + ROLE_SYSTEM_BORDER "kant" + ROLE_SYSTEM_GROUPING "gruppering" + ROLE_SYSTEM_SEPARATOR "skille" + ROLE_SYSTEM_TOOLBAR "verktøylinje" + ROLE_SYSTEM_STATUSBAR "status bar" + ROLE_SYSTEM_TABLE "tabell" + ROLE_SYSTEM_COLUMNHEADER "kolonneoverskrift" + ROLE_SYSTEM_ROWHEADER "radoverskrift" + ROLE_SYSTEM_COLUMN "kolonne" + ROLE_SYSTEM_ROW "rad" + ROLE_SYSTEM_CELL "celle" + ROLE_SYSTEM_LINK "kobling" + ROLE_SYSTEM_HELPBALLOON "hjelpetekst" + ROLE_SYSTEM_CHARACTER "tegn" + ROLE_SYSTEM_LIST "liste" + ROLE_SYSTEM_LISTITEM "listeelement" + ROLE_SYSTEM_OUTLINE "utheving" + ROLE_SYSTEM_OUTLINEITEM "uthevet element" + ROLE_SYSTEM_PAGETAB "sidefane" + ROLE_SYSTEM_PROPERTYPAGE "fane" + ROLE_SYSTEM_INDICATOR "indikator" + ROLE_SYSTEM_GRAPHIC "grafikk" + ROLE_SYSTEM_STATICTEXT "statisk tekst" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "knapp" + ROLE_SYSTEM_CHECKBUTTON "avkrysningsboks" + ROLE_SYSTEM_RADIOBUTTON "radioknapp" + ROLE_SYSTEM_COMBOBOX "komboboks" + ROLE_SYSTEM_DROPLIST "rullemeny" + ROLE_SYSTEM_PROGRESSBAR "framgangsindikator" + ROLE_SYSTEM_DIAL "hjul" + ROLE_SYSTEM_HOTKEYFIELD "felt for hurtigtaster" + ROLE_SYSTEM_SLIDER "rullefelt" + ROLE_SYSTEM_SPINBUTTON "rullemeny" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animasjon" + ROLE_SYSTEM_EQUATION "likning" + ROLE_SYSTEM_BUTTONDROPDOWN "knapp for rullemeny" + ROLE_SYSTEM_BUTTONMENU "menyknapp" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "felt for rullemeny-knapp" + ROLE_SYSTEM_WHITESPACE "mellomrom" + ROLE_SYSTEM_PAGETABLIST "faneliste" + ROLE_SYSTEM_CLOCK "klokke" + ROLE_SYSTEM_SPLITBUTTON "oppdelt knapp" + ROLE_SYSTEM_IPADDRESS "IP-adresse" + ROLE_SYSTEM_OUTLINEBUTTON "utheving for knapp" +}

1 0

Jacek Caban : mshtml: Added IHTMLStyle::marginTop implementation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 0f940bccd4156e3a56d1c81704a1714cbe15b9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f940bccd4156e3a56d1c8170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 01:03:15 2009 +0100 mshtml: Added IHTMLStyle::marginTop implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7a43701..467464a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1219,15 +1219,19 @@ static HRESULT WINAPI HTMLStyle_get_lineHeight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_marginTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, 0); } static HRESULT WINAPI HTMLStyle_get_marginTop(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, p, 0); } static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e32e2fd..9dce419 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3802,6 +3802,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_margin(style, NULL); ok(hres == S_OK, "put_margin failed: %08x\n", hres); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_marginTop(style, &v); + ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("6px"); + hres = IHTMLStyle_put_marginTop(style, v); + SysFreeString(V_BSTR(&v)); + ok(hres == S_OK, "put_marginTop failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_marginTop(style, &v); + ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + str = NULL; hres = IHTMLStyle_get_border(style, &str); ok(hres == S_OK, "get_border failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::right implementation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: ba394d68be30193e8adcb641b048dd149d862e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba394d68be30193e8adcb641b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 01:03:39 2009 +0100 mshtml: Added IHTMLStyle2::right implementation. --- dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index ff5fff0..aa9531c 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -212,15 +212,19 @@ static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle2_put_right(IHTMLStyle2 *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE2_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_RIGHT, &v, 0); } static HRESULT WINAPI HTMLStyle2_get_right(IHTMLStyle2 *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_RIGHT, p, 0); } static HRESULT WINAPI HTMLStyle2_put_pixelBottom(IHTMLStyle2 *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9dce419..6f1a064 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3390,6 +3390,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) static void test_style2(IHTMLStyle2 *style2) { + VARIANT v; BSTR str; HRESULT hres; @@ -3408,6 +3409,27 @@ static void test_style2(IHTMLStyle2 *style2) ok(hres == S_OK, "get_position failed: %08x\n", hres); ok(!strcmp_wa(str, "absolute"), "get_position returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + /* Test right */ + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_right(style2, &v); + ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(right)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(right) != NULL\n"); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("3px"); + hres = IHTMLStyle2_put_right(style2, v); + ok(hres == S_OK, "put_right failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_right(style2, &v); + ok(hres == S_OK, "get_right failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); } static void test_style3(IHTMLStyle3 *style3)

1 0

Rob Shearman : rpcrt4: Handle [out] -only non-conformant strings in stubless servers.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: d412bcc3aef1ccec410b82fac74e4e55897d9438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d412bcc3aef1ccec410b82fac… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:47:55 2009 +0000 rpcrt4: Handle [out]-only non-conformant strings in stubless servers. --- dlls/rpcrt4/ndr_stubless.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 2028fed..5a66c25 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -999,6 +999,18 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; break; + case RPC_FC_C_CSTRING: + case RPC_FC_C_WSTRING: + if (*pFormat == RPC_FC_C_CSTRING) + size = sizeof(CHAR); + else + size = sizeof(WCHAR); + if (pFormat[1] == RPC_FC_STRING_SIZED) + ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); + else + pStubMsg->MaxCount = 0; + size *= pStubMsg->MaxCount; + break; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10Query implementation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: e4e1c279870b6b7f696a70ef7d4d0c27060ab15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e1c279870b6b7f696a70ef7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 13 22:03:57 2009 +0100 d3d10core: Add a stub ID3D10Query implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/async.c | 166 ++++++++++++++++++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 9 ++ dlls/d3d10core/device.c | 25 +++++- 4 files changed, 199 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index fe61293..935e83f 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = d3d10core IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ + async.c \ buffer.c \ d3d10core_main.c \ device.c \ diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c new file mode 100644 index 0000000..4efde85 --- /dev/null +++ b/dlls/d3d10core/async.c @@ -0,0 +1,166 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Query) + || IsEqualGUID(riid, &IID_ID3D10Asynchronous) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) +{ + struct d3d10_query *This = (struct d3d10_query *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) +{ + struct d3d10_query *This = (struct d3d10_query *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10Asynchronous methods */ + +static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) +{ + FIXME("iface %p, data %p, data_size %u, flags %#x stub!\n", iface, data, data_size, flags); + + return E_NOTIMPL; +} + +static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Query methods */ + +static void STDMETHODCALLTYPE d3d10_query_GetDesc(ID3D10Query *iface, D3D10_QUERY_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10QueryVtbl d3d10_query_vtbl = +{ + /* IUnknown methods */ + d3d10_query_QueryInterface, + d3d10_query_AddRef, + d3d10_query_Release, + /* ID3D10DeviceChild methods */ + d3d10_query_GetDevice, + d3d10_query_GetPrivateData, + d3d10_query_SetPrivateData, + d3d10_query_SetPrivateDataInterface, + /* ID3D10Asynchronous methods */ + d3d10_query_Begin, + d3d10_query_End, + d3d10_query_GetData, + d3d10_query_GetDataSize, + /* ID3D10Query methods */ + d3d10_query_GetDesc, +}; + +HRESULT d3d10_query_init(struct d3d10_query *query) +{ + query->vtbl = &d3d10_query_vtbl; + query->refcount = 1; + + return S_OK; +} diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index cc3029f..058d8dc 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -224,6 +224,15 @@ struct d3d10_sampler_state HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HIDDEN; +/* ID3D10Query */ +struct d3d10_query +{ + const struct ID3D10QueryVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_query_init(struct d3d10_query *query) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cfc7dec..39be2ef 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1036,9 +1036,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, const D3D10_QUERY_DESC *desc, ID3D10Query **query) { - FIXME("iface %p, desc %p, query %p stub!\n", iface, desc, query); + struct d3d10_query *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 query object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_query_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize query, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created query %p.\n", object); + *query = (ID3D10Query *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Let the context handle the draw buffer in stretch_rect_fbo().
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 30f5883ef56c3d700ddb5ba7adc60a41cb559ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f5883ef56c3d700ddb5ba7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 13 22:03:58 2009 +0100 wined3d: Let the context handle the draw buffer in stretch_rect_fbo(). --- dlls/wined3d/device.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6529b23..c71d4eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5775,16 +5775,16 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer()"); - } else { + context_set_draw_buffer(context, buffer); + } + else + { TRACE("Destination surface %p is offscreen\n", dst_surface); ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, &context->dst_fbo); context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, dst_surface); - glDrawBuffer(GL_COLOR_ATTACHMENT0); - checkGLcall("glDrawBuffer()"); + context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); context_attach_depth_stencil_fbo(context, GL_DRAW_FRAMEBUFFER, NULL, FALSE); } glDisable(GL_SCISSOR_TEST); @@ -5800,17 +5800,10 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED checkGLcall("glBlitFramebuffer()"); } - IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); - - /* If we switched from GL_BACK to GL_FRONT above, we need to switch back here */ - if (dst_swapchain && dst_surface == ((IWineD3DSwapChainImpl *)dst_swapchain)->frontBuffer - && ((IWineD3DSwapChainImpl *)dst_swapchain)->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer()"); - } LEAVE_GL(); - context_release(context); + + IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); } static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget,

1 0