April 2010 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added support for accessing select options by index.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 73d4d172d5685c6694fa88d512f51eee6061217c URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d4d172d5685c6694fa88d51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 18:29:23 2010 +0200 mshtml: Added support for accessing select options by index. --- dlls/mshtml/htmlselect.c | 80 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 15 +++++++- dlls/mshtml/tests/jstest.html | 16 ++++++++ 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 20f11ee..ee5d214 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -504,6 +504,80 @@ static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO return IHTMLSelectElement_get_disabled(HTMLSELECT(This), p); } +#define DISPID_OPTIONCOL_0 MSHTML_DISPID_CUSTOM_MIN + +static HRESULT HTMLSelectElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD flags, DISPID *dispid) +{ + const WCHAR *ptr; + DWORD idx = 0; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) { + idx = idx*10 + (*ptr-'0'); + if(idx > MSHTML_CUSTOM_DISPID_CNT) { + WARN("too big idx\n"); + return DISP_E_UNKNOWNNAME; + } + } + if(*ptr) + return DISP_E_UNKNOWNNAME; + + *dispid = DISPID_OPTIONCOL_0 + idx; + return S_OK; +} + +static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLSelectElement *This = HTMLSELECT_NODE_THIS(iface); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + nsIDOMHTMLOptionsCollection *nscol; + nsIDOMNode *nsnode; + nsresult nsres; + + nsres = nsIDOMHTMLSelectElement_GetOptions(This->nsselect, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetOptions failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLOptionsCollection_Item(nscol, id-DISPID_OPTIONCOL_0, &nsnode); + nsIDOMHTMLOptionsCollection_Release(nscol); + if(NS_FAILED(nsres)) { + ERR("Item failed: %08x\n", nsres); + return E_FAIL; + } + + if(nsnode) { + HTMLDOMNode *node; + + node = get_node(This->element.node.doc, nsnode, TRUE); + nsIDOMNode_Release(nsnode); + if(!node) { + ERR("Could not find node\n"); + return E_FAIL; + } + + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)HTMLDOMNODE(node); + }else { + V_VT(res) = VT_NULL; + } + break; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + #undef HTMLSELECT_NODE_THIS static const NodeImplVtbl HTMLSelectElementImplVtbl = { @@ -512,7 +586,11 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { NULL, NULL, HTMLSelectElementImpl_put_disabled, - HTMLSelectElementImpl_get_disabled + HTMLSelectElementImpl_get_disabled, + NULL, + NULL, + HTMLSelectElement_get_dispid, + HTMLSelectElement_invoke }; static const tid_t HTMLSelectElement_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c88b3e5..4deb4d6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -144,6 +144,7 @@ typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; #define MSHTML_DISPID_CUSTOM_MIN 0x60000000 #define MSHTML_DISPID_CUSTOM_MAX 0x6fffffff +#define MSHTML_CUSTOM_DISPID_CNT (MSHTML_DISPID_CUSTOM_MAX-MSHTML_DISPID_CUSTOM_MIN) typedef struct { HRESULT (*value)(IUnknown*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 66ab8e6..4ccc64a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -119,7 +119,6 @@ typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; typedef nsISupports nsIDOMEntityReference; -typedef nsISupports nsIDOMHTMLOptionsCollection; typedef nsISupports nsIWebProgressListener; typedef nsISupports nsIDOMCSSValue; typedef nsISupports nsIPrintSession; @@ -1321,6 +1320,20 @@ interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement [ object, + uuid(bce0213c-f70f-488f-b93f-688acca55d63), + local + /* FROZEN */ +] +interface nsIDOMHTMLOptionsCollection : nsISupports +{ + nsresult GetLength(PRUint32 *aLength); + nsresult SetLength(PRUint32 aLength); + nsresult Item(PRUint32 index, nsIDOMNode **_retval); + nsresult NamedItem(const nsAString *name, nsIDOMNode **_retval); +} + +[ + object, uuid(a6cf9090-15b3-11d2-932e-00805f8add32), local /* FROZEN */ diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 6192f81..3363c5a 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -20,6 +20,17 @@ function test_removeAttribute(e) { } +function test_select_index() { + var s = document.getElementById("sel"); + + ok("0" in s, "'0' is not in s"); + ok(s[0].text === "opt1", "s[0].text = " + s[0].text); + ok("1" in s, "'1 is not in s"); + ok(s[1].text === "opt2", "s[1].text = " + s[1].text); + ok("2" in s, "'2' is in s"); + ok(s[2] === null, "s[2] = " + s[2]); +} + function runTest() { obj = new Object(); ok(obj === window.obj, "obj !== window.obj"); @@ -28,11 +39,16 @@ function runTest() { test_removeAttribute(document.getElementById("divid")); test_removeAttribute(document.body); + test_select_index(); external.reportSuccess(); } </script> <body onload="runTest();"> <div id="divid"></div> +<select id="sel"> +<option>opt1</option> +<option>opt2</option> +</select> </body> </html>

1 0

André Hentschel : imm32: Fix ImmAssociateContextEx parameter handling.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 8f1e00a17b3798fc4cd42f062a0eccb002529ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1e00a17b3798fc4cd42f062… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 28 17:23:12 2010 +0200 imm32: Fix ImmAssociateContextEx parameter handling. --- dlls/imm32/imm.c | 24 ++++++++++++------------ dlls/imm32/tests/imm32.c | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2a85b70..c708b83 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -516,30 +516,30 @@ static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam) */ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - TRACE("(%p, %p, %d): stub\n", hWnd, hIMC, dwFlags); + TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags); if (!IMM_GetThreadData()->defaultContext) IMM_GetThreadData()->defaultContext = ImmCreateContext(); - if (dwFlags == IACE_DEFAULT) + if (!hWnd) return FALSE; + + switch (dwFlags) { + case 0: + ImmAssociateContext(hWnd,hIMC); + return TRUE; + case IACE_DEFAULT: ImmAssociateContext(hWnd,IMM_GetThreadData()->defaultContext); return TRUE; - } - else if (dwFlags == IACE_IGNORENOCONTEXT) - { + case IACE_IGNORENOCONTEXT: if (GetPropW(hWnd,szwWineIMCProperty)) ImmAssociateContext(hWnd,hIMC); return TRUE; - } - else if (dwFlags == IACE_CHILDREN) - { + case IACE_CHILDREN: EnumChildWindows(hWnd,_ImmAssociateContextExEnumProc,(LPARAM)hIMC); return TRUE; - } - else - { - ERR("Unknown dwFlags 0x%x\n",dwFlags); + default: + FIXME("Unknown dwFlags 0x%x\n",dwFlags); return FALSE; } } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 2d25e53..c68a17a 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -330,20 +330,20 @@ static void test_ImmAssociateContextEx(void) rc = pImmAssociateContextEx(NULL, NULL, 0); ok(!rc, "ImmAssociateContextEx succeeded\n"); rc = pImmAssociateContextEx(hwnd, NULL, 0); - todo_wine ok(rc, "ImmAssociateContextEx failed\n"); + ok(rc, "ImmAssociateContextEx failed\n"); rc = pImmAssociateContextEx(NULL, imc, 0); ok(!rc, "ImmAssociateContextEx succeeded\n"); rc = pImmAssociateContextEx(hwnd, imc, 0); - todo_wine ok(rc, "ImmAssociateContextEx failed\n"); + ok(rc, "ImmAssociateContextEx failed\n"); retimc = ImmGetContext(hwnd); ok(retimc == imc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); rc = pImmAssociateContextEx(hwnd, newimc, 0); - todo_wine ok(rc, "ImmAssociateContextEx failed\n"); + ok(rc, "ImmAssociateContextEx failed\n"); retimc = ImmGetContext(hwnd); - todo_wine ok(retimc == newimc, "handles should be the same\n"); + ok(retimc == newimc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT);

1 0

André Hentschel : imm32: Fix tests to apply to Vista+ as it does the same as Wine.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 3317fc38eebb0adbd0e001c6a22293dbd5bca003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3317fc38eebb0adbd0e001c6a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 28 17:24:51 2010 +0200 imm32: Fix tests to apply to Vista+ as it does the same as Wine. --- dlls/imm32/tests/imm32.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index c68a17a..e35ef89 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -198,12 +198,9 @@ static void test_ImmNotifyIME(void) { msg_spy_flush_msgs(); ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - todo_wine - { - ok(!ret || - broken(ret), /* Vista and W2K8 */ - "Canceling an empty composition string should fail.\n"); - } + ok(broken(!ret) || + ret, /* Vista+ */ + "Canceling an empty composition string should succeed.\n"); ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); @@ -223,12 +220,9 @@ static void test_ImmNotifyIME(void) { msg_spy_flush_msgs(); ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - todo_wine - { - ok(!ret || - broken(ret), /* Vista and W2K8 */ - "Canceling an empty composition string should fail.\n"); - } + ok(broken(!ret) || + ret, /* Vista+ */ + "Canceling an empty composition string should succeed.\n"); ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); @@ -273,10 +267,9 @@ static void test_ImmSetCompositionString(void) return; ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0); - todo_wine - ok(!ret || - broken(ret), /* Vista and W2K8 */ - "ImmSetCompositionStringW() succeeded.\n"); + ok(broken(!ret) || + ret, /* Vista+ */ + "ImmSetCompositionStringW() failed.\n"); ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR, NULL, 0, NULL, 0);

1 0

Hans Leidekker : msi: Support multiple patches per package.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 162780d112d2aa1c856a807b6dc4898b731b74ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=162780d112d2aa1c856a807b6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:39:22 2010 +0200 msi: Support multiple patches per package. --- dlls/msi/action.c | 111 +++++++++++++++++++++++++++++++++------------------- dlls/msi/msipriv.h | 3 +- dlls/msi/package.c | 12 ++++-- 3 files changed, 81 insertions(+), 45 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 96dbc3d..5ca786d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -492,44 +492,31 @@ done: return r; } -static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db ) +static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) { - MSISUMMARYINFO *si; + MSIPATCHINFO *pi; UINT r = ERROR_SUCCESS; - si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); - if (!si) - return ERROR_FUNCTION_FAILED; - - if (msi_check_patch_applicable( package, si ) != ERROR_SUCCESS) - { - TRACE("Patch not applicable\n"); - msiobj_release( &si->hdr ); - return ERROR_SUCCESS; - } - - package->patch = msi_alloc(sizeof(MSIPATCHINFO)); - if (!package->patch) - { - msiobj_release( &si->hdr ); + pi = msi_alloc( sizeof(MSIPATCHINFO) ); + if (!pi) return ERROR_OUTOFMEMORY; - } - package->patch->patchcode = msi_suminfo_dup_string(si, PID_REVNUMBER); - if (!package->patch->patchcode) + pi->patchcode = msi_suminfo_dup_string( si, PID_REVNUMBER ); + if (!pi->patchcode) { - msiobj_release( &si->hdr ); + msi_free( pi ); return ERROR_OUTOFMEMORY; } - package->patch->transforms = msi_suminfo_dup_string(si, PID_LASTAUTHOR); - if (!package->patch->transforms) + pi->transforms = msi_suminfo_dup_string( si, PID_LASTAUTHOR ); + if (!pi->transforms) { - msiobj_release( &si->hdr ); + msi_free( pi->patchcode ); + msi_free( pi ); return ERROR_OUTOFMEMORY; } - msiobj_release( &si->hdr ); + *patch = pi; return r; } @@ -537,6 +524,8 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) { MSIDATABASE *patch_db = NULL; LPWSTR *substorage; + MSISUMMARYINFO *si; + MSIPATCHINFO *patch; UINT i, r; TRACE("%p %s\n", package, debugstr_w( file ) ); @@ -548,10 +537,32 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) return r; } - msi_parse_patch_summary( package, patch_db ); + si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); + if (!si) + { + msiobj_release( &patch_db->hdr ); + return ERROR_FUNCTION_FAILED; + } + + r = msi_check_patch_applicable( package, si ); + if (r != ERROR_SUCCESS) + { + TRACE("patch not applicable\n"); + msiobj_release( &si->hdr ); + msiobj_release( &patch_db->hdr ); + return ERROR_SUCCESS; + } + + r = msi_parse_patch_summary( si, &patch ); + if ( r != ERROR_SUCCESS ) + { + msiobj_release( &si->hdr ); + msiobj_release( &patch_db->hdr ); + return r; + } /* apply substorage transforms */ - substorage = msi_split_string( package->patch->transforms, ';' ); + substorage = msi_split_string( patch->transforms, ';' ); for ( i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++ ) r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); @@ -564,6 +575,9 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) */ append_storage_to_db( package->db, patch_db->storage ); + list_add_tail( &package->patches, &patch->entry ); + + msiobj_release( &si->hdr ); msiobj_release( &patch_db->hdr ); return ERROR_SUCCESS; @@ -3753,34 +3767,51 @@ static BOOL msi_check_unpublish(MSIPACKAGE *package) return TRUE; } -static UINT msi_publish_patch(MSIPACKAGE *package, HKEY prodkey, HKEY hudkey) +static UINT msi_publish_patches( MSIPACKAGE *package, HKEY prodkey, HKEY hudkey ) { WCHAR patch_squashed[GUID_SIZE]; HKEY patches; LONG res; + MSIPATCHINFO *patch; UINT r = ERROR_FUNCTION_FAILED; + WCHAR *p, *all_patches = NULL; + DWORD len = 0; - res = RegCreateKeyExW(prodkey, szPatches, 0, NULL, 0, KEY_ALL_ACCESS, NULL, - &patches, NULL); + res = RegCreateKeyExW( prodkey, szPatches, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &patches, NULL ); if (res != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; - squash_guid(package->patch->patchcode, patch_squashed); + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + squash_guid( patch->patchcode, patch_squashed ); + len += strlenW( patch_squashed ) + 1; + } - res = RegSetValueExW(patches, szPatches, 0, REG_MULTI_SZ, - (const BYTE *)patch_squashed, - (lstrlenW(patch_squashed) + 1) * sizeof(WCHAR)); - if (res != ERROR_SUCCESS) + p = all_patches = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (!all_patches) goto done; - res = RegSetValueExW(patches, patch_squashed, 0, REG_SZ, - (const BYTE *)package->patch->transforms, - (lstrlenW(package->patch->transforms) + 1) * sizeof(WCHAR)); + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + squash_guid( patch->patchcode, p ); + p += strlenW( p ) + 1; + + res = RegSetValueExW( patches, patch_squashed, 0, REG_SZ, + (const BYTE *)patch->transforms, + (strlenW(patch->transforms) + 1) * sizeof(WCHAR) ); + if (res != ERROR_SUCCESS) + goto done; + } + + all_patches[len] = 0; + res = RegSetValueExW( patches, szPatches, 0, REG_MULTI_SZ, + (const BYTE *)all_patches, (len + 1) * sizeof(WCHAR) ); if (res == ERROR_SUCCESS) r = ERROR_SUCCESS; done: RegCloseKey(patches); + msi_free( all_patches ); return r; } @@ -3814,9 +3845,9 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - if (package->patch) + if (!list_empty(&package->patches)) { - rc = msi_publish_patch(package, hukey, hudkey); + rc = msi_publish_patches(package, hukey, hudkey); if (rc != ERROR_SUCCESS) goto end; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 06a4367..c339ea9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -148,6 +148,7 @@ typedef struct tagMSIMEDIAINFO typedef struct tagMSIPATCHINFO { + struct list entry; LPWSTR patchcode; LPWSTR transforms; } MSIPATCHINFO; @@ -302,7 +303,7 @@ typedef struct tagMSIPACKAGE { MSIOBJECTHDR hdr; MSIDATABASE *db; - MSIPATCHINFO *patch; + struct list patches; struct list components; struct list features; struct list files; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0c06088..45b4dc9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -264,11 +264,14 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( package->script ); } - if (package->patch) + LIST_FOR_EACH_SAFE( item, cursor, &package->patches ) { - msi_free( package->patch->patchcode ); - msi_free( package->patch->transforms ); - msi_free( package->patch ); + MSIPATCHINFO *patch = LIST_ENTRY( item, MSIPATCHINFO, entry ); + + list_remove( &patch->entry ); + msi_free( patch->patchcode ); + msi_free( patch->transforms ); + msi_free( patch ); } msi_free( package->BaseURL ); @@ -987,6 +990,7 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->RunningActions ); list_init( &package->sourcelist_info ); list_init( &package->sourcelist_media ); + list_init( &package->patches ); } return package;

1 0

Jörg Höhle : winex11: Unify German keyboard mapping.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 35a2566ea3b90ff2cdf83fd45c181121ff4b7d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a2566ea3b90ff2cdf83fd45… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 11 04:15:08 2010 +0100 winex11: Unify German keyboard mapping. --- dlls/winex11.drv/keyboard.c | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index e044d6d..46925f7 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -235,6 +235,8 @@ static const WORD main_key_vkey_dvorak[MAIN_LEN] = /* We recommend you write just what is guaranteed to be correct (i.e. what's written on the keycaps), not the bunch of special characters behind AltGr and Shift-AltGr if it can vary among different X servers */ +/* These tables serve to guess the keyboard type and scancode mapping. + Complete modeling is not important, identification/discrimination is. */ /* Remember that your 102nd key (to the right of l-shift) should be on a separate line, see existing tables */ /* If Wine fails to match your new table, use WINEDEBUG=+key to find out why */ @@ -309,35 +311,17 @@ static const char main_key_IS[MAIN_LEN][4] = * Others put the acute and grave accents on the key left of BACKSPACE. * More information on the fd.o bugtracker: * https://bugs.freedesktop.org/show_bug.cgi?id=11514 + * Keys reachable via AltGr (@, [], ~, \, |, {}) differ completely + * among PC and Mac keyboards, so these are not listed. */ -/*** German Logitech Desktop Pro keyboard layout */ -static const char main_key_DE_logitech[MAIN_LEN][4] = -{ - "^\xb0","1!","2\"","3\xa7","4$","5%","6&","7/{","8([","9)]","0=}","\xdf?\\","\0`", - "qQ@","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*~", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'", - "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", - "<>|" -}; - -/*** German keyboard layout (setxkbmap de) */ +/*** German keyboard layout (setxkbmap de [-variant nodeadkeys|deadacute etc.]) */ static const char main_key_DE[MAIN_LEN][4] = { - "^�","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","�?","\0`", + "^�","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","�?","", "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*", "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", - "<>|" -}; - -/*** German keyboard layout without dead keys */ -static const char main_key_DE_nodead[MAIN_LEN][4] = -{ - "^�","1!","2\"","3�","4$","5%","6&","7/{","8([","9)]","0=}","�?\\","", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*~", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", - "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -918,8 +902,6 @@ static const struct { {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0407, "German keyboard layout without dead keys", &main_key_DE_nodead, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0407, "German keyboard layout for logitech desktop pro", &main_key_DE_logitech, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2},

1 0

Aric Stewart : usp10: Update ScriptItemize to use the baselevel of a unified run.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: d5672fee0ae543e070da17cdb5e68c3c0a330306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5672fee0ae543e070da17cdb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 29 07:32:03 2010 -0500 usp10: Update ScriptItemize to use the baselevel of a unified run. --- dlls/usp10/tests/usp10.c | 8 ++++---- dlls/usp10/usp10.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7a7567f..ad65b25 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -82,7 +82,7 @@ static void test_ScriptItemize( void ) { static const WCHAR test1[] = {'t', 'e', 's', 't',0}; static const itemTest t11[2] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},4,0,0,0}}; - static const itemTest t12[2] = {{{0,0,0,1},0,0,0,2},{{0,0,0,0},4,0,0,0}}; + static const itemTest t12[2] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},4,0,0,0}}; /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; @@ -98,7 +98,7 @@ static void test_ScriptItemize( void ) 0x0e2d,0x0e22,0x0e39,0x0e48,0x0e17,0x0e35,0x0e48,0x0e19,0x0e31,0x0e48,0x0e19,0}; static const itemTest t31[2] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},41,0,0,0}}; - static const itemTest t32[2] = {{{0,0,0,1},0,0,0,2},{{0,0,0,0},41,0,0,0}}; + static const itemTest t32[2] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},41,0,0,0}}; static const WCHAR test4[] = {'1','2','3','-','5','2',' ','i','s',' ','7','1','.',0}; @@ -116,7 +116,7 @@ static void test_ScriptItemize( void ) /* Hebrew */ static const WCHAR test6[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd, '.',0}; static const itemTest t61[3] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,0},{{0,0,0,0},5,0,0,0}}; - static const itemTest t62[3] = {{{0,0,0,0},0,1,1,1},{{0,1,1,1},4,1,1,1},{{0,0,0,0},5,0,0,0}}; + static const itemTest t62[3] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,1,1,1},{{0,0,0,0},5,0,0,0}}; static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; static const itemTest t71[4] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},9,1,1,1},{{0,0,0,0},19,0,0,0},{{0,0,0,0},29,0,0,0}}; static const itemTest t72[4] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},9,1,1,1},{{0,0,0,0},18,0,0,0},{{0,0,0,0},29,0,0,0}}; @@ -127,7 +127,7 @@ static void test_ScriptItemize( void ) /* Syriac (Like Arabic )*/ static const WCHAR test9[] = {0x0710, 0x0712, 0x0712, 0x0714, '.',0}; static const itemTest t91[3] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,0},{{0,0,0,0},5,0,0,0}}; - static const itemTest t92[3] = {{{0,0,0,0},0,1,1,1},{{0,1,1,1},4,1,1,1},{{0,0,0,0},5,0,0,0}}; + static const itemTest t92[3] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,1,1,1},{{0,0,0,0},5,0,0,0}}; static const WCHAR test10[] = {0x0717, 0x0718, 0x071a, 0x071b,0}; static const itemTest t101[2] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,0}}; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index eebc8ab..0ab86a1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -534,6 +534,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem int cnt = 0, index = 0; int New_Script = SCRIPT_UNDEFINED; WORD *levels = NULL; + WORD baselevel = 0; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -549,6 +550,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem return E_OUTOFMEMORY; BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels); + baselevel = levels[0]; for (i = 0; i < cInChars; i++) if (levels[i]!=levels[0]) break; @@ -597,7 +599,12 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.fRTL = 1; pItems[index].a.fLayoutRTL = 1; } - + else + { + pItems[index].a.s.uBidiLevel = baselevel; + pItems[index].a.fLayoutRTL = odd(baselevel); + pItems[index].a.fRTL = odd(baselevel); + } TRACE("New_Level=%i New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", levels?levels[cnt]:-1, New_Script, pItems[index].a.eScript, index, cnt, @@ -660,6 +667,13 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.fRTL = 1; pItems[index].a.fLayoutRTL = 1; } + else + { + pItems[index].a.s.uBidiLevel = baselevel; + pItems[index].a.fLayoutRTL = odd(baselevel); + pItems[index].a.fRTL = odd(baselevel); + } + pItems[index].a.eScript = New_Script; TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos);

1 0

Piotr Caban : urlmon: Fixed synchronous binding to file.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 3886d7f805b2bbde43dc6bdcc2898bee8e93449c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3886d7f805b2bbde43dc6bdcc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:14:47 2010 +0200 urlmon: Fixed synchronous binding to file. --- dlls/urlmon/binding.c | 17 ++++++++++------- dlls/urlmon/tests/url.c | 39 +++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index dcf0207..8c05dbd 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -57,7 +57,7 @@ typedef struct _stgmed_obj_t stgmed_obj_t; typedef struct { void (*release)(stgmed_obj_t*); HRESULT (*fill_stgmed)(stgmed_obj_t*,STGMEDIUM*); - void *(*get_result)(stgmed_obj_t*); + HRESULT (*get_result)(stgmed_obj_t*,DWORD,void**); } stgmed_obj_vtbl; struct _stgmed_obj_t { @@ -637,12 +637,13 @@ static HRESULT stgmed_stream_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) return S_OK; } -static void *stgmed_stream_get_result(stgmed_obj_t *obj) +static HRESULT stgmed_stream_get_result(stgmed_obj_t *obj, DWORD bindf, void **result) { ProtocolStream *stream = (ProtocolStream*)obj; IStream_AddRef(STREAM(stream)); - return STREAM(stream); + *result = STREAM(stream); + return S_OK; } static const stgmed_obj_vtbl stgmed_stream_vtbl = { @@ -707,9 +708,9 @@ static HRESULT stgmed_file_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) return S_OK; } -static void *stgmed_file_get_result(stgmed_obj_t *obj) +static HRESULT stgmed_file_get_result(stgmed_obj_t *obj, DWORD bindf, void **result) { - return NULL; + return bindf & BINDF_ASYNCHRONOUS ? MK_S_ASYNCHRONOUS : S_OK; } static const stgmed_obj_vtbl stgmed_file_vtbl = { @@ -1530,12 +1531,14 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED)) IInternetProtocol_UnlockRequest(binding->protocol); - *ppv = binding->stgmed_obj->vtbl->get_result(binding->stgmed_obj); + hres = binding->stgmed_obj->vtbl->get_result(binding->stgmed_obj, binding->bindf, ppv); + }else { + hres = MK_S_ASYNCHRONOUS; } IBinding_Release(BINDING(binding)); - return *ppv ? S_OK : MK_S_ASYNCHRONOUS; + return hres; } HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index fc249a6..3c253fa 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -479,7 +479,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, DWORD grfPI, HANDLE_PTR dwReserved) { BINDINFO bindinfo; - DWORD bindf, bscf = BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION; + DWORD bind_info, bscf = BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION; HRESULT hres; static const STGMEDIUM stgmed_zero = {0}; @@ -509,20 +509,21 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); - hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bind_info, &bindinfo); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); if(filedwl_api) { - ok(bindf == (BINDF_PULLDATA|BINDF_FROMURLMON|BINDF_NEEDFILE), "bindf=%08x\n", bindf); + ok(bind_info == (BINDF_PULLDATA|BINDF_FROMURLMON|BINDF_NEEDFILE), "bind_info=%08x\n", bind_info); }else if(tymed == TYMED_ISTREAM && is_urlmon_protocol(test_protocol)) { - ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA + ok(bind_info == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA |BINDF_FROMURLMON), - "bindf=%08x\n", bindf); - }else { - ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA + "bind_info=%08x\n", bind_info); + }else if(bindf&BINDF_ASYNCHRONOUS) { + ok(bind_info == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA |BINDF_FROMURLMON|BINDF_NEEDFILE), - "bindf=%08x\n", bindf); - } + "bind_info=%08x\n", bind_info); + }else + ok(bind_info == (BINDF_FROMURLMON|BINDF_NEEDFILE), "bind_info=%08x\n", bind_info); ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize = %d\n", bindinfo.cbSize); ok(!bindinfo.szExtraInfo, "bindinfo.szExtraInfo = %p\n", bindinfo.szExtraInfo); @@ -1283,7 +1284,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u todo_wine CHECK_EXPECT(OnProgress_FINDINGRESOURCE); else CHECK_EXPECT(OnProgress_FINDINGRESOURCE); - if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) + if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST)) SetEvent(complete_event); break; case BINDSTATUS_CONNECTING: @@ -1293,7 +1294,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u todo_wine CHECK_EXPECT(OnProgress_CONNECTING); else CHECK_EXPECT(OnProgress_CONNECTING); - if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) + if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST)) SetEvent(complete_event); break; case BINDSTATUS_REDIRECTING: @@ -1303,7 +1304,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT(OnProgress_REDIRECTING); ok(!lstrcmpW(szStatusText, WINE_ABOUT_URL), "unexpected status text %s\n", wine_dbgstr_w(szStatusText)); - if(!bind_to_object || iface == &objbsc) + if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) + && (!bind_to_object || iface == &objbsc)) SetEvent(complete_event); break; case BINDSTATUS_SENDINGREQUEST: @@ -1313,7 +1315,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT2(OnProgress_SENDINGREQUEST); else CHECK_EXPECT(OnProgress_SENDINGREQUEST); - if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) + if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST)) SetEvent(complete_event); break; case BINDSTATUS_MIMETYPEAVAILABLE: @@ -2353,7 +2355,10 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) return; } - if(((bindf & BINDF_ASYNCHRONOUS) && !data_available) + if(!(bindf & BINDF_ASYNCHRONOUS) && tymed == TYMED_FILE) { + ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); + ok(unk == NULL, "unk != NULL\n"); + }else if(((bindf & BINDF_ASYNCHRONOUS) && !data_available) || (tymed == TYMED_FILE && test_protocol == FILE_TEST)) { ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk == NULL, "istr should be NULL\n"); @@ -2906,12 +2911,18 @@ START_TEST(url) trace("synchronous http test...\n"); test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); + trace("emulated synchronous http test (to file)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); + trace("synchronous http test (to object)...\n"); test_BindToObject(HTTP_TEST, 0); trace("synchronous file test...\n"); test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); + trace("emulated synchronous file test (to file)...\n"); + test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); + trace("synchronous file test (to object)...\n"); test_BindToObject(FILE_TEST, 0);

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::put_length implementation.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 78cf4e30b5709cae05794c47a7947f7e051b3c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf4e30b5709cae05794c47a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 18:28:38 2010 +0200 mshtml: Added IHTMLSelectElement::put_length implementation. --- dlls/mshtml/htmlselect.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 6698606..0fc21c4 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -364,8 +364,15 @@ static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG i static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, LONG v) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLSelectElement_SetLength(This->nsselect, v); + if(NS_FAILED(nsres)) + ERR("SetLength failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c6f5479..4bcaf2a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -673,6 +673,17 @@ static IHTMLAnchorElement *_get_anchor_iface(unsigned line, IUnknown *unk) return anchor; } +#define get_select_iface(u) _get_select_iface(__LINE__,u) +static IHTMLSelectElement *_get_select_iface(unsigned line, IUnknown *unk) +{ + IHTMLSelectElement *select; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLSelectElement, (void**)&select); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLSelectElement: %08x\n", hres); + return select; +} + #define get_text_iface(u) _get_text_iface(__LINE__,u) static IHTMLDOMTextNode *_get_text_iface(unsigned line, IUnknown *unk) { @@ -1275,6 +1286,18 @@ static void _test_select_length(unsigned line, IHTMLSelectElement *select, LONG ok_(__FILE__,line) (len == length, "len=%d, expected %d\n", len, length); } +#define test_select_put_length(s,l) _test_select_put_length(__LINE__,s,l) +static void _test_select_put_length(unsigned line, IUnknown *unk, LONG length) +{ + IHTMLSelectElement *select = _get_select_iface(line, unk); + HRESULT hres; + + hres = IHTMLSelectElement_put_length(select, length); + ok_(__FILE__,line) (hres == S_OK, "put_length failed: %08x\n", hres); + _test_select_length(line, select, length); + IHTMLSelectElement_Release(select); +} + #define test_select_selidx(s,i) _test_select_selidx(__LINE__,s,i) static void _test_select_selidx(unsigned line, IHTMLSelectElement *select, LONG index) { @@ -5553,12 +5576,9 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "s", TRUE); if(elem) { - IHTMLSelectElement *select; + IHTMLSelectElement *select = get_select_iface((IUnknown*)elem); IHTMLDocument2 *doc_node, *elem_doc; - hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLSelectElement, (void**)&select); - ok(hres == S_OK, "Could not get IHTMLSelectElement interface: %08x\n", hres); - test_select_elem(select); test_elem_title((IUnknown*)select, NULL); @@ -5854,6 +5874,17 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDocument3_Release(doc3); + elem = get_elem_by_id(doc, "s", TRUE); + if(elem) { + static const elem_type_t select_types[] = { ET_OPTION, ET_OPTION, ET_OPTION }; + + test_select_put_length((IUnknown*)elem, 3); + test_elem_all((IUnknown*)elem, select_types, sizeof(select_types)/sizeof(*select_types)); + test_select_put_length((IUnknown*)elem, 1); + test_elem_all((IUnknown*)elem, select_types, 1); + IHTMLElement_Release(elem); + } + window = get_doc_window(doc); test_window_name(window, NULL); set_window_name(window, "test name");

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::get_options implementation.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 21d7f6a7e69a54dc9d5fd3ff9dce8fa611e62cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d7f6a7e69a54dc9d5fd3ff9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 18:28:57 2010 +0200 mshtml: Added IHTMLSelectElement::get_options implementation. --- dlls/mshtml/htmlselect.c | 8 ++++++-- dlls/mshtml/tests/dom.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 0fc21c4..20f11ee 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -170,8 +170,12 @@ static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, IDispatch **p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = (IDispatch*)HTMLSELECT(This); + IDispatch_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_onchange(IHTMLSelectElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4bcaf2a..58ecec2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -508,7 +508,7 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) } } -#define test_get_dispid(u,id) _test_disp(__LINE__,u,id) +#define test_get_dispid(u,id) _test_get_dispid(__LINE__,u,id) static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) { IDispatchEx *dispex; @@ -2776,6 +2776,9 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const char *id) static void test_select_elem(IHTMLSelectElement *select) { + IDispatch *disp; + HRESULT hres; + test_select_type(select, "select-one"); test_select_length(select, 2); test_select_selidx(select, 0); @@ -2787,6 +2790,13 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE); + + disp = NULL; + hres = IHTMLSelectElement_get_options(select, &disp); + ok(hres == S_OK, "get_options failed: %08x\n", hres); + ok(disp != NULL, "options == NULL\n"); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)select), "disp != select\n"); + IDispatch_Release(disp); } static void test_create_option_elem(IHTMLDocument2 *doc)

1 0

Henri Verbeet : wined3d: Avoid some needless depth buffer copies.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: f09b8e454d932f3768c8ad5f6f4658ee587f291e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09b8e454d932f3768c8ad5f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:08:59 2010 +0200 wined3d: Avoid some needless depth buffer copies. If an application switches between render targets of a different size, but with the same depth/stencil surface it'll typically clear the depth/stencil surface before drawing. However, in case of the smaller render target that wouldn't be a full clear, so we'd have to do a depth copy if we also switched between onscreen and offscreen rendering. Keeping track of which part of the depth/stencil surface is current for onscreen/offscreen allows us to avoid most of these kinds of copies. The current scheme requires the current/dirty rectangle to have an origin at (0,0). This could be extended to an arbitrary rectangle, but the bookkeeping becomes somewhat more complex in that case, and it's not clear that there would be much of a benefit at this point. --- dlls/wined3d/arb_program_shader.c | 78 +++++++++++++++++++++++++++++------ dlls/wined3d/device.c | 70 ++++++++++++++++++++++++++++--- dlls/wined3d/drawprim.c | 23 +++++++++- dlls/wined3d/glsl_shader.c | 83 +++++++++++++++++++++++++++++++------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/surface.c | 21 ++++++++-- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 6 ++- 8 files changed, 243 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f09b8e454d932f3768c8a…

1 0