September 2008 - Wine-Commits

Jacek Caban : jscript: Added try statement implementation.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 66eb62ada690914070a7ee275a8ce253eef84a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66eb62ada690914070a7ee275… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:44:54 2008 +0200 jscript: Added try statement implementation. --- dlls/jscript/engine.c | 75 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 31 ++++++++++++++++++ 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2a1bf15..f73f3bc 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -144,6 +144,15 @@ HRESULT scope_push(scope_chain_t *scope, DispatchEx *obj, scope_chain_t **ret) return S_OK; } +static void scope_pop(scope_chain_t **scope) +{ + scope_chain_t *tmp; + + tmp = *scope; + *scope = tmp->next; + scope_release(tmp); +} + void scope_release(scope_chain_t *scope) { if(--scope->ref) @@ -713,16 +722,74 @@ HRESULT switch_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t return E_NOTIMPL; } -HRESULT throw_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +HRESULT throw_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { FIXME("\n"); return E_NOTIMPL; } -HRESULT try_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.14 */ +static HRESULT catch_eval(exec_ctx_t *ctx, catch_block_t *block, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *var_disp; + VARIANT ex, val; + HRESULT hres; + + ex = rt->ei.var; + memset(&rt->ei, 0, sizeof(jsexcept_t)); + + hres = create_dispex(ctx->parser->script, NULL, NULL, &var_disp); + if(SUCCEEDED(hres)) { + hres = jsdisp_propput_name(var_disp, block->identifier, ctx->parser->script->lcid, + &ex, &rt->ei, NULL/*FIXME*/); + if(SUCCEEDED(hres)) { + hres = scope_push(ctx->scope_chain, var_disp, &ctx->scope_chain); + if(SUCCEEDED(hres)) { + hres = stat_eval(ctx, block->statement, rt, &val); + scope_pop(&ctx->scope_chain); + } + } + + jsdisp_release(var_disp); + } + + VariantClear(&ex); + if(FAILED(hres)) + return hres; + + *ret = val; + return S_OK; +} + +/* ECMA-262 3rd Edition 12.14 */ +HRESULT try_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) +{ + try_statement_t *stat = (try_statement_t*)_stat; + VARIANT val; + HRESULT hres; + + TRACE("\n"); + + hres = stat_eval(ctx, stat->try_statement, rt, &val); + if(FAILED(hres)) { + TRACE("EXCEPTION\n"); + if(!stat->catch_block) + return hres; + + hres = catch_eval(ctx, stat->catch_block, rt, &val); + if(FAILED(hres)) + return hres; + } + + if(stat->finally_statement) { + VariantClear(&val); + hres = stat_eval(ctx, stat->finally_statement, rt, &val); + if(FAILED(hres)) + return hres; + } + + *ret = val; + return S_OK; } static HRESULT return_bool(exprval_t *ret, DWORD b) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7a4e4cd..d55aa17 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -236,4 +236,35 @@ ok(tmp === 1, "decremented tmp is not 1"); String.prototype.test = true; ok("".test === true, "\"\",test is not true"); +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; +}catch(ex) { + ok(false, "unexpected catch"); +} +ok(state === "try", "state = " + state + " expected try"); + +state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; +}finally { + ok(state === "try", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + +state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; +}catch(ex) { + ok(false, "unexpected catch"); +}finally { + ok(state === "try", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + reportSuccess();

1 0

Henri Verbeet : wined3d: Use the internal format for renderbuffer storage.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 147ec1a1a4d43566e5e343e159cb214500827f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147ec1a1a4d43566e5e343e15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 14:55:40 2008 +0200 wined3d: Use the internal format for renderbuffer storage. Note that using GL_DEPTH_COMPONENT instead of eg. GL_DEPTH_COMPONENT24 will work, but will create a renderbuffer with the format of the onscreen depth buffer. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8087252..5f4aef3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -396,7 +396,7 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi GL_EXTCALL(glGenRenderbuffersEXT(1, &renderbuffer)); GL_EXTCALL(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffer)); - GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, glDesc->glFormat, width, height)); + GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, glDesc->glInternal, width, height)); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t)); entry->width = width;

1 0

Henri Verbeet : wined3d: IWineD3DCubeTextureImpl implements IID_IWineD3DCubeTexture, not IID_IWineD3DTexture.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: ad658c22b80b34db29b5dc5e46d5ae9fcb2ec51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad658c22b80b34db29b5dc5e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 14:55:40 2008 +0200 wined3d: IWineD3DCubeTextureImpl implements IID_IWineD3DCubeTexture, not IID_IWineD3DTexture. --- dlls/wined3d/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 14d3040..b823022 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -47,7 +47,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture || IsEqualGUID(riid, &IID_IWineD3DBase) || IsEqualGUID(riid, &IID_IWineD3DResource) || IsEqualGUID(riid, &IID_IWineD3DBaseTexture) - || IsEqualGUID(riid, &IID_IWineD3DTexture)) { + || IsEqualGUID(riid, &IID_IWineD3DCubeTexture)) { IUnknown_AddRef(iface); *ppobj = This; return S_OK;

1 0

Henri Verbeet : wined3d: Improve a TRACE.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 047e42da0880c6809b2c564ce40546679dae447b URL: http://source.winehq.org/git/wine.git/?a=commit;h=047e42da0880c6809b2c564ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 14:55:40 2008 +0200 wined3d: Improve a TRACE. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e7626c..8087252 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -624,7 +624,7 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT textureName, int target) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - TRACE("(%p) : setting textureName %u, target %i\n", This, textureName, target); + TRACE("(%p) : setting textureName %u, target %#x\n", This, textureName, target); if (This->glDescription.textureName == 0 && textureName != 0) { IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); if((This->Flags & SFLAG_LOCATIONS) == 0) {

1 0

Rob Shearman : ole32: Update comments in compobj.c.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: de03fe3c0f0aad9534088fee08bf2356e453cc0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de03fe3c0f0aad9534088fee0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 16 12:42:38 2008 +0100 ole32: Update comments in compobj.c. --- dlls/ole32/compobj.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index bdf1a6d..37907ec 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -34,9 +34,6 @@ * - Implement the OXID resolver so we don't need magic endpoint names for * clients and servers to meet up * - * - Make all ole interface marshaling use NDR to be wire compatible with - * native DCOM - * */ #include "config.h" @@ -66,14 +63,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ +HINSTANCE OLE32_hInstance = 0; #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) /**************************************************************************** * This section defines variables internal to the COM module. - * - * TODO: Most of these things will have to be made thread-safe. */ static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, @@ -116,7 +111,7 @@ static LONG s_COMServerProcessReferences = 0; * objects. * * TODO: Make this data structure aware of inter-process communication. This - * means that parts of this will be exported to the Wine Server. + * means that parts of this will be exported to rpcss. */ typedef struct tagRegisteredClass { @@ -560,6 +555,8 @@ struct host_thread_params HWND apartment_hwnd; }; +/* thread for hosting an object to allow an object to appear to be created in + * an apartment with an incompatible threading model */ static DWORD CALLBACK apartment_hostobject_thread(LPVOID p) { struct host_thread_params *params = p; @@ -609,7 +606,12 @@ static DWORD CALLBACK apartment_hostobject_thread(LPVOID p) return S_OK; } -static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi_threaded, BOOL main_apartment, HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) +/* finds or creates a host apartment, creates the object inside it and returns + * a proxy to it so that the object can be used in the apartment of the + * caller of this function */ +static HRESULT apartment_hostobject_in_hostapt( + struct apartment *apt, BOOL multi_threaded, BOOL main_apartment, + HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) { struct host_object_params params; HWND apartment_hwnd = NULL; @@ -715,6 +717,8 @@ static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi return hr; } +/* create a window for the apartment or return the current one if one has + * already been created */ HRESULT apartment_createwindowifneeded(struct apartment *apt) { if (apt->multi_threaded) @@ -738,6 +742,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) return S_OK; } +/* retrieves the window for the main- or apartment-threaded apartment */ HWND apartment_getwindow(const struct apartment *apt) { assert(!apt->multi_threaded); @@ -750,6 +755,8 @@ void apartment_joinmta(void) COM_CurrentInfo()->apt = MTA; } +/* gets the specified class object by loading the appropriate DLL, if + * necessary and calls the DllGetClassObject function for the DLL */ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, BOOL apartment_threaded, REFCLSID rclsid, REFIID riid, void **ppv) @@ -822,6 +829,8 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, return hr; } +/* frees unused libraries loaded by apartment_getclassobject by calling the + * DLL's DllCanUnloadNow entry point */ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) { struct apartment_loaded_dll *entry, *next; @@ -834,6 +843,10 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) if (real_delay == INFINITE) { + /* DLLs that return multi-threaded objects aren't unloaded + * straight away to cope for programs that have races between + * last object destruction and threads in the DLLs that haven't + * finished, despite DllCanUnloadNow returning S_OK */ if (entry->multi_threaded) real_delay = 10 * 60 * 1000; /* 10 minutes */ else

1 0

Henri Verbeet : Make some ARB program structs and functions private to the backend.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: ee49230cd28d804b46920ed69db1003d82424f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee49230cd28d804b46920ed69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 14:55:39 2008 +0200 Make some ARB program structs and functions private to the backend. --- dlls/wined3d/arb_program_shader.c | 26 +++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 30 ------------------------------ 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d972570..2bb70c3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,6 +39,22 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); #define GLINFO_LOCATION (*gl_info) +/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, + * so upload them above that + */ +#define ARB_SHADER_PRIVCONST_BASE GL_LIMITS(vshader_constantsF) +#define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 + +/* ARB_program_shader private data */ +struct shader_arb_priv { + GLuint current_vprogram_id; + GLuint current_fprogram_id; + GLuint depth_blt_vprogram_id; + GLuint depth_blt_fprogram_id; + BOOL use_arbfp_fixed_func; + struct hash_table_t *fragment_shaders; +}; + /******************************************************** * ARB_[vertex/fragment]_program helper functions follow ********************************************************/ @@ -150,7 +166,7 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, Win * We only support float constants in ARB at the moment, so don't * worry about the Integers or Booleans */ -void shader_arb_load_constants( +static void shader_arb_load_constants( IWineD3DDevice* device, char usePixelShader, char useVertexShader) { @@ -234,7 +250,7 @@ void shader_arb_load_constants( } /* Generate the variable & register declarations for the ARB_vertex_program output target */ -void shader_generate_arb_declarations( +static void shader_generate_arb_declarations( IWineD3DBaseShader *iface, shader_reg_maps* reg_maps, SHADER_BUFFER* buffer, @@ -3195,7 +3211,7 @@ static void arbfp_blit_free(IWineD3DDevice *iface) { LEAVE_GL(); } -BOOL gen_planar_yuv_read(SHADER_BUFFER *buffer, WINED3DFORMAT fmt, GLenum textype, char *luminance) { +static BOOL gen_planar_yuv_read(SHADER_BUFFER *buffer, WINED3DFORMAT fmt, GLenum textype, char *luminance) { char chroma; const char *tex, *texinstr; @@ -3281,7 +3297,7 @@ BOOL gen_planar_yuv_read(SHADER_BUFFER *buffer, WINED3DFORMAT fmt, GLenum textyp return TRUE; } -BOOL gen_yv12_read(SHADER_BUFFER *buffer, WINED3DFORMAT fmt, GLenum textype, char *luminance) { +static BOOL gen_yv12_read(SHADER_BUFFER *buffer, WINED3DFORMAT fmt, GLenum textype, char *luminance) { const char *tex; switch(textype) { @@ -3426,7 +3442,7 @@ BOOL gen_yv12_read(SHADER_BUFFER *buffer, WINED3DFORMAT fmt, GLenum textype, cha return TRUE; } -GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLenum textype) { +static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLenum textype) { GLenum shader; SHADER_BUFFER buffer; char luminance_component; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6bb7e50..529d4bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -255,16 +255,6 @@ extern const shader_backend_t glsl_shader_backend; extern const shader_backend_t arb_program_shader_backend; extern const shader_backend_t none_shader_backend; -/* ARB_program_shader private data */ -struct shader_arb_priv { - GLuint current_vprogram_id; - GLuint current_fprogram_id; - GLuint depth_blt_vprogram_id; - GLuint depth_blt_fprogram_id; - BOOL use_arbfp_fixed_func; - struct hash_table_t *fragment_shaders; -}; - /* X11 locking */ extern void (*wine_tsx11_lock_ptr)(void); @@ -468,8 +458,6 @@ extern glAttribFunc normal_funcs[WINED3DDECLTYPE_UNUSED]; #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) -void depth_copy(IWineD3DDevice *iface); - /* Routines and structures related to state management */ typedef struct WineD3DContext WineD3DContext; typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *ctx); @@ -2023,12 +2011,6 @@ extern BOOL vshader_input_is_color( extern HRESULT allocate_shader_constants(IWineD3DStateBlockImpl* object); -/* ARB_[vertex/fragment]_program helper functions */ -extern void shader_arb_load_constants( - IWineD3DDevice* device, - char usePixelShader, - char useVertexShader); - /* ARB shader program Prototypes */ extern void shader_hw_def(SHADER_OPCODE_ARG *arg); @@ -2193,12 +2175,6 @@ extern HRESULT shader_get_registers_used( CONST DWORD* pToken, IWineD3DStateBlockImpl *stateBlock); -extern void shader_generate_arb_declarations( - IWineD3DBaseShader *iface, - shader_reg_maps* reg_maps, - SHADER_BUFFER* buffer, - WineD3D_GL_Info* gl_info); - extern void shader_generate_main( IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, @@ -2297,12 +2273,6 @@ static inline BOOL shader_constant_is_local(IWineD3DBaseShaderImpl* This, DWORD } -/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, - * so upload them above that - */ -#define ARB_SHADER_PRIVCONST_BASE GL_LIMITS(vshader_constantsF) -#define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 - /***************************************************************************** * IDirect3DVertexShader implementation structure */

1 0

Henri Verbeet : wined3d: Make some GLSL structs and functions private to the backend.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: c2178eb64f7e2b052dde21b73b56cd2d341c6c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2178eb64f7e2b052dde21b73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 14:55:39 2008 +0200 wined3d: Make some GLSL structs and functions private to the backend. --- dlls/wined3d/glsl_shader.c | 45 +++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 53 ---------------------------------------- 2 files changed, 39 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8159fd..3ce8188 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -53,9 +53,42 @@ typedef struct { DWORD coord_mask; } glsl_sample_function_t; +/* GLSL shader private data */ +struct shader_glsl_priv { + struct hash_table_t *glsl_program_lookup; + struct glsl_shader_prog_link *glsl_program; + GLhandleARB depth_blt_glsl_program_id; +}; + +/* Struct to maintain data about a linked GLSL program */ +struct glsl_shader_prog_link { + struct list vshader_entry; + struct list pshader_entry; + GLhandleARB programId; + GLhandleARB *vuniformF_locations; + GLhandleARB *puniformF_locations; + GLhandleARB vuniformI_locations[MAX_CONST_I]; + GLhandleARB puniformI_locations[MAX_CONST_I]; + GLhandleARB posFixup_location; + GLhandleARB bumpenvmat_location[MAX_TEXTURES]; + GLhandleARB luminancescale_location[MAX_TEXTURES]; + GLhandleARB luminanceoffset_location[MAX_TEXTURES]; + GLhandleARB srgb_comparison_location; + GLhandleARB srgb_mul_low_location; + GLhandleARB ycorrection_location; + GLenum vertex_color_clamp; + GLhandleARB vshader; + GLhandleARB pshader; +}; + +typedef struct { + GLhandleARB vshader; + GLhandleARB pshader; +} glsl_program_key_t; + + /** Prints the GLSL info log which will contain error messages if they exist */ -void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { - +static void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { int infologLength = 0; char *infoLog; int i; @@ -364,7 +397,7 @@ static void shader_glsl_load_constantsB( /** * Loads the app-supplied constants into the currently set GLSL program. */ -void shader_glsl_load_constants( +static void shader_glsl_load_constants( IWineD3DDevice* device, char usePixelShader, char useVertexShader) { @@ -497,7 +530,7 @@ void shader_glsl_load_constants( } /** Generate the variable & register declarations for the GLSL output target */ -void shader_generate_glsl_declarations( +static void shader_generate_glsl_declarations( IWineD3DBaseShader *iface, shader_reg_maps* reg_maps, SHADER_BUFFER* buffer, @@ -2762,7 +2795,7 @@ void pshader_glsl_dp2add(SHADER_OPCODE_ARG* arg) { } } -void pshader_glsl_input_pack( +static void pshader_glsl_input_pack( SHADER_BUFFER* buffer, semantic* semantics_in, IWineD3DPixelShader *iface) { @@ -2838,7 +2871,7 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_p return (struct glsl_shader_prog_link *)hash_table_get(priv->glsl_program_lookup, &key); } -void delete_glsl_program_entry(struct shader_glsl_priv *priv, WineD3D_GL_Info *gl_info, struct glsl_shader_prog_link *entry) { +static void delete_glsl_program_entry(struct shader_glsl_priv *priv, WineD3D_GL_Info *gl_info, struct glsl_shader_prog_link *entry) { glsl_program_key_t *key; key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f009bcd..6bb7e50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -255,13 +255,6 @@ extern const shader_backend_t glsl_shader_backend; extern const shader_backend_t arb_program_shader_backend; extern const shader_backend_t none_shader_backend; -/* GLSL shader private data */ -struct shader_glsl_priv { - struct hash_table_t *glsl_program_lookup; - struct glsl_shader_prog_link *glsl_program; - GLhandleARB depth_blt_glsl_program_id; -}; - /* ARB_program_shader private data */ struct shader_arb_priv { GLuint current_vprogram_id; @@ -1893,34 +1886,6 @@ unsigned int count_bits(unsigned int mask); typedef void (*SHADER_HANDLER) (struct SHADER_OPCODE_ARG*); -/* Struct to maintain a list of GLSL shader programs and their associated pixel and - * vertex shaders. A list of this type is maintained on the DeviceImpl, and is only - * used if the user is using GLSL shaders. */ -struct glsl_shader_prog_link { - struct list vshader_entry; - struct list pshader_entry; - GLhandleARB programId; - GLhandleARB *vuniformF_locations; - GLhandleARB *puniformF_locations; - GLhandleARB vuniformI_locations[MAX_CONST_I]; - GLhandleARB puniformI_locations[MAX_CONST_I]; - GLhandleARB posFixup_location; - GLhandleARB bumpenvmat_location[MAX_TEXTURES]; - GLhandleARB luminancescale_location[MAX_TEXTURES]; - GLhandleARB luminanceoffset_location[MAX_TEXTURES]; - GLhandleARB srgb_comparison_location; - GLhandleARB srgb_mul_low_location; - GLhandleARB ycorrection_location; - GLenum vertex_color_clamp; - GLhandleARB vshader; - GLhandleARB pshader; -}; - -typedef struct { - GLhandleARB vshader; - GLhandleARB pshader; -} glsl_program_key_t; - /* TODO: Make this dynamic, based on shader limits ? */ #define MAX_REG_ADDR 1 #define MAX_REG_TEMP 32 @@ -2103,10 +2068,6 @@ extern void vshader_hw_rsq_rcp(SHADER_OPCODE_ARG* arg); /* GLSL helper functions */ extern void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG *arg); -extern void shader_glsl_load_constants( - IWineD3DDevice* device, - char usePixelShader, - char useVertexShader); /** The following translate DirectX pixel/vertex shader opcodes to GLSL lines */ extern void shader_glsl_cross(SHADER_OPCODE_ARG* arg); @@ -2165,10 +2126,6 @@ extern void pshader_glsl_texreg2ar(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texreg2gb(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texreg2rgb(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_dp2add(SHADER_OPCODE_ARG* arg); -extern void pshader_glsl_input_pack( - SHADER_BUFFER* buffer, - semantic* semantics_out, - IWineD3DPixelShader *iface); /***************************************************************************** * IDirect3DBaseShader implementation structure @@ -2236,12 +2193,6 @@ extern HRESULT shader_get_registers_used( CONST DWORD* pToken, IWineD3DStateBlockImpl *stateBlock); -extern void shader_generate_glsl_declarations( - IWineD3DBaseShader *iface, - shader_reg_maps* reg_maps, - SHADER_BUFFER* buffer, - WineD3D_GL_Info* gl_info); - extern void shader_generate_arb_declarations( IWineD3DBaseShader *iface, shader_reg_maps* reg_maps, @@ -2277,10 +2228,6 @@ extern int shader_skip_unrecognized( IWineD3DBaseShader* iface, const DWORD* pToken); -extern void print_glsl_info_log( - WineD3D_GL_Info *gl_info, - GLhandleARB obj); - static inline int shader_get_regtype(const DWORD param) { return (((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2));

1 0

Alexandre Julliard : user32: Implemented UpdateLayeredWindow and UpdateLayeredWindowIndirect.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: e4cba25ac74f00ced35de284835ca646d3dd47db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cba25ac74f00ced35de2848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 16:30:19 2008 +0200 user32: Implemented UpdateLayeredWindow and UpdateLayeredWindowIndirect. --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 81 ++++++++++++++++++++++++++++++++++++++++++----- include/winuser.h | 6 +++ 3 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1c3b538..c9da8ae 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -727,6 +727,7 @@ # @ stub UnregisterMessagePumpHook # @ stub UnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) +@ stdcall UpdateLayeredWindowIndirect(long ptr) @ stub UpdatePerUserSystemParameters @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e1421af..ddea523 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3368,6 +3368,66 @@ BOOL WINAPI GetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, D return ret; } + +/***************************************************************************** + * UpdateLayeredWindowIndirect (USER32.@) + */ +BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info ) +{ + BYTE alpha = 0xff; + + if (!(info->dwFlags & ULW_EX_NORESIZE) && (info->pptDst || info->psize)) + { + int x = 0, y = 0, cx = 0, cy = 0; + DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSENDCHANGING; + + if (info->pptDst) + { + x = info->pptDst->x; + y = info->pptDst->y; + flags &= ~SWP_NOMOVE; + } + if (info->psize) + { + cx = info->psize->cx; + cy = info->psize->cy; + flags &= ~SWP_NOSIZE; + } + TRACE( "moving window %p pos %d,%d %dx%x\n", hwnd, x, y, cx, cy ); + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + } + + if (info->hdcSrc) + { + RECT rect; + HDC hdc = GetDCEx( hwnd, 0, DCX_CACHE ); + + if (hdc) + { + int x = 0, y = 0; + + GetClientRect( hwnd, &rect ); + if (info->pptSrc) + { + x = info->pptSrc->x; + y = info->pptSrc->y; + } + /* FIXME: intersect rect with info->prcDirty */ + TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); + BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, + info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); + ReleaseDC( hwnd, hdc ); + } + } + + if (info->pblend && !(info->dwFlags & ULW_OPAQUE)) alpha = info->pblend->SourceConstantAlpha; + TRACE( "setting window %p alpha %u\n", hwnd, alpha ); + USER_Driver->pSetLayeredWindowAttributes( hwnd, info->crKey, alpha, + info->dwFlags & (LWA_ALPHA | LWA_COLORKEY) ); + return TRUE; +} + + /***************************************************************************** * UpdateLayeredWindow (USER32.@) */ @@ -3375,14 +3435,19 @@ BOOL WINAPI UpdateLayeredWindow( HWND hwnd, HDC hdcDst, POINT *pptDst, SIZE *psi HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, DWORD dwFlags) { - static int once; - if (!once) - { - once = 1; - FIXME("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%d): stub!\n", - hwnd, hdcDst, pptDst, psize, hdcSrc, pptSrc, crKey, pblend, dwFlags); - } - return 0; + UPDATELAYEREDWINDOWINFO info; + + info.cbSize = sizeof(info); + info.hdcDst = hdcDst; + info.pptDst = pptDst; + info.psize = psize; + info.hdcSrc = hdcSrc; + info.pptSrc = pptSrc; + info.crKey = crKey; + info.pblend = pblend; + info.dwFlags = dwFlags; + info.prcDirty = NULL; + return UpdateLayeredWindowIndirect( hwnd, &info ); } /* 64bit versions */ diff --git a/include/winuser.h b/include/winuser.h index c569f31..40bf20a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3300,6 +3300,12 @@ typedef struct { #define LWA_COLORKEY 0x00000001 #define LWA_ALPHA 0x00000002 +/* UpdateLayeredWindow() flags */ +#define ULW_COLORKEY 0x00000001 +#define ULW_ALPHA 0x00000002 +#define ULW_OPAQUE 0x00000004 +#define ULW_EX_NORESIZE 0x00000008 + /* ShowWindow() codes */ #define SW_HIDE 0 #define SW_SHOWNORMAL 1

1 0

Alexandre Julliard : user32: Don' t reinitialize the window placement even if the window rect is empty.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: aef7723c3eef066e4703f2e88188070dbf5cceb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef7723c3eef066e4703f2e88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 16:29:26 2008 +0200 user32: Don't reinitialize the window placement even if the window rect is empty. --- dlls/user32/win.c | 3 +++ dlls/user32/winpos.c | 47 ++++++++++++++++------------------------------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3a7f5db..e1421af 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1072,6 +1072,9 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags wndPtr->hSysMenu = 0; wndPtr->flags |= (flags & WIN_ISWIN32); + wndPtr->min_pos.x = wndPtr->min_pos.y = -1; + wndPtr->max_pos.x = wndPtr->max_pos.y = -1; + if (wndPtr->dwStyle & WS_SYSMENU) SetSystemMenu( hwnd, 0 ); /* diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 21e1554..cbe844a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -582,36 +582,6 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, return SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); } -/*********************************************************************** - * WINPOS_InitPlacement - */ -static void WINPOS_InitPlacement( WND* wnd ) -{ - if (IsRectEmpty( &wnd->normal_rect )) - { - /* this happens when the window is minimized/maximized - * for the first time (rectWindow is not adjusted yet) */ - - wnd->normal_rect = wnd->rectWindow; - wnd->min_pos.x = wnd->min_pos.y = -1; - wnd->max_pos.x = wnd->max_pos.y = -1; - } - - if( wnd->dwStyle & WS_MINIMIZE ) - { - wnd->min_pos.x = wnd->rectWindow.left; - wnd->min_pos.y = wnd->rectWindow.top; - } - else if( wnd->dwStyle & WS_MAXIMIZE ) - { - wnd->max_pos.x = wnd->rectWindow.left; - wnd->max_pos.y = wnd->rectWindow.top; - } - else - { - wnd->normal_rect = wnd->rectWindow; - } -} /*********************************************************************** * WINPOS_RedrawIconTitle @@ -1201,7 +1171,22 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) return FALSE; } - WINPOS_InitPlacement( pWnd ); + /* update the placement according to the current style */ + if (pWnd->dwStyle & WS_MINIMIZE) + { + pWnd->min_pos.x = pWnd->rectWindow.left; + pWnd->min_pos.y = pWnd->rectWindow.top; + } + else if (pWnd->dwStyle & WS_MAXIMIZE) + { + pWnd->max_pos.x = pWnd->rectWindow.left; + pWnd->max_pos.y = pWnd->rectWindow.top; + } + else + { + pWnd->normal_rect = pWnd->rectWindow; + } + wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) wndpl->showCmd = SW_SHOWMINIMIZED;

1 0

Alexandre Julliard : user32/tests: Fix a number of message test failures on various Windows versions.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 01584fb31866a710c068e427a4b7eb3dd2a0dc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01584fb31866a710c068e427a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 16:27:47 2008 +0200 user32/tests: Fix a number of message test failures on various Windows versions. --- dlls/user32/tests/msg.c | 81 +++++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01584fb31866a710c068e…

1 0