June 2008 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added fdexNameEnsure support to IDidpatchEx implementation.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 32ac703e306452e994a33a63a21f3f00f5e95d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ac703e306452e994a33a63a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:10:26 2008 +0200 mshtml: Added fdexNameEnsure support to IDidpatchEx implementation. --- dlls/mshtml/dispex.c | 70 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4de3d86..e308f3a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -45,6 +45,20 @@ struct dispex_data_t { struct list entry; }; +typedef struct { + VARIANT var; + LPWSTR name; +} dynamic_prop_t; + +struct dispex_dynamic_data_t { + DWORD buf_size; + DWORD prop_cnt; + dynamic_prop_t *props; +}; + +#define DISPID_DYNPROP_0 0x50000000 +#define DISPID_DYNPROP_MAX 0x5fffffff + static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static struct list dispex_data_list = LIST_INIT(dispex_data_list); @@ -296,6 +310,11 @@ static inline BOOL is_custom_dispid(DISPID id) return MSHTML_DISPID_CUSTOM_MIN <= id && id <= MSHTML_DISPID_CUSTOM_MAX; } +static inline BOOL is_dynamic_dispid(DISPID id) +{ + return DISPID_DYNPROP_0 <= id && id <= DISPID_DYNPROP_MAX; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -386,7 +405,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - if(grfdex & (~fdexNameCaseSensitive)) + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure)) FIXME("Unsupported grfdex %x\n", grfdex); data = get_dispex_data(This); @@ -414,6 +433,17 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW min = n+1; } + if(This->dynamic_data) { + unsigned i; + + for(i=0; i < This->dynamic_data->prop_cnt; i++) { + if(!strcmpW(This->dynamic_data->props[i].name, bstrName)) { + *pid = DISPID_DYNPROP_0 + i; + return S_OK; + } + } + } + if(This->data->vtbl && This->data->vtbl->get_dispid) { HRESULT hres; @@ -422,6 +452,23 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return hres; } + if(grfdex & fdexNameEnsure) { + TRACE("creating dynamic prop %s\n", debugstr_w(bstrName)); + + if(!This->dynamic_data) { + This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); + This->dynamic_data->props = heap_alloc(This->dynamic_data->buf_size = 4); + }else if(This->dynamic_data->buf_size == This->dynamic_data->prop_cnt) { + This->dynamic_data->props = heap_realloc(This->dynamic_data->props, This->dynamic_data->buf_size<<=1); + } + + This->dynamic_data->props[This->dynamic_data->prop_cnt].name = heap_strdupW(bstrName); + VariantInit(&This->dynamic_data->props[This->dynamic_data->prop_cnt].var); + *pid = DISPID_DYNPROP_0 + This->dynamic_data->prop_cnt++; + + return S_OK; + } + TRACE("not found %s\n", debugstr_w(bstrName)); return DISP_E_UNKNOWNNAME; } @@ -447,6 +494,27 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_NOTIMPL; } + if(is_dynamic_dispid(id)) { + DWORD idx = id - DISPID_DYNPROP_0; + VARIANT *var; + + if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) + return DISP_E_UNKNOWNNAME; + + var = &This->dynamic_data->props[idx].var; + + switch(wFlags) { + case INVOKE_PROPERTYGET: + return VariantCopy(pvarRes, var); + case INVOKE_PROPERTYPUT: + VariantClear(var); + return VariantCopy(var, pdp->rgvarg); + default: + FIXME("unhandled wFlags %x\n", wFlags); + return E_NOTIMPL; + } + } + data = get_dispex_data(This); if(!data) return E_FAIL; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 87d29ac..e92681f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -97,6 +97,7 @@ typedef enum { } tid_t; typedef struct dispex_data_t dispex_data_t; +typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; #define MSHTML_DISPID_CUSTOM_MIN 0x60000000 #define MSHTML_DISPID_CUSTOM_MAX 0x6fffffff @@ -119,6 +120,7 @@ typedef struct { IUnknown *outer; dispex_static_data_t *data; + dispex_dynamic_data_t *dynamic_data; } DispatchEx; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*);

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLSelectElement.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 1741e652b31eb718674e74336e6fb9e775dc10cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1741e652b31eb718674e74336… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:09:53 2008 +0200 mshtml: Added IDispatchEx support to HTMLSelectElement. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlselect.c | 23 ++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 06fdf19..4de3d86 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -59,6 +59,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLImg, &DIID_DispHTMLInputElement, &DIID_DispHTMLOptionElement, + &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, @@ -77,6 +78,7 @@ static REFIID tid_ids[] = { &IID_IHTMLImgElement, &IID_IHTMLInputElement, &IID_IHTMLOptionElement, + &IID_IHTMLSelectElement, &IID_IHTMLStyle, &IID_IHTMLWindow2, &IID_IHTMLWindow3, diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 03fcb8f..1783bab 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -420,16 +420,33 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_destructor }; +static const tid_t HTMLSelectElement_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLSelectElement_tid, + 0 +}; + +static dispex_static_data_t HTMLSelectElement_dispex = { + NULL, + DispHTMLSelectElement_tid, + NULL, + HTMLSelectElement_tids +}; + HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement *nselem) { HTMLSelectElement *ret = heap_alloc_zero(sizeof(HTMLSelectElement)); nsresult nsres; - HTMLElement_Init(&ret->element); - ret->lpHTMLSelectElementVtbl = &HTMLSelectElementVtbl; ret->element.node.vtbl = &HTMLSelectElementImplVtbl; - + + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLSELECT(ret), &HTMLSelectElement_dispex); + HTMLElement_Init(&ret->element); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLSelectElement, (void**)&ret->nsselect); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7ad2325..87d29ac 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -69,6 +69,7 @@ typedef enum { DispHTMLImg_tid, DispHTMLInputElement_tid, DispHTMLOptionElement_tid, + DispHTMLSelectElement_tid, DispHTMLStyle_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, @@ -87,6 +88,7 @@ typedef enum { IHTMLImgElement_tid, IHTMLInputElement_tid, IHTMLOptionElement_tid, + IHTMLSelectElement_tid, IHTMLStyle_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 27cb3aa..45a5383 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -248,7 +248,7 @@ static const elem_type_info_t elem_type_infos[] = { {"BODY", body_iids, NULL}, {"A", anchor_iids, NULL}, {"INPUT", input_iids, &DIID_DispHTMLInputElement}, - {"SELECT", select_iids, NULL}, + {"SELECT", select_iids, &DIID_DispHTMLSelectElement}, {"TEXTAREA", textarea_iids, NULL}, {"OPTION", option_iids, &DIID_DispHTMLOptionElement}, {"STYLE", elem_iids, NULL},

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_id implementation.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 148a7d50c552aaa4b20bc05f3354c1955672c103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148a7d50c552aaa4b20bc05f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:09:25 2008 +0200 mshtml: Added IHTMLElement::put_id implementation. --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++-- dlls/mshtml/tests/dom.c | 40 ++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 440c523..67a9611 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -290,8 +290,23 @@ static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString id_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nselem) { + FIXME("nselem == NULL\n"); + return S_OK; + } + + nsAString_Init(&id_str, v); + nsres = nsIDOMHTMLElement_SetId(This->nselem, &id_str); + nsAString_Finish(&id_str); + if(NS_FAILED(nsres)) + ERR("SetId failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLElement_get_id(IHTMLElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 638a673..27cb3aa 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -365,6 +365,17 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) IDispatchEx_Release(dispex); } +#define get_elem_iface(u) _get_elem_iface(__LINE__,u) +static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement: %08x\n", hres); + return elem; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -386,13 +397,10 @@ static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) #define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n) static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) { - IHTMLElement *elem; + IHTMLElement *elem = _get_elem_iface(line, unk); BSTR tag; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); - ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLElement) failed: %08x\n", hres); - hres = IHTMLElement_get_tagName(elem, &tag); IHTMLElement_Release(elem); ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); @@ -869,13 +877,10 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection * #define test_elem_id(e,i) _test_elem_id(__LINE__,e,i) static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) { - IHTMLElement *elem; + IHTMLElement *elem = _get_elem_iface(line, unk); BSTR id = (void*)0xdeadbeef; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement: %08x\n", hres); - hres = IHTMLElement_get_id(elem, &id); IHTMLElement_Release(elem); ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08x\n", hres); @@ -888,6 +893,21 @@ static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) SysFreeString(id); } +#define test_elem_put_id(u,i) _test_elem_put_id(__LINE__,u,i) +static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR tmp = a2bstr(new_id); + HRESULT hres; + + hres = IHTMLElement_put_id(elem, tmp); + IHTMLElement_Release(elem); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "put_id failed: %08x\n", hres); + + _test_elem_id(line, unk, new_id); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -976,9 +996,8 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect if(!disp) return NULL; - hres = IDispatch_QueryInterface(disp, &IID_IHTMLElement, (void**)&elem); + elem = get_elem_iface((IUnknown*)disp); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLElement interface: %08x\n", hres); return elem; } @@ -1651,6 +1670,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); test_elem_id((IUnknown*)elem, "in"); + test_elem_put_id((IUnknown*)elem, "newin"); test_input_get_disabled(input, VARIANT_FALSE); IHTMLInputElement_Release(input);

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_id implementation.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 4ee45b2e4a2e2c818232be03ccf3a3c88743737e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee45b2e4a2e2c818232be03c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:09:08 2008 +0200 mshtml: Added IHTMLElement::get_id implementation. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 22e8c5c..440c523 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -297,8 +297,28 @@ static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_id(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *id; + nsAString id_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + + if(!This->nselem) + return S_OK; + + nsAString_Init(&id_str, NULL); + nsres = nsIDOMHTMLElement_GetId(This->nselem, &id_str); + nsAString_GetData(&id_str, &id); + + if(NS_FAILED(nsres)) + ERR("GetId failed: %08x\n", nsres); + else if(*id) + *p = SysAllocString(id); + + nsAString_Finish(&id_str); + return S_OK; } static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ad06e5b..638a673 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -866,6 +866,28 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection * return node; } +#define test_elem_id(e,i) _test_elem_id(__LINE__,e,i) +static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) +{ + IHTMLElement *elem; + BSTR id = (void*)0xdeadbeef; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement: %08x\n", hres); + + hres = IHTMLElement_get_id(elem, &id); + IHTMLElement_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08x\n", hres); + + if(exid) + ok_(__FILE__,line) (!strcmp_wa(id, exid), "unexpected id %s\n", dbgstr_w(id)); + else + ok_(__FILE__,line) (!id, "id=%s\n", dbgstr_w(id)); + + SysFreeString(id); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1628,6 +1650,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLInputElement, (void**)&input); ok(hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + test_elem_id((IUnknown*)elem, "in"); test_input_get_disabled(input, VARIANT_FALSE); IHTMLInputElement_Release(input); @@ -1676,6 +1699,8 @@ static void test_elems(IHTMLDocument2 *doc) if(node) { type = get_node_type((IUnknown*)node); ok(type == 8, "type=%ld\n", type); + + test_elem_id((IUnknown*)node, NULL); IHTMLDOMNode_Release(node); }

1 0

Roderick Colenbrander : wined3d: Add a Geforce9 driver version ( right now garbage is returned).
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 88b4f29222d287752d017e6ec9596a340e573901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b4f29222d287752d017e6ec… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Jun 15 17:17:56 2008 +0000 wined3d: Add a Geforce9 driver version (right now garbage is returned). --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e759332..f47f0f8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3589,6 +3589,7 @@ struct driver_version_information { static const struct driver_version_information driver_version_table[] = { /* Nvidia drivers. Geforce FX and newer cards are supported by the current driver */ + /* Note that version numbers >100 lets say 123.45 use >= x.y.11.2345 and not x.y.10.12345 */ {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 10, 16921 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 10, 16921 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 10, 16921 }, @@ -3603,6 +3604,8 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 10, 16921 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 10, 16921 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 10, 16921 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 7341 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 },

1 0

Dmitry Timoshkov : kernel32: Make GetModuleFileName set ERROR_INSUFFICIENT_BUFFER like win2k3 and vista do .
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 2a98f9b0b0cbefbe360098417e4391c7a2c6eabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a98f9b0b0cbefbe360098417… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 12:35:03 2008 +0900 kernel32: Make GetModuleFileName set ERROR_INSUFFICIENT_BUFFER like win2k3 and vista do. --- dlls/kernel32/module.c | 10 ++++++++-- dlls/user32/tests/win.c | 17 ++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index e233c85..86675b6 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -608,7 +608,10 @@ DWORD WINAPI GetModuleFileNameA( if ((len = GetModuleFileNameW( hModule, filenameW, size ))) { len = FILE_name_WtoA( filenameW, len, lpFileName, size ); - if (len < size) lpFileName[len] = '\0'; + if (len < size) + lpFileName[len] = '\0'; + else + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } HeapFree( GetProcessHeap(), 0, filenameW ); return len; @@ -642,7 +645,10 @@ DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName, DWORD size { len = min(size, pldr->FullDllName.Length / sizeof(WCHAR)); memcpy(lpFileName, pldr->FullDllName.Buffer, len * sizeof(WCHAR)); - if (len < size) lpFileName[len] = '\0'; + if (len < size) + lpFileName[len] = '\0'; + else + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else SetLastError( RtlNtStatusToDosError( nts ) ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e8368d6..68d5530 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4657,33 +4657,32 @@ static void test_GetWindowModuleFileName(void) hinst = GetModuleHandle(0); - /* MSDN mentions ERROR_INSUFFICIENT_BUFFER, but XP doesn't do it */ SetLastError(0xdeadbeef); ret2 = GetModuleFileName(hinst, buf2, ret1 - 2); ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + ok(GetLastError() == 0xdeadbeef /* XP */ || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret2 = GetModuleFileName(hinst, buf2, 0); ok(!ret2, "GetModuleFileName should return 0\n"); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + ok(GetLastError() == 0xdeadbeef /* XP */ || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, ret1 - 2); ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + ok(GetLastError() == 0xdeadbeef /* XP */ || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, 0); ok(!ret2, "expected 0, got %u\n", ret2); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + ok(GetLastError() == 0xdeadbeef /* XP */ || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); DestroyWindow(hwnd);

1 0

Dmitry Timoshkov : user32: Add a test for MNS_NOTIFYBYPOS, make it pass under Wine.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: bbd8ae432256d32d99e75580b1896002045223b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd8ae432256d32d99e75580b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 12:34:01 2008 +0900 user32: Add a test for MNS_NOTIFYBYPOS, make it pass under Wine. --- dlls/user32/menu.c | 41 +++-- dlls/user32/tests/msg.c | 375 +++++++++++++++++++++++++++++++++++------ dlls/user32/tests/resource.rc | 7 +- 3 files changed, 351 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbd8ae432256d32d99e75…

1 0

Dmitry Timoshkov : gdi32: Use 0xffff as a default character as Vista does.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: ecd5048ea7e2d40c449ed29a3cd6831ddd433f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd5048ea7e2d40c449ed29a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 12:35:58 2008 +0900 gdi32: Use 0xffff as a default character as Vista does. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9b5f18c..8bcb487 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4934,11 +4934,16 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, * symbol range to 0 - f0ff */ if (font->charset == SYMBOL_CHARSET) + { TM.tmFirstChar = 0; + TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0x1f; + } else + { TM.tmFirstChar = pOS2->usFirstCharIndex; + TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0xffff; + } TM.tmLastChar = pOS2->usLastCharIndex; - TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0x1f; TM.tmBreakChar = pOS2->usBreakChar ? pOS2->usBreakChar : ' '; TM.tmItalic = font->fake_italic ? 255 : ((ft_face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0); TM.tmUnderlined = font->underline;

1 0

Dmitry Timoshkov : gdi32: Print the assigned world transform.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 0cae67eaa55c5fea306de9a64906a0693220cd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cae67eaa55c5fea306de9a64… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 12:37:06 2008 +0900 gdi32: Print the assigned world transform. --- dlls/gdi32/dc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 00cd3b7..801a3fd 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1239,6 +1239,9 @@ BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) /* Check that graphics mode is GM_ADVANCED */ if (dc->GraphicsMode!=GM_ADVANCED) goto done; + TRACE("eM11 %f eM12 %f eM21 %f eM22 %f eDx %f eDy %f\n", + xform->eM11, xform->eM12, xform->eM21, xform->eM22, xform->eDx, xform->eDy); + if (dc->funcs->pSetWorldTransform) { ret = dc->funcs->pSetWorldTransform(dc->physDev, xform);

1 0

Paul Vriens : tools/winapi: Fix typo in the generated header.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: b79f37f8fdc8e82295c72c739cce9c8bc19df250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79f37f8fdc8e82295c72c739… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 17 07:57:45 2008 +0200 tools/winapi: Fix typo in the generated header. --- tools/winapi/winapi_test | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 5e8d144..f4f00fb 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -464,7 +464,7 @@ sub output_header($$$) { my $test_dir = shift; my @tests = @{(shift)}; - print OUT "/* File generated automatically from tools/winapi/test.dat; do not edit! */\n"; + print OUT "/* File generated automatically from tools/winapi/tests.dat; do not edit! */\n"; print OUT "/* This file can be copied, modified and distributed without restriction. */\n"; print OUT "\n";

1 0