October 2012 - Wine-Commits

Jacek Caban : mshtml: Set 'this' to window object for onload handlers.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 4940275d21c1112b60e6d14c86985d5b6e32a912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4940275d21c1112b60e6d14c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 11:59:45 2012 +0200 mshtml: Set 'this' to window object for onload handlers. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 20 +++++++++++--------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/persist.c | 5 +++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 753bbcb..2e7b18c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1664,7 +1664,7 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve switch(code) { case VK_F1: /* DOM_VK_F1 */ TRACE("F1 pressed\n"); - fire_event(This->node.doc, EVENTID_HELP, TRUE, This->node.nsnode, NULL); + fire_event(This->node.doc, EVENTID_HELP, TRUE, This->node.nsnode, NULL, NULL); *prevent_default = TRUE; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 641d453..068114a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1033,7 +1033,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } -static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, nsIDOMNode *target) +static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, + nsIDOMNode *target, IDispatch *script_this) { IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; @@ -1060,7 +1061,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e hres = get_node(doc, nsnode, FALSE, &node); if(SUCCEEDED(hres) && node) { call_event_handlers(doc, event_obj, *get_node_event_target(node), - node->cp_container, eid, (IDispatch*)&node->IHTMLDOMNode_iface); + node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } @@ -1089,7 +1090,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e hres = get_node(doc, (nsIDOMNode*)nsbody, FALSE, &node); if(SUCCEEDED(hres) && node) { call_event_handlers(doc, event_obj, *get_node_event_target(node), - node->cp_container, eid, (IDispatch*)&node->IHTMLDOMNode_iface); + node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } nsIDOMHTMLElement_Release(nsbody); @@ -1099,7 +1100,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e } call_event_handlers(doc, event_obj, doc->node.event_target, &doc->basedoc.cp_container, eid, - (IDispatch*)&doc->basedoc.IHTMLDocument2_iface); + script_this ? script_this : (IDispatch*)&doc->basedoc.IHTMLDocument2_iface); break; default: @@ -1148,7 +1149,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e } } -void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) +void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent, + IDispatch *script_this) { HTMLEventObj *event_obj = NULL; HTMLDOMNode *node; @@ -1171,7 +1173,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode } } - fire_event_obj(doc, eid, event_obj, target); + fire_event_obj(doc, eid, event_obj, target, script_this); if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); @@ -1216,7 +1218,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(event_obj) { hres = set_event_info(event_obj, node, eid, NULL); if(SUCCEEDED(hres)) - fire_event_obj(node->doc, eid, event_obj, node->nsnode); + fire_event_obj(node->doc, eid, event_obj, node->nsnode, NULL); IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) @@ -1227,7 +1229,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return E_NOTIMPL; } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); } *cancelled = VARIANT_TRUE; /* FIXME */ @@ -1246,7 +1248,7 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return hres; } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); return S_OK; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8aa8ed1..ca39038 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -51,7 +51,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; -void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*) DECLSPEC_HIDDEN; + void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(event_target_t**,nsIDOMNode*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(event_target_t**,nsIDOMNode*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 48a54b0..c93673a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1418,7 +1418,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList TRACE("(%p)->(%08x %p %p)\n", This, aContextFlags, aEvent, aNode); - fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, aNode, aEvent); + fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, aNode, aEvent, NULL); nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&event); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 7f66f17..5f23e08 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -269,7 +269,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); if(nsbody) { - fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event); + fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); nsIDOMHTMLElement_Release(nsbody); } @@ -313,7 +313,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - fire_event(doc, eid, TRUE, nsnode, event); + fire_event(doc, eid, TRUE, nsnode, event, NULL); nsIDOMNode_Release(nsnode); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d92989e..e29bb25 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -409,11 +409,12 @@ void set_ready_state(HTMLOuterWindow *window, READYSTATE readystate) if(window->doc_obj && window->doc_obj->basedoc.window == window) call_property_onchanged(&window->doc_obj->basedoc.cp_propnotif, DISPID_READYSTATE); - fire_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, FALSE, window->base.inner_window->doc->node.nsnode, NULL); + fire_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, FALSE, + window->base.inner_window->doc->node.nsnode, NULL, NULL); if(window->frame_element) fire_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, - TRUE, window->frame_element->element.node.nsnode, NULL); + TRUE, window->frame_element->element.node.nsnode, NULL, NULL); } static HRESULT get_doc_string(HTMLDocumentNode *This, char **str)

1 0

Henri Verbeet : wined3d: Also read comments in shader_sm1_is_end().
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: db3bdb0a765acfe53632cff137055430c7a1d17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3bdb0a765acfe53632cff13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:36 2012 +0200 wined3d: Also read comments in shader_sm1_is_end(). --- dlls/wined3d/shader_sm1.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 18885f5..6ad1777 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -754,6 +754,8 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi static BOOL shader_sm1_is_end(void *data, const DWORD **ptr) { + shader_sm1_read_comment(ptr); + if (**ptr == WINED3DSP_END) { ++(*ptr);

1 0

Hans Leidekker : winhttp: Respect the redirect policy setting.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: d48808121490b61613ee9fa3c5914d4c3a1160c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48808121490b61613ee9fa3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 22 10:25:05 2012 +0200 winhttp: Respect the redirect policy setting. --- dlls/winhttp/request.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8109290..7c0d3ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1876,7 +1876,8 @@ static BOOL receive_response( request_t *request, BOOL async ) if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) { - if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; + if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS || + request->hdr.redirect_policy == WINHTTP_OPTION_REDIRECT_POLICY_NEVER) break; drain_content( request ); if (!(ret = handle_redirect( request, status ))) break;

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_MOVC in the GLSL shader backend.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: c490fb37cf380b236b7adeece3fc21ddf532388f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c490fb37cf380b236b7adeece… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:39 2012 +0200 wined3d: Implement WINED3DSIH_MOVC in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0e34874..7b51dcd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2756,12 +2756,12 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { + const char *condition_prefix, *condition_suffix; struct wined3d_shader_dst_param dst; struct glsl_src_param src0_param; struct glsl_src_param src1_param; struct glsl_src_param src2_param; BOOL temp_destination = FALSE; - const char *condition_suffix; DWORD cmp_channel = 0; unsigned int i, j; char mask_char[6]; @@ -2770,15 +2770,23 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction switch (ins->handler_idx) { case WINED3DSIH_CMP: + condition_prefix = ""; condition_suffix = " >= 0.0"; break; case WINED3DSIH_CND: + condition_prefix = ""; condition_suffix = " > 0.5"; break; + case WINED3DSIH_MOVC: + condition_prefix = "bool("; + condition_suffix = ")"; + break; + default: FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + condition_prefix = "<unhandled prefix>"; condition_suffix = "<unhandled suffix>"; break; } @@ -2790,8 +2798,8 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", - src0_param.param_str, condition_suffix, + shader_addline(ins->ctx->buffer, "%s%s%s ? %s : %s);\n", + condition_prefix, src0_param.param_str, condition_suffix, src1_param.param_str, src2_param.param_str); return; } @@ -2837,8 +2845,8 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", - src0_param.param_str, condition_suffix, + shader_addline(ins->ctx->buffer, "%s%s%s ? %s : %s);\n", + condition_prefix, src0_param.param_str, condition_suffix, src1_param.param_str, src2_param.param_str); } @@ -5415,7 +5423,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MIN */ shader_glsl_map2gl, /* WINED3DSIH_MOV */ shader_glsl_mov, /* WINED3DSIH_MOVA */ shader_glsl_mov, - /* WINED3DSIH_MOVC */ NULL, + /* WINED3DSIH_MOVC */ shader_glsl_conditional_move, /* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm,

1 0

Hans Leidekker : winhttp: Pass the redirect policy setting down to request objects.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: b59efd66e86a45f3e27e1240623f6b469ba1f298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59efd66e86a45f3e27e12406… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 22 10:24:50 2012 +0200 winhttp: Pass the redirect policy setting down to request objects. --- dlls/winhttp/session.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0349ba7..8ffcda1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -509,6 +509,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.callback = session->hdr.callback; connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; + connect->hdr.redirect_policy = session->hdr.redirect_policy; list_init( &connect->hdr.children ); addref_object( &session->hdr ); @@ -948,6 +949,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.callback = connect->hdr.callback; request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; + request->hdr.redirect_policy = connect->hdr.redirect_policy; list_init( &request->hdr.children ); addref_object( &connect->hdr );

1 0

James Eder : ntdll: Add support for cpuid on x86_64.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 1ce0c9578a3708b19967e6e1a8ccb6771823306f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce0c9578a3708b19967e6e1a… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:43 2012 -0600 ntdll: Add support for cpuid on x86_64. --- dlls/ntdll/nt.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 878c58b..972277d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -827,6 +827,13 @@ static inline void do_cpuid(unsigned int ax, unsigned int *p) "popl %%ebx" : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) : "0" (ax)); +#elif defined(__x86_64__) + __asm__("push %%rbx\n\t" + "cpuid\n\t" + "movq %%rbx, %%rsi\n\t" + "pop %%rbx" + : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax)); #endif } @@ -848,6 +855,8 @@ static inline int have_cpuid(void) : "=&r" (f1), "=&r" (f2) : "ir" (0x00200000)); return ((f1^f2) & 0x00200000) != 0; +#elif defined(__x86_64__) + return 1; #else return 0; #endif

1 0

Dmitry Timoshkov : gdiplus: Fix a typo leading to incorrect character width calculation in GdipMeasureDriverString .
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: a45da55922388dbe04e90b8eb3b9978266a9911b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45da55922388dbe04e90b8eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 17:50:15 2012 +0900 gdiplus: Fix a typo leading to incorrect character width calculation in GdipMeasureDriverString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d975d3c..b2ebf40 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6345,7 +6345,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT } GetCharABCWidthsW(hdc, glyph_indices[i], glyph_indices[i], &abc); - char_width = abc.abcA + abc.abcB + abc.abcB; + char_width = abc.abcA + abc.abcB + abc.abcC; if (min_y > y - ascent) min_y = y - ascent; if (max_y < y + descent) max_y = y + descent;

1 0

Christian Costa : d3drm: Fix wrong condition.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: ff0e82502f003c55b027b8fa9e009b2ecdeb8e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0e82502f003c55b027b8fa9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:17 2012 +0200 d3drm: Fix wrong condition. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 455bb32..79b5d74 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1243,7 +1243,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (size != data_size) WARN("Returned size %u does not match expected one %u\n", size, data_size); - if (nb_materials > 2) + if (nb_materials > 1) { FIXME("Only one material per mesh supported, first one applies to all faces\n"); nb_materials = 1;

1 0

Henri Verbeet : wined3d: Merge a couple of shader type specific blocks in shader_generate_glsl_declarations ().
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 7a437c29f3943b608eaaa81039437a38c37eb511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a437c29f3943b608eaaa8103… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:38 2012 +0200 wined3d: Merge a couple of shader type specific blocks in shader_generate_glsl_declarations(). --- dlls/wined3d/glsl_shader.c | 144 ++++++++++++++++++++++---------------------- 1 files changed, 71 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef54f93..0e34874 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1000,58 +1000,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform vec4 %s_cb%u[%u];\n", prefix, i, reg_maps->cb_sizes[i]); } - if (!pshader) - { - shader_addline(buffer, "uniform vec4 posFixup;\n"); - shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits.packed_output); - } - else - { - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) - { - if (!(map & 1)) continue; - - shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); - - if (reg_maps->luminanceparams & (1 << i)) - { - shader_addline(buffer, "uniform float luminancescale%d;\n", i); - shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); - extra_constants_needed++; - } - - extra_constants_needed++; - } - - if (ps_args->srgb_correction) - { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); - } - if (reg_maps->vpos || reg_maps->usesdsy) - { - if (shader->limits.constant_float + extra_constants_needed - + 1 < gl_info->limits.glsl_ps_float_constants) - { - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - extra_constants_needed++; - } - else - { - /* This happens because we do not have proper tracking of the constant registers that are - * actually used, only the max limit of the shader version - */ - FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", - context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, - context->render_offscreen ? 1.0f : -1.0f); - } - shader_addline(buffer, "vec4 vpos;\n"); - } - } - /* Declare texture samplers */ for (i = 0; i < shader->limits.sampler; ++i) { @@ -1145,20 +1093,79 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (map & 1) shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i); } - /* Declare input register varyings. Only pixel shader, vertex shaders have that declared in the - * helper function shader that is linked in at link time - */ - if (pshader && reg_maps->shader_version.major >= 3) + if (!pshader) { - UINT in_count = min(vec4_varyings(reg_maps->shader_version.major, gl_info), shader->limits.packed_input); + /* Declare attributes. */ + for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) + { + if (map & 1) + shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, i); + } - if (use_vs(state)) - shader_addline(buffer, "varying vec4 %s_in[%u];\n", prefix, in_count); - else - /* TODO: Write a replacement shader for the fixed function vertex pipeline, so this isn't needed. - * For fixed function vertex processing + 3.0 pixel shader we need a separate function in the - * pixel shader that reads the fixed function color into the packed input registers. */ - shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); + shader_addline(buffer, "uniform vec4 posFixup;\n"); + shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits.packed_output); + } + else + { + if (reg_maps->shader_version.major >= 3) + { + UINT in_count = min(vec4_varyings(reg_maps->shader_version.major, gl_info), shader->limits.packed_input); + + if (use_vs(state)) + shader_addline(buffer, "varying vec4 %s_in[%u];\n", prefix, in_count); + else + /* TODO: Write a replacement shader for the fixed function + * vertex pipeline, so this isn't needed. For fixed function + * vertex processing + 3.0 pixel shader we need a separate + * function in the pixel shader that reads the fixed function + * color into the packed input registers. */ + shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); + } + + for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + { + if (!(map & 1)) + continue; + + shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); + + if (reg_maps->luminanceparams & (1 << i)) + { + shader_addline(buffer, "uniform float luminancescale%d;\n", i); + shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); + extra_constants_needed++; + } + + extra_constants_needed++; + } + + if (ps_args->srgb_correction) + { + shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", + srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); + shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", + srgb_cmp); + } + if (reg_maps->vpos || reg_maps->usesdsy) + { + if (shader->limits.constant_float + extra_constants_needed + + 1 < gl_info->limits.glsl_ps_float_constants) + { + shader_addline(buffer, "uniform vec4 ycorrection;\n"); + extra_constants_needed++; + } + else + { + /* This happens because we do not have proper tracking of the constant registers that are + * actually used, only the max limit of the shader version + */ + FIXME("Cannot find a free uniform for vpos correction params\n"); + shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", + context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, + context->render_offscreen ? 1.0f : -1.0f); + } + shader_addline(buffer, "vec4 vpos;\n"); + } } /* Declare output register temporaries */ @@ -1171,15 +1178,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); } - /* Declare attributes */ - if (reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX) - { - for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) - { - if (map & 1) shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, i); - } - } - /* Declare loop registers aLx */ if (reg_maps->shader_version.major < 4) {

1 0

James Eder : ntdll: Add detection for Revision in get_cpuinfo().
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: ebc7ffd5273292ed51108dd6b048db70a207223d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc7ffd5273292ed51108dd6b… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:46 2012 -0600 ntdll: Add detection for Revision in get_cpuinfo(). --- dlls/ntdll/nt.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ec226ae..c1cf38b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -910,6 +910,11 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (info->Level == 0xf) /* AMD says to add the extended family to the family if family is 0xf */ info->Level += (regs2[0] >> 20) & 0xff; + /* repack model and stepping to make a "revision" */ + info->Revision = ((regs2[0] >> 16) & 0xf) << 12; /* extended model */ + info->Revision |= ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ + info->Revision |= regs2[0] & 0xf; /* stepping */ + do_cpuid(0x80000000, regs); /* get vendor cpuid level */ if (regs[0] >= 0x80000001) { @@ -925,6 +930,11 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Level = ((regs2[0] >> 8) & 0xf) + ((regs2[0] >> 20) & 0xff); /* family + extended family */ if(info->Level == 15) info->Level = 6; + /* repack model and stepping to make a "revision" */ + info->Revision = ((regs2[0] >> 16) & 0xf) << 12; /* extended model */ + info->Revision |= ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ + info->Revision |= regs2[0] & 0xf; /* stepping */ + if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 5 )) >> 5; @@ -938,6 +948,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) else { info->Level = (regs2[0] >> 8) & 0xf; /* family */ + + /* repack model and stepping to make a "revision" */ + info->Revision = ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ + info->Revision |= regs2[0] & 0xf; /* stepping */ } } }

1 0