November 2011 - Wine-Commits

Michael Stefaniuc : include: Drop unneeded l modifiers from numeric constants in rpcndr.h.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 517d9333d424ddd7d5697f8b6658ae39edc6daa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517d9333d424ddd7d5697f8b6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 23 12:12:55 2011 +0100 include: Drop unneeded l modifiers from numeric constants in rpcndr.h. --- include/rpcndr.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index eb65192..514f1ce 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -40,19 +40,19 @@ extern "C" { /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */ -#define __NDR_CHAR_REP_MASK 0x000fL -#define __NDR_INT_REP_MASK 0x00f0L -#define __NDR_FLOAT_REP_MASK 0xff00L +#define __NDR_CHAR_REP_MASK 0x000f +#define __NDR_INT_REP_MASK 0x00f0 +#define __NDR_FLOAT_REP_MASK 0xff00 -#define __NDR_IEEE_FLOAT 0x0000L -#define __NDR_VAX_FLOAT 0x0100L -#define __NDR_IBM_FLOAT 0x0300L +#define __NDR_IEEE_FLOAT 0x0000 +#define __NDR_VAX_FLOAT 0x0100 +#define __NDR_IBM_FLOAT 0x0300 -#define __NDR_ASCII_CHAR 0x0000L -#define __NDR_EBCDIC_CHAR 0x0001L +#define __NDR_ASCII_CHAR 0x0000 +#define __NDR_EBCDIC_CHAR 0x0001 -#define __NDR_LITTLE_ENDIAN 0x0010L -#define __NDR_BIG_ENDIAN 0x0000L +#define __NDR_LITTLE_ENDIAN 0x0010 +#define __NDR_BIG_ENDIAN 0x0000 /* Mac's are special */ #if defined(__RPC_MAC__)

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 7e82317f175ad51383c2a4e7dad2200cc1a4ee29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e82317f175ad51383c2a4e7d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Nov 21 22:01:02 2011 +0100 po: Update Italian translation. --- po/it.po | 52 +++++++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 33 deletions(-) diff --git a/po/it.po b/po/it.po index c213a57..2c10abc 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-09 10:22+0100\n" +"PO-Revision-Date: 2011-11-21 21:59+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -344,13 +344,12 @@ msgid "Unreadable Entry" msgstr "Elemento non leggibile" #: comdlg32.rc:68 -#, fuzzy msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" "Questo valore non si trova all'interno della pagina.\n" -"Usare un valore compreso tra %d e %d." +"Usare un valore compreso tra %1!d! e %2!d!." #: comdlg32.rc:70 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -410,9 +409,8 @@ msgstr "" "installare la stampante e poi ritentare." #: comdlg32.rc:151 -#, fuzzy msgid "Select a font size between %1!d! and %2!d! points." -msgstr "Scegli la dimensione del carattere tra %d e %d punti." +msgstr "Scegli la dimensione del carattere tra %1!d! e %2!d! punti." #: comdlg32.rc:152 ieframe.rc:32 msgid "&Save" @@ -1595,9 +1593,8 @@ msgid "Public key" msgstr "Chiave pubblica" #: cryptui.rc:58 -#, fuzzy msgid "%1 (%2!d! bits)" -msgstr "%s (%d bit)" +msgstr "%1 (%2!d! bit)" #: cryptui.rc:59 msgid "SHA1 hash" @@ -2049,9 +2046,8 @@ msgid "Regional Setting" msgstr "Impostazioni regionali" #: dxdiagn.rc:26 -#, fuzzy msgid "%1!u!MB used, %2!u!MB available" -msgstr "%uMB usati, %uMB disponibili" +msgstr "%1!u!MB usati, %2!u!MB disponibili" #: gdi32.rc:25 msgid "Western" @@ -6153,9 +6149,8 @@ msgid "us" msgstr "µs" #: setupapi.rc:28 -#, fuzzy msgid "The file '%1' on %2 is needed" -msgstr "Il file '%s' su %s è necessario" +msgstr "Il file '%1' su %2 è necessario" #: setupapi.rc:29 ipconfig.rc:31 msgid "Unknown" @@ -8863,9 +8858,8 @@ msgstr "" "validi\n" #: ipconfig.rc:29 -#, fuzzy msgid "%1 adapter %2\n" -msgstr "%s adattatore %s\n" +msgstr "%1 adattatore %2\n" #: ipconfig.rc:30 msgid "Ethernet" @@ -9603,9 +9597,8 @@ msgid "bytes" msgstr "bytes" #: oleview.rc:148 -#, fuzzy msgid "LoadTypeLib( %1 ) failed ($%2!x!)" -msgstr "LoadTypeLib( %s ) fallito ($%x)" +msgstr "LoadTypeLib( %1 ) fallito ($%2!x!)" #: oleview.rc:149 msgid "Inherited Interfaces" @@ -10371,52 +10364,45 @@ msgid "Error: One of options /im or /pid must be specified.\n" msgstr "Errore: una delle opzioni /im o /pid deve essere specificata.\n" #: taskkill.rc:31 -#, fuzzy msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Errore: l'opzione %s richiede un parametro dalla riga di comando.\n" +msgstr "Errore: l'opzione %1 richiede un parametro dalla riga di comando.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" msgstr "Errore: le opzioni /im e /pid si escludono mutualmente.\n" #: taskkill.rc:33 -#, fuzzy msgid "Close message sent to top-level windows of process with PID %1!u!.\n" msgstr "" "Messaggio di chiusura mandato alle finestre top-level del processo con PID " -"%u.\n" +"%1!u!.\n" #: taskkill.rc:34 -#, fuzzy msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"Messaggio di chiusura mandato alle finestre top-level del processo \"%s\" " -"con PID %u.\n" +"Messaggio di chiusura mandato alle finestre top-level del processo \"%1\" " +"con PID %2!u!.\n" #: taskkill.rc:35 -#, fuzzy msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Il processo con PID %u è stato terminato forzatamente.\n" +msgstr "Il processo con PID %1!u! è stato terminato forzatamente.\n" #: taskkill.rc:36 -#, fuzzy msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "Il processo \"%s\" con PID %u è stato terminato forzatamente.\n" +msgstr "Il processo \"%1\" con PID %2!u! è stato terminato forzatamente.\n" #: taskkill.rc:37 -#, fuzzy msgid "Error: Could not find process \"%1\".\n" -msgstr "Errore: processo non trovato \"%s\".\n" +msgstr "Errore: processo non trovato \"%1\".\n" #: taskkill.rc:38 msgid "Error: Unable to enumerate the process list.\n" msgstr "Errore: impossibile elencare la lista dei processi.\n" #: taskkill.rc:39 -#, fuzzy msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "Errore: impossibile terminare il processo \"%s\".\n" +msgstr "Errore: impossibile terminare il processo \"%1\".\n" #: taskkill.rc:40 msgid "Error: Process self-termination is not permitted.\n" @@ -12425,17 +12411,17 @@ msgstr "liberi %1 di %2" #: winefile.rc:121 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:122 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:123 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game"

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DRECTPATCH_INFO typedef.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 2ecbe2aa0f73def463f82e0c0c789e8b3eae97e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecbe2aa0f73def463f82e0c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:45 2011 +0100 wined3d: Get rid of the WINED3DRECTPATCH_INFO typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 37 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 20 ++++++++++---------- 6 files changed, 35 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 869da69..f8c6f92 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2598,7 +2598,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawRectPatch(IDirect3DDevice8 *iface wined3d_mutex_lock(); hr = wined3d_device_draw_rect_patch(This->wined3d_device, Handle, - pNumSegs, (const WINED3DRECTPATCH_INFO *)pRectPatchInfo); + pNumSegs, (const struct wined3d_rect_patch_info *)pRectPatchInfo); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2b47eb4..3532b57 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2684,7 +2684,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(IDirect3DDevice9Ex *ifa wined3d_mutex_lock(); hr = wined3d_device_draw_rect_patch(This->wined3d_device, Handle, - pNumSegs, (const WINED3DRECTPATCH_INFO *)pRectPatchInfo); + pNumSegs, (const struct wined3d_rect_patch_info *)pRectPatchInfo); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index db849a4..dbefa63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4647,7 +4647,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, } HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle, - const float *num_segs, const WINED3DRECTPATCH_INFO *rect_patch_info) + const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info) { struct WineD3DRectPatch *patch; GLenum old_primitive_type; @@ -4704,13 +4704,13 @@ HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT if (num_segs[0] != patch->numSegs[0] || num_segs[1] != patch->numSegs[1] || num_segs[2] != patch->numSegs[2] || num_segs[3] != patch->numSegs[3] - || (rect_patch_info && memcmp(rect_patch_info, &patch->RectPatchInfo, sizeof(*rect_patch_info)))) + || (rect_patch_info && memcmp(rect_patch_info, &patch->rect_patch_info, sizeof(*rect_patch_info)))) { HRESULT hr; TRACE("Tesselation density or patch info changed, retesselating\n"); if (rect_patch_info) - patch->RectPatchInfo = *rect_patch_info; + patch->rect_patch_info = *rect_patch_info; patch->numSegs[0] = num_segs[0]; patch->numSegs[1] = num_segs[1]; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dde71b4..39d4307 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -789,6 +789,7 @@ static void normalize_normal(float *n) { HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch *patch) { unsigned int i, j, num_quads, out_vertex_size, buffer_size, d3d_out_vertex_size; + const struct wined3d_rect_patch_info *info = &patch->rect_patch_info; float max_x = 0.0f, max_y = 0.0f, max_z = 0.0f, neg_z = 0.0f; struct wined3d_state *state = &This->stateBlock->state; struct wined3d_stream_info stream_info; @@ -796,7 +797,6 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch struct wined3d_context *context; struct wined3d_shader *vs; const BYTE *data; - const WINED3DRECTPATCH_INFO *info = &patch->RectPatchInfo; DWORD vtxStride; GLenum feedback_type; GLfloat *feedbuffer; @@ -821,9 +821,9 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context->gl_info)); } vtxStride = e->stride; - data = e->data.addr + - vtxStride * info->Stride * info->StartVertexOffsetHeight + - vtxStride * info->StartVertexOffsetWidth; + data = e->data.addr + + vtxStride * info->stride * info->start_vertex_offset_height + + vtxStride * info->start_vertex_offset_width; /* Not entirely sure about what happens with transformed vertices */ if (stream_info.position_transformed) FIXME("Transformed position in rectpatch generation\n"); @@ -835,17 +835,17 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch */ ERR("Vertex stride is not a multiple of sizeof(GLfloat)\n"); } - if(info->Basis != WINED3DBASIS_BEZIER) { - FIXME("Basis is %s, how to handle this?\n", debug_d3dbasis(info->Basis)); - } - if(info->Degree != WINED3DDEGREE_CUBIC) { - FIXME("Degree is %s, how to handle this?\n", debug_d3ddegree(info->Degree)); - } + if (info->basis != WINED3DBASIS_BEZIER) + FIXME("Basis is %s, how to handle this?\n", debug_d3dbasis(info->basis)); + if (info->degree != WINED3DDEGREE_CUBIC) + FIXME("Degree is %s, how to handle this?\n", debug_d3ddegree(info->degree)); /* First, get the boundary cube of the input data */ - for(j = 0; j < info->Height; j++) { - for(i = 0; i < info->Width; i++) { - const float *v = (const float *)(data + vtxStride * i + vtxStride * info->Stride * j); + for (j = 0; j < info->height; ++j) + { + for (i = 0; i < info->width; ++i) + { + const float *v = (const float *)(data + vtxStride * i + vtxStride * info->stride * j); if(fabs(v[0]) > max_x) max_x = fabsf(v[0]); if(fabs(v[1]) > max_y) max_y = fabsf(v[1]); if(fabs(v[2]) > max_z) max_z = fabsf(v[2]); @@ -964,14 +964,15 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch feedbuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer_size * sizeof(float) * 8); glMap2f(GL_MAP2_VERTEX_3, - 0.0f, 1.0f, vtxStride / sizeof(float), info->Width, - 0.0f, 1.0f, info->Stride * vtxStride / sizeof(float), info->Height, + 0.0f, 1.0f, vtxStride / sizeof(float), info->width, + 0.0f, 1.0f, info->stride * vtxStride / sizeof(float), info->height, (const GLfloat *)data); checkGLcall("glMap2f"); - if(patch->has_texcoords) { + if (patch->has_texcoords) + { glMap2f(GL_MAP2_TEXTURE_COORD_4, - 0.0f, 1.0f, vtxStride / sizeof(float), info->Width, - 0.0f, 1.0f, info->Stride * vtxStride / sizeof(float), info->Height, + 0.0f, 1.0f, vtxStride / sizeof(float), info->width, + 0.0f, 1.0f, info->stride * vtxStride / sizeof(float), info->height, (const GLfloat *)data); checkGLcall("glMap2f"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e44f69..8ddd092 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1556,7 +1556,7 @@ struct WineD3DRectPatch UINT Handle; float *mem; WineDirect3DVertexStridedData strided; - WINED3DRECTPATCH_INFO RectPatchInfo; + struct wined3d_rect_patch_info rect_patch_info; float numSegs[4]; char has_normals, has_texcoords; struct list entry; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3ffb8bd..b755b74 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1596,16 +1596,16 @@ struct wined3d_line_pattern WORD line_pattern; }; -typedef struct _WINEDD3DRECTPATCH_INFO +struct wined3d_rect_patch_info { - UINT StartVertexOffsetWidth; - UINT StartVertexOffsetHeight; - UINT Width; - UINT Height; - UINT Stride; - WINED3DBASISTYPE Basis; - WINED3DDEGREETYPE Degree; -} WINED3DRECTPATCH_INFO; + UINT start_vertex_offset_width; + UINT start_vertex_offset_height; + UINT width; + UINT height; + UINT stride; + WINED3DBASISTYPE basis; + WINED3DDEGREETYPE degree; +}; typedef struct _WINED3DTRIPATCH_INFO { @@ -2189,7 +2189,7 @@ HRESULT __cdecl wined3d_device_draw_primitive_strided(struct wined3d_device *dev HRESULT __cdecl wined3d_device_draw_primitive_up(struct wined3d_device *device, UINT vertex_count, const void *stream_data, UINT stream_stride); HRESULT __cdecl wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle, - const float *num_segs, const WINED3DRECTPATCH_INFO *rect_patch_info); + const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info); HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle, const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device);

1 0

Jacek Caban : jscript: Use bytecode for 'in' expression implementation.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 1c824ea6065c15dd4bdbfc3eacb6e542fbbff336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c824ea6065c15dd4bdbfc3ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 23 12:13:35 2011 +0100 jscript: Use bytecode for 'in' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 47 ++++++++++++++++++++++++----------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1e496a8..e36dcbe 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -113,6 +113,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_IN: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cbfde6d..c6b9eef 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2111,42 +2111,43 @@ HRESULT instanceof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.8.7 */ -static HRESULT in_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *obj, jsexcept_t *ei, VARIANT *retv) +HRESULT interp_in(exec_ctx_t *ctx) { - VARIANT_BOOL ret; - DISPID id; + VARIANT *obj, *v; + DISPID id = 0; + BOOL ret; BSTR str; HRESULT hres; - if(V_VT(obj) != VT_DISPATCH || !V_DISPATCH(obj)) - return throw_type_error(ctx, ei, JS_E_OBJECT_EXPECTED, NULL); + TRACE("\n"); - hres = to_string(ctx, lval, ei, &str); - if(FAILED(hres)) + obj = stack_pop(ctx); + v = stack_pop(ctx); + + if(V_VT(obj) != VT_DISPATCH || !V_DISPATCH(obj)) { + VariantClear(obj); + VariantClear(v); + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_OBJECT_EXPECTED, NULL); + } + + hres = to_string(ctx->parser->script, v, &ctx->ei, &str); + VariantClear(v); + if(FAILED(hres)) { + IDispatch_Release(V_DISPATCH(obj)); return hres; + } - hres = disp_get_id(ctx, V_DISPATCH(obj), str, 0, &id); + hres = disp_get_id(ctx->parser->script, V_DISPATCH(obj), str, 0, &id); + IDispatch_Release(V_DISPATCH(obj)); SysFreeString(str); if(SUCCEEDED(hres)) - ret = VARIANT_TRUE; + ret = TRUE; else if(hres == DISP_E_UNKNOWNNAME) - ret = VARIANT_FALSE; + ret = FALSE; else return hres; - V_VT(retv) = VT_BOOL; - V_BOOL(retv) = ret; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.8.7 */ -HRESULT in_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return binary_expr_eval(ctx, expr, in_eval, ei, ret); + return stack_push_bool(ctx, ret); } /* ECMA-262 3rd Edition 11.6.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 829274d..e5e316f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -45,6 +45,7 @@ typedef struct _func_stack { X(add, 1, 0) \ X(bneg, 1, 0) \ X(eq2, 1, 0) \ + X(in, 1, 0) \ X(neg, 1, 0) \ X(neq2, 1, 0) \ X(tonum, 1, 0) \ @@ -529,7 +530,6 @@ HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*, HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT in_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 98813b4..0fcba92 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1312,7 +1312,7 @@ static const expression_eval_t expression_eval_table[] = { binary_xor_expression_eval, binary_and_expression_eval, instanceof_expression_eval, - in_expression_eval, + compiled_expression_eval, compiled_expression_eval, sub_expression_eval, mul_expression_eval,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DLINEPATTERN typedef.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 7416953e81960bf661c567ef73832c233ef6b74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7416953e81960bf661c567ef7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:44 2011 +0100 wined3d: Get rid of the WINED3DLINEPATTERN typedef. --- dlls/wined3d/state.c | 18 +++++++++++------- dlls/wined3d/stateblock.c | 9 +++++---- include/wine/wined3d.h | 8 ++++---- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b9a0dca..e5fbb61 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1313,20 +1313,24 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d static void state_linepattern(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - union { - DWORD d; - WINED3DLINEPATTERN lp; + union + { + DWORD d; + struct wined3d_line_pattern lp; } tmppattern; tmppattern.d = state->render_states[WINED3DRS_LINEPATTERN]; - TRACE("Line pattern: repeat %d bits %x\n", tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern); + TRACE("Line pattern: repeat %d bits %x.\n", tmppattern.lp.repeat_factor, tmppattern.lp.line_pattern); - if (tmppattern.lp.wRepeatFactor) { - glLineStipple(tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern); + if (tmppattern.lp.repeat_factor) + { + glLineStipple(tmppattern.lp.repeat_factor, tmppattern.lp.line_pattern); checkGLcall("glLineStipple(repeat, linepattern)"); glEnable(GL_LINE_STIPPLE); checkGLcall("glEnable(GL_LINE_STIPPLE);"); - } else { + } + else + { glDisable(GL_LINE_STIPPLE); checkGLcall("glDisable(GL_LINE_STIPPLE);"); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 33b8ce2..6084a25 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1074,8 +1074,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) struct wined3d_device *device = stateblock->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_state *state = &stateblock->state; - union { - WINED3DLINEPATTERN lp; + union + { + struct wined3d_line_pattern lp; DWORD d; } lp; union { @@ -1109,8 +1110,8 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_ZENABLE] = WINED3DZB_FALSE; state->render_states[WINED3DRS_FILLMODE] = WINED3DFILL_SOLID; state->render_states[WINED3DRS_SHADEMODE] = WINED3DSHADE_GOURAUD; - lp.lp.wRepeatFactor = 0; - lp.lp.wLinePattern = 0; + lp.lp.repeat_factor = 0; + lp.lp.line_pattern = 0; state->render_states[WINED3DRS_LINEPATTERN] = lp.d; state->render_states[WINED3DRS_ZWRITEENABLE] = TRUE; state->render_states[WINED3DRS_ALPHATESTENABLE] = FALSE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f228e44..3ffb8bd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1590,11 +1590,11 @@ struct wined3d_gamma_ramp WORD blue[256]; }; -typedef struct _WINED3DLINEPATTERN +struct wined3d_line_pattern { - WORD wRepeatFactor; - WORD wLinePattern; -} WINED3DLINEPATTERN; + WORD repeat_factor; + WORD line_pattern; +}; typedef struct _WINEDD3DRECTPATCH_INFO {

1 0

Henri Verbeet : ddraw: Move setting ddraw-> d3d_target out of ddraw_attach_d3d_device().
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 74345201ad7d9c82e8aabe558657f61ec3f6db47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74345201ad7d9c82e8aabe558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:43 2011 +0100 ddraw: Move setting ddraw->d3d_target out of ddraw_attach_d3d_device(). --- dlls/ddraw/ddraw.c | 33 ++++++--------------------------- 1 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8cb2596..09b4bc1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2522,26 +2522,13 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, return DD_OK; } -/***************************************************************************** - * ddraw_attach_d3d_device - * - * Initializes the D3D capabilities of WineD3D - * - * Params: - * primary: The primary surface for D3D - * - * Returns - * DD_OK on success, - * DDERR_* otherwise - * - *****************************************************************************/ -static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary, +static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, WINED3DPRESENT_PARAMETERS *presentation_parameters) { HWND window = presentation_parameters->hDeviceWindow; HRESULT hr; - TRACE("ddraw %p, primary %p.\n", ddraw, primary); + TRACE("ddraw %p.\n", ddraw); if (!window || window == GetDesktopWindow()) { @@ -2565,9 +2552,6 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac } ddraw->d3d_window = window; - /* Store the future Render Target surface */ - ddraw->d3d_target = primary; - /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->d3d_initialized = TRUE; @@ -2597,7 +2581,6 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *surface) { WINED3DPRESENT_PARAMETERS presentation_parameters; - IDirectDrawSurfaceImpl *target = surface; struct wined3d_display_mode mode; HRESULT hr = WINED3D_OK; @@ -2612,12 +2595,6 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface return hr; } - if (ddraw->primary) - { - TRACE("Using primary %p.\n", ddraw->primary); - target = ddraw->primary; - } - memset(&presentation_parameters, 0, sizeof(presentation_parameters)); presentation_parameters.BackBufferWidth = mode.width; presentation_parameters.BackBufferHeight = mode.height; @@ -2635,8 +2612,7 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface * target creation will cause the 3D init. */ if (DefaultSurfaceType == SURFACE_OPENGL) { - TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); - hr = ddraw_attach_d3d_device(ddraw, target, &presentation_parameters); + hr = ddraw_attach_d3d_device(ddraw, &presentation_parameters); } else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { @@ -3061,6 +3037,9 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, wined3d_mutex_unlock(); return hr; } + + if (DefaultSurfaceType == SURFACE_OPENGL) + ddraw->d3d_target = ddraw->primary ? ddraw->primary : object; } if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)

1 0

Matteo Bruni : ddraw: Reorder formats in EnumTextureFormats.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: ca83e14aba73a2dfa6410331229fb155ba53c78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca83e14aba73a2dfa64103312… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 23 01:31:41 2011 +0100 ddraw: Reorder formats in EnumTextureFormats. --- dlls/ddraw/device.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c33ddbb..e678e90 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1059,17 +1059,15 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, static const enum wined3d_format_id FormatList[] = { - /* 32 bit */ - WINED3DFMT_B8G8R8A8_UNORM, - WINED3DFMT_B8G8R8X8_UNORM, - /* 24 bit */ - WINED3DFMT_B8G8R8_UNORM, - /* 16 Bit */ + /* 16 bit */ + WINED3DFMT_B5G5R5X1_UNORM, WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B4G4R4A4_UNORM, WINED3DFMT_B5G6R5_UNORM, - WINED3DFMT_B5G5R5X1_UNORM, - /* 8 Bit */ + /* 32 bit */ + WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_UNORM, + /* 8 bit */ WINED3DFMT_B2G3R3_UNORM, WINED3DFMT_P8_UINT, /* FOURCC codes */ @@ -1211,17 +1209,15 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, static const enum wined3d_format_id FormatList[] = { - /* 32 bit */ - WINED3DFMT_B8G8R8A8_UNORM, - WINED3DFMT_B8G8R8X8_UNORM, - /* 24 bit */ - WINED3DFMT_B8G8R8_UNORM, - /* 16 Bit */ + /* 16 bit */ + WINED3DFMT_B5G5R5X1_UNORM, WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B4G4R4A4_UNORM, WINED3DFMT_B5G6R5_UNORM, - WINED3DFMT_B5G5R5X1_UNORM, - /* 8 Bit */ + /* 32 bit */ + WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_UNORM, + /* 8 bit */ WINED3DFMT_B2G3R3_UNORM, WINED3DFMT_P8_UINT, /* FOURCC codes - Not in this version*/

1 0

Henri Verbeet : wined3d: Remove the special case for loop and rep in shader_get_registers_used().
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: a8504f4f57fe44a2a368e85fed11f4ecd143d29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8504f4f57fe44a2a368e85fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:41 2011 +0100 wined3d: Remove the special case for loop and rep in shader_get_registers_used(). SM4 loops don't have control parameters. --- dlls/wined3d/shader.c | 37 ++++++++++--------------------------- 1 files changed, 10 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d7ba818..11be333 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -595,33 +595,6 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st list_add_head(&shader->constantsB, &lconst->entry); reg_maps->local_bool_consts |= (1 << dst.reg.idx); } - /* If there's a loop in the shader. */ - else if (ins.handler_idx == WINED3DSIH_LOOP - || ins.handler_idx == WINED3DSIH_REP) - { - struct wined3d_shader_src_param src, rel_addr; - - fe->shader_read_src_param(fe_data, &ptr, &src, &rel_addr); - - /* Rep and Loop always use an integer constant for the control parameters. */ - if (ins.handler_idx == WINED3DSIH_REP) - { - reg_maps->integer_constants |= 1 << src.reg.idx; - } - else - { - fe->shader_read_src_param(fe_data, &ptr, &src, &rel_addr); - reg_maps->integer_constants |= 1 << src.reg.idx; - } - - cur_loop_depth++; - if (cur_loop_depth > max_loop_depth) max_loop_depth = cur_loop_depth; - } - else if (ins.handler_idx == WINED3DSIH_ENDLOOP - || ins.handler_idx == WINED3DSIH_ENDREP) - { - cur_loop_depth--; - } /* For subroutine prototypes. */ else if (ins.handler_idx == WINED3DSIH_LABEL) { @@ -795,6 +768,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_IFC) reg_maps->usesifc = 1; else if (ins.handler_idx == WINED3DSIH_CALL) reg_maps->usescall = 1; else if (ins.handler_idx == WINED3DSIH_POW) reg_maps->usespow = 1; + else if (ins.handler_idx == WINED3DSIH_LOOP + || ins.handler_idx == WINED3DSIH_REP) + { + ++cur_loop_depth; + if (cur_loop_depth > max_loop_depth) + max_loop_depth = cur_loop_depth; + } + else if (ins.handler_idx == WINED3DSIH_ENDLOOP + || ins.handler_idx == WINED3DSIH_ENDREP) + --cur_loop_depth; limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i)

1 0

Henri Verbeet : wined3d: Don' t return a surface for a NULL dc in wined3d_device_get_surface_from_dc().
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 08e8b0a70a13b8914155f95c8d21163d91eb2a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e8b0a70a13b8914155f95c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 08:51:42 2011 +0100 wined3d: Don't return a surface for a NULL dc in wined3d_device_get_surface_from_dc(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e70841..db849a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5871,6 +5871,9 @@ HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *de TRACE("device %p, dc %p, surface %p.\n", device, dc, surface); + if (!dc) + return WINED3DERR_INVALIDCALL; + LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) { if (resource->resourceType == WINED3DRTYPE_SURFACE)

1 0

Andrew Talbot : widl: Avoid right-shift of negative values.
by Alexandre Julliard Nov. 23, 2011

Nov. 23, 2011

Module: wine Branch: master Commit: 7f27eb6a451510ceefa91b71f9d6cd8e152df9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f27eb6a451510ceefa91b71f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 22 22:25:37 2011 +0000 widl: Avoid right-shift of negative values. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index cadbef2..c1b5302 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2379,8 +2379,8 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", RPC_FC_LONG); write_conf_or_var_desc(file, current_structure, offset, ft, get_attrp(f->attrs, ATTR_SWITCHIS)); - print_file(file, 2, "NdrFcShort(%hd),\t/* Offset= %hd (%u) */\n", - reloff, reloff, absoff); + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + (unsigned short)reloff, reloff, absoff); *tfsoff += 8; } offset += size;

1 0