wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Ge van Geldorp : mshtml/tests: Fix tests on Windows.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: af5ce0d24956be1c6026189a75749fe685303bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5ce0d24956be1c6026189a7… Author: Ge van Geldorp <ge(a)gse.nl> Date: Wed Apr 1 12:31:18 2009 +0200 mshtml/tests: Fix tests on Windows. --- dlls/mshtml/tests/htmldoc.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 642087d..45fc00c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -103,6 +103,7 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); DEFINE_EXPECT(Exec_ShellDocView_37); DEFINE_EXPECT(Exec_ShellDocView_84); DEFINE_EXPECT(Exec_ShellDocView_103); +DEFINE_EXPECT(Exec_ShellDocView_105); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); @@ -149,7 +150,7 @@ static BOOL expect_LockContainer_fLock; static BOOL expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; -static BOOL readystate_set_loading = FALSE, load_from_stream; +static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; static int stream_read, protocol_read; static enum load_state_t { @@ -648,9 +649,15 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D switch(dispID) { case DISPID_READYSTATE: CHECK_EXPECT2(OnChanged_READYSTATE); - test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED - | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) - ? OLECMDF_ENABLED : 0)); + + if(readystate_set_interactive) { + readystate_set_interactive = FALSE; + load_state = LD_INTERACTIVE; + } + else + test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED + | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) + ? OLECMDF_ENABLED : 0)); if(readystate_set_loading) { readystate_set_loading = FALSE; @@ -663,7 +670,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D CHECK_EXPECT(OnChanged_1005); if(!editmode) test_readyState(NULL); - load_state = LD_INTERACTIVE; + readystate_set_interactive = (load_state != LD_INTERACTIVE); return S_OK; } @@ -2138,6 +2145,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID break; case 1: CHECK_EXPECT(Exec_SETDOWNLOADSTATE_1); + readystate_set_interactive = (load_state != LD_INTERACTIVE); break; default: ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); @@ -2206,6 +2214,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 105: + CHECK_EXPECT2(Exec_ShellDocView_105); + + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); + + return E_NOTIMPL; + default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2750,6 +2766,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(Exec_SETPROGRESSPOS); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Exec_ShellDocView_103); + SET_EXPECT(Exec_ShellDocView_105); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); SET_EXPECT(SetStatusText); @@ -2802,6 +2819,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) CHECK_CALLED(Exec_SETPROGRESSPOS); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); SET_CALLED(Exec_ShellDocView_103); + SET_CALLED(Exec_ShellDocView_105); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText);

1 0

Alexandre Julliard : libwine: Export __wine_get_main_environment on Mac OS to make sure it' s reevaluated when used.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 8edf353bd2b03994357f7e3e1191a8c8ff71c12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edf353bd2b03994357f7e3e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 14:36:49 2009 +0200 libwine: Export __wine_get_main_environment on Mac OS to make sure it's reevaluated when used. --- dlls/kernel32/process.c | 11 +++++++++-- include/wine/library.h | 1 - libs/wine/loader.c | 14 +++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f2d8567..0dd7f67 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -56,6 +56,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); +#ifdef __APPLE__ +extern char **__wine_get_main_environment(void); +#define environ __wine_get_main_environment() +#else +extern char **environ; +#endif + typedef struct { LPSTR lpEnvAddress; @@ -267,7 +274,7 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE * * Build the Win32 environment from the Unix environment */ -static BOOL build_initial_environment( char **environ ) +static BOOL build_initial_environment(void) { SIZE_T size = 1; char **e; @@ -989,7 +996,7 @@ void CDECL __wine_kernel_init(void) if (!params->Environment) { /* Copy the parent environment */ - if (!build_initial_environment( __wine_main_environ )) exit(1); + if (!build_initial_environment()) exit(1); /* convert old configuration to new format */ convert_old_config(); diff --git a/include/wine/library.h b/include/wine/library.h index 1102390..474cfb2 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -65,7 +65,6 @@ extern int wine_dll_get_owner( const char *name, char *buffer, int size, int *fi extern int __wine_main_argc; extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; -extern char **__wine_main_environ; extern void __wine_dll_register( const IMAGE_NT_HEADERS *header, const char *filename ); extern void wine_init( int argc, char *argv[], char *error, int error_size ); diff --git a/libs/wine/loader.c b/libs/wine/loader.c index b7dd8b3..d10a6e0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -441,6 +441,18 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) /*********************************************************************** + * __wine_get_main_environment + * + * Return an environment pointer to work around lack of environ variable. + * Only exported on Mac OS. + */ +char **__wine_get_main_environment(void) +{ + return environ; +} + + +/*********************************************************************** * __wine_dll_register * * Register a built-in DLL descriptor. @@ -638,7 +650,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) build_dll_path(); __wine_main_argc = argc; __wine_main_argv = argv; - __wine_main_environ = environ; + __wine_main_environ = __wine_get_main_environment(); mmap_init(); for (path = first_dll_path( "ntdll.dll", 0, &context ); path; path = next_dll_path( &context ))

1 0

Henri Verbeet : wined3d: Use a more reasonable name for "SHADER_OPCODE_ARG" .
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: c3a01b315ee165181cb51a7e461e0b200993c151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a01b315ee165181cb51a7e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:01 2009 +0200 wined3d: Use a more reasonable name for "SHADER_OPCODE_ARG". --- dlls/wined3d/arb_program_shader.c | 452 ++++++++++---------- dlls/wined3d/baseshader.c | 28 +- dlls/wined3d/glsl_shader.c | 857 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 8 +- 4 files changed, 688 insertions(+), 657 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3a01b315ee165181cb51…

1 0

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: de4e8cf0f9770a24cfcf0ba9170f212daadd2de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4e8cf0f9770a24cfcf0ba91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:01 2009 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/wined3d_private.h | 144 ++++++++++++++++++++-------------------- 1 files changed, 73 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abd37e9..779df72 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -295,7 +295,20 @@ typedef struct wined3d_settings_s { extern wined3d_settings_t wined3d_settings; /* Shader backends */ -struct SHADER_OPCODE_ARG; + +/* TODO: Make this dynamic, based on shader limits ? */ +#define MAX_ATTRIBS 16 +#define MAX_REG_ADDR 1 +#define MAX_REG_TEMP 32 +#define MAX_REG_TEXCRD 8 +#define MAX_REG_INPUT 12 +#define MAX_REG_OUTPUT 12 +#define MAX_CONST_I 16 +#define MAX_CONST_B 16 + +/* FIXME: This needs to go up to 2048 for + * Shader model 3 according to msdn (and for software shaders) */ +#define MAX_LABELS 16 #define SHADER_PGMSIZE 65535 typedef struct SHADER_BUFFER { @@ -393,6 +406,65 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TABLE_SIZE }; +typedef struct semantic +{ + DWORD usage; + DWORD reg; +} semantic; + +typedef struct shader_reg_maps +{ + DWORD shader_version; + char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ + char temporary[MAX_REG_TEMP]; /* pixel, vertex */ + char address[MAX_REG_ADDR]; /* vertex */ + char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ + char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ + char attributes[MAX_ATTRIBS]; /* vertex */ + char labels[MAX_LABELS]; /* pixel, vertex */ + DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ + + /* Sampler usage tokens + * Use 0 as default (bit 31 is always 1 on a valid token) */ + DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; + char usesnrm, vpos, usesdsy; + char usesrelconstF; + + /* Whether or not loops are used in this shader, and nesting depth */ + unsigned loop_depth; + + /* Whether or not this shader uses fog */ + char fog; + +} shader_reg_maps; + +typedef struct SHADER_OPCODE +{ + unsigned int opcode; + const char *name; + char dst_token; + CONST UINT num_params; + enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; + DWORD min_version; + DWORD max_version; +} SHADER_OPCODE; + +typedef struct SHADER_OPCODE_ARG +{ + IWineD3DBaseShader *shader; + const shader_reg_maps *reg_maps; + CONST SHADER_OPCODE *opcode; + DWORD flags; + BOOL coissue; + DWORD dst; + DWORD dst_addr; + DWORD predicate; + DWORD src[4]; + DWORD src_addr[4]; + SHADER_BUFFER *buffer; +} SHADER_OPCODE_ARG; + typedef void (*SHADER_HANDLER)(const struct SHADER_OPCODE_ARG *); struct shader_caps { @@ -457,8 +529,6 @@ struct ps_compile_args { in D3D10 (unconditional NP2 support mandatory). */ }; -#define MAX_ATTRIBS 16 - enum fog_src_type { VS_FOG_Z = 0, VS_FOG_COORD = 1 @@ -2166,56 +2236,12 @@ BOOL getDepthStencilBits(const struct GlPixelFormatDesc *format_desc, short *dep void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); UINT wined3d_log2i(UINT32 x); -/* TODO: Make this dynamic, based on shader limits ? */ -#define MAX_REG_ADDR 1 -#define MAX_REG_TEMP 32 -#define MAX_REG_TEXCRD 8 -#define MAX_REG_INPUT 12 -#define MAX_REG_OUTPUT 12 -#define MAX_CONST_I 16 -#define MAX_CONST_B 16 - -/* FIXME: This needs to go up to 2048 for - * Shader model 3 according to msdn (and for software shaders) */ -#define MAX_LABELS 16 - -typedef struct semantic { - DWORD usage; - DWORD reg; -} semantic; - typedef struct local_constant { struct list entry; unsigned int idx; DWORD value[4]; } local_constant; -typedef struct shader_reg_maps { - DWORD shader_version; - char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ - char temporary[MAX_REG_TEMP]; /* pixel, vertex */ - char address[MAX_REG_ADDR]; /* vertex */ - char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ - char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ - char attributes[MAX_ATTRIBS]; /* vertex */ - char labels[MAX_LABELS]; /* pixel, vertex */ - DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - - /* Sampler usage tokens - * Use 0 as default (bit 31 is always 1 on a valid token) */ - DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; - BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy; - char usesrelconstF; - - /* Whether or not loops are used in this shader, and nesting depth */ - unsigned loop_depth; - - /* Whether or not this shader uses fog */ - char fog; - -} shader_reg_maps; - /* Undocumented opcode controls */ #define INST_CONTROLS_SHIFT 16 #define INST_CONTROLS_MASK 0x00ff0000 @@ -2229,30 +2255,6 @@ typedef enum COMPARISON_TYPE { COMPARISON_LE = 6 } COMPARISON_TYPE; -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - char dst_token; - CONST UINT num_params; - enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; - -typedef struct SHADER_OPCODE_ARG { - IWineD3DBaseShader* shader; - const shader_reg_maps *reg_maps; - CONST SHADER_OPCODE* opcode; - DWORD flags; - BOOL coissue; - DWORD dst; - DWORD dst_addr; - DWORD predicate; - DWORD src[4]; - DWORD src_addr[4]; - SHADER_BUFFER* buffer; -} SHADER_OPCODE_ARG; - typedef struct SHADER_LIMITS { unsigned int temporary; unsigned int texcoord;

1 0

Henri Verbeet : wined3d: Don' t use the opcode_token field in the ARB backend.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: e44335585e2b058d5b1c8ffdba10682142bbde24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44335585e2b058d5b1c8ffdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 wined3d: Don't use the opcode_token field in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 10 +++------- dlls/wined3d/baseshader.c | 18 ++++++++++-------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1bebb21..ca0671d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -827,7 +827,7 @@ static void pshader_hw_cnd(const SHADER_OPCODE_ARG *arg) pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[2], 2, src_name[2]); /* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */ - if (arg->reg_maps->shader_version <= WINED3DPS_VERSION(1, 3) && arg->opcode_token & WINED3DSI_COISSUE) + if (arg->reg_maps->shader_version <= WINED3DPS_VERSION(1, 3) && arg->coissue) { shader_addline(buffer, "MOV%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1]); } else { @@ -1139,12 +1139,8 @@ static void pshader_hw_tex(const SHADER_OPCODE_ARG *arg) projected = TRUE; } } else { - if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { - projected = TRUE; - } - if(arg->opcode_token & WINED3DSI_TEXLD_BIAS) { - bias = TRUE; - } + if (arg->flags & WINED3DSI_TEXLD_PROJECT) projected = TRUE; + if (arg->flags & WINED3DSI_TEXLD_BIAS) bias = TRUE; } shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, projected, bias); } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a547949..65b2709 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -785,6 +785,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, while (WINED3DPS_END() != *pToken) { + DWORD opcode_token; + /* Skip version token */ if (shader_is_version_token(*pToken)) { @@ -801,13 +803,13 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } /* Read opcode */ - hw_arg.opcode_token = *pToken++; - curOpcode = shader_get_opcode(opcode_table, shader_version, hw_arg.opcode_token); + opcode_token = *pToken++; + curOpcode = shader_get_opcode(opcode_table, shader_version, opcode_token); /* Unknown opcode and its parameters */ if (!curOpcode) { - FIXME("Unrecognized opcode: token=0x%08x\n", hw_arg.opcode_token); + FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); pToken += shader_skip_unrecognized(pToken, shader_version); continue; } @@ -821,7 +823,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, || WINED3DSIO_PHASE == curOpcode->opcode || WINED3DSIO_RET == curOpcode->opcode) { - pToken += shader_skip_opcode(curOpcode, hw_arg.opcode_token, shader_version); + pToken += shader_skip_opcode(curOpcode, opcode_token, shader_version); continue; } @@ -832,14 +834,14 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, if (!hw_fct) { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); - pToken += shader_skip_opcode(curOpcode, hw_arg.opcode_token, shader_version); + pToken += shader_skip_opcode(curOpcode, opcode_token, shader_version); continue; } hw_arg.opcode = curOpcode; - hw_arg.flags = hw_arg.opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; - hw_arg.coissue = hw_arg.opcode_token & WINED3DSI_COISSUE; + hw_arg.flags = opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; + hw_arg.coissue = opcode_token & WINED3DSI_COISSUE; /* Destination token */ if (curOpcode->dst_token) @@ -851,7 +853,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } /* Predication token */ - if (hw_arg.opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) hw_arg.predicate = *pToken++; + if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) hw_arg.predicate = *pToken++; /* Other source tokens */ for (i = 0; i < (curOpcode->num_params - curOpcode->dst_token); ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6323250..abd37e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2243,7 +2243,6 @@ typedef struct SHADER_OPCODE_ARG { IWineD3DBaseShader* shader; const shader_reg_maps *reg_maps; CONST SHADER_OPCODE* opcode; - DWORD opcode_token; DWORD flags; BOOL coissue; DWORD dst;

1 0

Henri Verbeet : wined3d: Don' t use the opcode_token field in the GLSL backend.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: ec43489e10bde40af70a9bd7ad474b2d6dd26ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec43489e10bde40af70a9bd7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 wined3d: Don't use the opcode_token field in the GLSL backend. The idea is that we want to prevent backends from parsing the tokens themselves, which is pretty much a requirement for adding SM4 support. --- dlls/wined3d/baseshader.c | 3 +++ dlls/wined3d/glsl_shader.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ dlls/wined3d/wined3d_private_types.h | 3 +++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 34ab181..a547949 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -838,6 +838,9 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, hw_arg.opcode = curOpcode; + hw_arg.flags = hw_arg.opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; + hw_arg.coissue = hw_arg.opcode_token & WINED3DSI_COISSUE; + /* Destination token */ if (curOpcode->dst_token) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c92f99b..9cdab01 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1314,10 +1314,9 @@ void shader_glsl_add_instruction_modifiers(const SHADER_OPCODE_ARG* arg) } } -static inline const char* shader_get_comp_op( - const DWORD opcode) { - - DWORD op = (opcode & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; +static inline const char *shader_get_comp_op(DWORD flags) +{ + DWORD op = (flags & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; switch (op) { case COMPARISON_GT: return ">"; case COMPARISON_EQ: return "=="; @@ -1972,7 +1971,8 @@ static void shader_glsl_cnd(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); /* Fun: The D3DSI_COISSUE flag changes the semantic of the cnd instruction for < 1.4 shaders */ - if(arg->opcode_token & WINED3DSI_COISSUE) { + if (arg->coissue) + { shader_addline(arg->buffer, "%s /* COISSUE! */);\n", src1_param.param_str); } else { shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n", @@ -2304,7 +2304,7 @@ static void shader_glsl_ifc(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(arg->buffer, "if (%s %s %s) {\n", - src0_param.param_str, shader_get_comp_op(arg->opcode_token), src1_param.param_str); + src0_param.param_str, shader_get_comp_op(arg->flags), src1_param.param_str); } static void shader_glsl_else(const SHADER_OPCODE_ARG *arg) @@ -2327,7 +2327,7 @@ static void shader_glsl_breakc(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(arg->buffer, "if (%s %s %s) break;\n", - src0_param.param_str, shader_get_comp_op(arg->opcode_token), src1_param.param_str); + src0_param.param_str, shader_get_comp_op(arg->flags), src1_param.param_str); } static void shader_glsl_label(const SHADER_OPCODE_ARG *arg) @@ -2401,7 +2401,8 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) mask = WINED3DSP_WRITEMASK_3; } } else { - if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { + if (arg->flags & WINED3DSI_TEXLD_PROJECT) + { /* ps 2.0 texldp instruction always divides by the fourth component. */ sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; mask = WINED3DSP_WRITEMASK_3; @@ -2430,7 +2431,8 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) } else { glsl_src_param_t coord_param; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], mask, &coord_param); - if(arg->opcode_token & WINED3DSI_TEXLD_BIAS) { + if (arg->flags & WINED3DSI_TEXLD_BIAS) + { glsl_src_param_t bias; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, &bias); shader_glsl_gen_sample_code(arg, sampler_idx, &sample_function, swizzle, bias.param_str, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8907b0f..6323250 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2244,6 +2244,8 @@ typedef struct SHADER_OPCODE_ARG { const shader_reg_maps *reg_maps; CONST SHADER_OPCODE* opcode; DWORD opcode_token; + DWORD flags; + BOOL coissue; DWORD dst; DWORD dst_addr; DWORD predicate; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index e5b4c3d..2d9ae03 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -279,6 +279,9 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { /** opcode-related masks **/ +#define WINED3D_OPCODESPECIFICCONTROL_MASK 0x00ff0000 +#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 + #define WINED3DSI_OPCODE_MASK 0x0000FFFF #define WINED3DSI_INSTLENGTH_MASK 0x0F000000 #define WINED3DSI_INSTLENGTH_SHIFT 24

1 0

Henri Verbeet : ddraw: Filter invalid texture stage states passed by the application.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 4194d8040f458116ec1b0e91766646471acc5523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4194d8040f458116ec1b0e917… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 ddraw: Filter invalid texture stage states passed by the application. --- dlls/ddraw/device.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 35f3d36..517e7bf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4776,6 +4776,13 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, if(!State) return DDERR_INVALIDPARAMS; + if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) + { + WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); + *State = 0; + return DD_OK; + } + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) @@ -4896,6 +4903,12 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, HRESULT hr; TRACE("(%p)->(%08x,%08x,%08x): Relay!\n", This, Stage, TexStageStateType, State); + if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) + { + WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); + return DD_OK; + } + EnterCriticalSection(&ddraw_cs); if (l->sampler_state)

1 0

Jacek Caban : urlmon.idl: Use HANDLE_PTR in IInternetProtocolRoot:: Start declaration.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 19067f12566fccaf540e9e7a06f461dbda0cf0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19067f12566fccaf540e9e7a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 03:42:37 2009 +0200 urlmon.idl: Use HANDLE_PTR in IInternetProtocolRoot::Start declaration. --- dlls/itss/protocol.c | 4 ++-- dlls/mshtml/protocol.c | 8 ++++---- dlls/mshtml/tests/htmldoc.c | 4 ++-- dlls/urlmon/bindprot.c | 4 ++-- dlls/urlmon/file.c | 4 ++-- dlls/urlmon/ftp.c | 4 ++-- dlls/urlmon/gopher.c | 4 ++-- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/mk.c | 4 ++-- dlls/urlmon/tests/protocol.c | 4 ++-- dlls/urlmon/tests/url.c | 4 ++-- include/urlmon.idl | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19067f12566fccaf540e9…

1 0

Jacek Caban : basetsd.h: Added HANDLE_PTR and SHANDLE_PTR typedefs.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 1b3f6474c83881f16be479a90ac493777b855fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3f6474c83881f16be479a90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 03:41:55 2009 +0200 basetsd.h: Added HANDLE_PTR and SHANDLE_PTR typedefs. --- include/basetsd.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 409f958..e106e24 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -116,6 +116,8 @@ typedef unsigned __int64 DWORD_PTR, *PDWORD_PTR; #define MININT_PTR 0x8000000000000000 #define MAXUINT_PTR 0xffffffffffffffff +typedef __int64 SHANDLE_PTR; +typedef unsigned __int64 HANDLE_PTR; typedef int HALF_PTR, *PHALF_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR; @@ -209,6 +211,8 @@ typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; #define MININT_PTR 0x80000000 #define MAXUINT_PTR 0xffffffff +typedef long SHANDLE_PTR; +typedef unsigned long HANDLE_PTR; typedef signed short HALF_PTR, *PHALF_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR;

1 0

Christian Costa : mciqtz32: Implement MCI_SEEK.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 2a9b26862fb3b799c028792fb2a75533769a03d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9b26862fb3b799c028792fb… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 31 21:38:02 2009 +0200 mciqtz32: Implement MCI_SEEK. --- dlls/mciqtz32/mciqtz.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index ea3a9f7..507956c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -26,6 +26,7 @@ #include "wine/debug.h" #include "mciqtz_private.h" #include "digitalv.h" +#include "wownt32.h" WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); @@ -253,6 +254,61 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms } /*************************************************************************** + * MCIQTZ_mciSeek [internal] + */ +static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + IMediaPosition* pmpos; + LONGLONG newpos; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_SEEK_TO_START) { + newpos = 0; + } else if (dwFlags & MCI_SEEK_TO_END) { + FIXME("MCI_SEEK_TO_END not implemented yet\n"); + return MCIERR_INTERNAL; + } else if (dwFlags & MCI_TO) { + FIXME("MCI_TO not implemented yet\n"); + return MCIERR_INTERNAL; + } else { + WARN("dwFlag doesn't tell where to seek to...\n"); + return MCIERR_MISSING_PARAMETER; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); + if (FAILED(hr)) { + FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IMediaPosition_put_CurrentPosition(pmpos, newpos); + if (FAILED(hr)) { + FIXME("Cannot set position (hr = %x)\n", hr); + IMediaPosition_Release(pmpos); + return MCIERR_INTERNAL; + } + + IMediaPosition_Release(pmpos); + + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciStop [internal] */ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) @@ -314,6 +370,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_OPEN_DRIVER: return MCIQTZ_mciOpen (dwDevID, dwParam1, (LPMCI_DGV_OPEN_PARMSW) dwParam2); case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); + case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_RECORD: case MCI_STOP: case MCI_SET: @@ -322,7 +379,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_STATUS: case MCI_GETDEVCAPS: case MCI_INFO: - case MCI_SEEK: case MCI_PUT: case MCI_WINDOW: case MCI_LOAD:

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009