April 2009 - Wine-commits - list.winehq.org

Rein Klazes : msvcrt/tests: Add some tests for strtok().
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: b12c46be4a763b5efc865f5e01b89940d8c56caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12c46be4a763b5efc865f5e0… Author: Rein Klazes <wijn(a)online.nl> Date: Wed Apr 22 07:04:20 2009 +0200 msvcrt/tests: Add some tests for strtok(). --- dlls/msvcrt/tests/string.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 45c40d5..3286e91 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -619,6 +619,50 @@ static void test_mbcjisjms(void) } while(jisjms[i++][0] != 0); } +static const struct { + const char* string; + const char* delimiter; + int exp_offsetret1; /* returned offset from string after first call to strtok() + -1 means NULL */ + int exp_offsetret2; /* returned offset from string after second call to strtok() + -1 means NULL */ + int exp_offsetret3; /* returned offset from string after third call to strtok() + -1 means NULL */ +} testcases_strtok[] = { + { "red cabernet", " ", 0, 4, -1 }, + { "sparkling white riesling", " ", 0, 10, 16 }, + { " pale cream sherry", "e ", 1, 6, 9 }, + /* end mark */ + { 0} +}; + +static void test_strtok(void) +{ + int i; + char *strret; + char teststr[100]; + for( i = 0; testcases_strtok[i].string; i++){ + strcpy( teststr, testcases_strtok[i].string); + strret = strtok( teststr, testcases_strtok[i].delimiter); + ok( (int)(strret - teststr) == testcases_strtok[i].exp_offsetret1 || + (!strret && testcases_strtok[i].exp_offsetret1 == -1), + "string (%p) \'%s\' return %p\n", + teststr, testcases_strtok[i].string, strret); + if( !strret) continue; + strret = strtok( NULL, testcases_strtok[i].delimiter); + ok( (int)(strret - teststr) == testcases_strtok[i].exp_offsetret2 || + (!strret && testcases_strtok[i].exp_offsetret2 == -1), + "second call string (%p) \'%s\' return %p\n", + teststr, testcases_strtok[i].string, strret); + if( !strret) continue; + strret = strtok( NULL, testcases_strtok[i].delimiter); + ok( (int)(strret - teststr) == testcases_strtok[i].exp_offsetret3 || + (!strret && testcases_strtok[i].exp_offsetret3 == -1), + "third call string (%p) \'%s\' return %p\n", + teststr, testcases_strtok[i].string, strret); + } +} + START_TEST(string) { char mem[100]; @@ -660,6 +704,6 @@ START_TEST(string) test_strcat_s(); test__mbsnbcpy_s(); test_mbcjisjms(); - + test_strtok(); test_wcscpy_s(); }

1 0

Marcus Meissner : amstream/tests: Handle directdraw not being created ( Coverity 920).
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 870bb4e6de4168c99c695f84859b9dfe17ba7eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870bb4e6de4168c99c695f848… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 22 10:22:05 2009 +0200 amstream/tests: Handle directdraw not being created (Coverity 920). --- dlls/amstream/tests/amstream.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 4d5d8f2..f59bc06 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -52,6 +52,8 @@ static int create_directdraw(void) hr = DirectDrawCreate(NULL, &pdd, NULL); ok(hr==DD_OK, "DirectDrawCreate returned: %x\n", hr); + if (hr != DD_OK) + goto error; hr = IDirectDraw_QueryInterface(pdd, &IID_IDirectDraw7, (LPVOID*)&pdd7); ok(hr==DD_OK, "QueryInterface returned: %x\n", hr);

1 0

Michael Stefaniuc : user32/tests: Don't use the long type.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 69680296eec5cecab5c430622dd1387c85676304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69680296eec5cecab5c430622… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 22 10:25:30 2009 +0200 user32/tests: Don't use the long type. --- dlls/user32/tests/edit.c | 4 ++-- dlls/user32/tests/input.c | 2 +- dlls/user32/tests/msg.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b1a9820..ecc50ab 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -646,8 +646,8 @@ static void set_client_height(HWND Wnd, unsigned Height) GetClientRect(Wnd, &ClientRect); ok(ClientRect.bottom - ClientRect.top == Height, - "The client height should be %ld, but is %ld\n", - (long)Height, (long)(ClientRect.bottom - ClientRect.top)); + "The client height should be %d, but is %d\n", + Height, ClientRect.bottom - ClientRect.top); } static void test_edit_control_1(void) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4f3bd56..0a92f26 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -58,7 +58,7 @@ /* globals */ static HWND hWndTest; -static long timetag = 0x10000000; +static LONG timetag = 0x10000000; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7ea47e7..f698b7f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3220,7 +3220,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -3270,7 +3270,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -6897,8 +6897,8 @@ done: static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; - static long beginpaint_counter = 0; + static LONG defwndproc_counter = 0; + static LONG beginpaint_counter = 0; LRESULT ret; struct recvd_message msg; @@ -7034,7 +7034,7 @@ static LRESULT WINAPI MsgCheckProcW(HWND hwnd, UINT message, WPARAM wParam, LPAR static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -7073,8 +7073,8 @@ static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; - static long beginpaint_counter = 0; + static LONG defwndproc_counter = 0; + static LONG beginpaint_counter = 0; LRESULT ret; struct recvd_message msg; @@ -7141,7 +7141,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -7175,7 +7175,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; @@ -11024,7 +11024,7 @@ static LRESULT (WINAPI *listbox_orig_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg;

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_arb_get_swizzle().
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 7a3d4ce76f34c5b8f9da3f8f831e29633df1b108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3d4ce76f34c5b8f9da3f8f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 10:48:33 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_arb_get_swizzle(). --- dlls/wined3d/arb_program_shader.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6648c61..3ce6953 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -427,7 +427,8 @@ static void shader_arb_get_write_mask(const struct wined3d_shader_instruction *i *ptr = '\0'; } -static void shader_arb_get_swizzle(const DWORD param, BOOL fixup, char *swizzle_str) { +static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, BOOL fixup, char *swizzle_str) +{ /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", * but addressed as "rgba". To fix this we need to swap the register's x * and z components. */ @@ -435,7 +436,7 @@ static void shader_arb_get_swizzle(const DWORD param, BOOL fixup, char *swizzle_ char *ptr = swizzle_str; /* swizzle bits fields: wwzzyyxx */ - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + DWORD swizzle = param->swizzle >> WINED3DSP_SWIZZLE_SHIFT; DWORD swizzle_x = swizzle & 0x03; DWORD swizzle_y = (swizzle >> 2) & 0x03; DWORD swizzle_z = (swizzle >> 4) & 0x03; @@ -564,7 +565,7 @@ static void shader_arb_add_src_param(const struct wined3d_shader_instruction *in wined3d_src->register_idx, !!wined3d_src->rel_addr, register_name, &is_color); strcat(str, register_name); - shader_arb_get_swizzle(wined3d_src->token, is_color, swizzle); + shader_arb_get_swizzle(wined3d_src, is_color, swizzle); strcat(str, swizzle); } @@ -730,7 +731,7 @@ static void pshader_gen_input_modifier_line(IWineD3DBaseShader *iface, SHADER_BU /* Get register name */ shader_arb_get_register_name(iface, src->register_type, src->register_idx, !!src->rel_addr, regstr, &is_color); - shader_arb_get_swizzle(src->token, is_color, swzstr); + shader_arb_get_swizzle(src, is_color, swzstr); switch (src->modifiers) {

1 0

Henri Verbeet : wined3d: Get rid of the token field from struct wined3d_shader_src_param.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 629801bccbab2758a8971c6f45455455e202b160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629801bccbab2758a8971c6f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 10:48:33 2009 +0200 wined3d: Get rid of the token field from struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 2 -- dlls/wined3d/baseshader.c | 1 - dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3ce6953..5a77f44 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1078,7 +1078,6 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) struct wined3d_shader_src_param tmp_src = ins->src[0]; tmp_src.swizzle = ((ins->src[0].swizzle >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); - tmp_src.token = (tmp_src.token & ~WINED3DSP_SWIZZLE_MASK) | tmp_src.swizzle; shader_arb_add_src_param(ins, &tmp_src, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } @@ -1627,7 +1626,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_hw_map2gl(&tmp_ins); ++tmp_src[1].register_idx; - ++tmp_src[1].token; } } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 05cbe9e..ceb2473 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -248,7 +248,6 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->swizzle = param & WINED3DSP_SWIZZLE_MASK; src->modifiers = param & WINED3DSP_SRCMOD_MASK; src->rel_addr = rel_addr; - src->token = param; } /* Note that this does not count the loop register diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 823097d..e5affd2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2122,7 +2122,6 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_glsl_dot(&tmp_ins); ++tmp_src[1].register_idx; - ++tmp_src[1].token; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7bf220..758193e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -468,7 +468,6 @@ struct wined3d_shader_src_param DWORD swizzle; DWORD modifiers; const struct wined3d_shader_src_param *rel_addr; - DWORD token; }; struct wined3d_shader_instruction

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVS_* swizzle constants.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: baf2f94b761e0fadeb63e1e79c8ac9684b1fa688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf2f94b761e0fadeb63e1e79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 10:48:34 2009 +0200 wined3d: Get rid of the WINED3DVS_* swizzle constants. They're redundant. --- dlls/wined3d/baseshader.c | 3 ++- dlls/wined3d/glsl_shader.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private_types.h | 24 ------------------------ 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ceb2473..5145a41 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -789,7 +789,8 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp * swizzle bits fields: * RRGGBBAA */ - if ((WINED3DVS_NOSWIZZLE >> WINED3DVS_SWIZZLE_SHIFT) != swizzle) { + if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle) + { if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5affd2..da30432 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2472,7 +2472,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(sampler_type, sample_flags, &sample_function); mask |= sample_function.coord_mask; - if (shader_version < WINED3DPS_VERSION(2,0)) swizzle = WINED3DVS_NOSWIZZLE; + if (shader_version < WINED3DPS_VERSION(2,0)) swizzle = WINED3DSP_NOSWIZZLE; else swizzle = ins->src[1].swizzle; /* 1.0-1.3: Use destination register as coordinate source. @@ -2602,17 +2602,17 @@ static void pshader_glsl_texdp3tex(const struct wined3d_shader_instruction *ins) switch(mask_size) { case 1: - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "dot(gl_TexCoord[%u].xyz, %s)", sampler_idx, src0_param.param_str); break; case 2: - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "vec2(dot(gl_TexCoord[%u].xyz, %s), 0.0)", sampler_idx, src0_param.param_str); break; case 3: - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "vec3(dot(gl_TexCoord[%u].xyz, %s), 0.0, 0.0)", sampler_idx, src0_param.param_str); break; @@ -2722,7 +2722,7 @@ static void pshader_glsl_texm3x2tex(const struct wined3d_shader_instruction *ins shader_glsl_get_sample_function(sampler_type, 0, &sample_function); /* Sample the texture using the calculated coordinates */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DVS_NOSWIZZLE, NULL, "tmp0.xy"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "tmp0.xy"); } /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL @@ -2744,7 +2744,7 @@ static void pshader_glsl_texm3x3tex(const struct wined3d_shader_instruction *ins shader_glsl_get_sample_function(sampler_type, 0, &sample_function); /* Sample the texture using the calculated coordinates */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DVS_NOSWIZZLE, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "tmp0.xyz"); current_state->current_row = 0; } @@ -2795,7 +2795,7 @@ static void pshader_glsl_texm3x3spec(const struct wined3d_shader_instruction *in shader_glsl_get_sample_function(stype, 0, &sample_function); /* Sample the texture */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DVS_NOSWIZZLE, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "tmp0.xyz"); current_state->current_row = 0; } @@ -2827,7 +2827,7 @@ static void pshader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *i shader_glsl_get_sample_function(sampler_type, 0, &sample_function); /* Sample the texture using the calculated coordinates */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DVS_NOSWIZZLE, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "tmp0.xyz"); current_state->current_row = 0; } @@ -2877,7 +2877,7 @@ static void pshader_glsl_texbem(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &coord_param); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "T%u%s + vec4(bumpenvmat%d * %s, 0.0, 0.0)%s", sampler_idx, coord_mask, sampler_idx, coord_param.param_str, coord_mask); @@ -2920,7 +2920,7 @@ static void pshader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); shader_glsl_get_sample_function(sampler_type, 0, &sample_function); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "%s.wx", src0_param.reg_name); } @@ -2936,7 +2936,7 @@ static void pshader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); shader_glsl_get_sample_function(sampler_type, 0, &sample_function); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "%s.yz", src0_param.reg_name); } @@ -2953,7 +2953,7 @@ static void pshader_glsl_texreg2rgb(const struct wined3d_shader_instruction *ins shader_glsl_get_sample_function(sampler_type, 0, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &src0_param); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DVS_NOSWIZZLE, NULL, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, "%s", src0_param.param_str); } diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 2d9ae03..42ed6c9 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -98,33 +98,9 @@ typedef enum _WINED3DVS_RASTOUT_OFFSETS { } WINED3DVS_RASTOUT_OFFSETS; /** Source register modifiers **/ -#define WINED3DVS_SWIZZLE_SHIFT 16 -#define WINED3DVS_SWIZZLE_MASK (0xFF << WINED3DVS_SWIZZLE_SHIFT) #define WINED3DSP_SWIZZLE_SHIFT 16 #define WINED3DSP_SWIZZLE_MASK (0xFF << WINED3DSP_SWIZZLE_SHIFT) -#define WINED3DVS_X_X (0 << WINED3DVS_SWIZZLE_SHIFT) -#define WINED3DVS_X_Y (1 << WINED3DVS_SWIZZLE_SHIFT) -#define WINED3DVS_X_Z (2 << WINED3DVS_SWIZZLE_SHIFT) -#define WINED3DVS_X_W (3 << WINED3DVS_SWIZZLE_SHIFT) - -#define WINED3DVS_Y_X (0 << (WINED3DVS_SWIZZLE_SHIFT + 2)) -#define WINED3DVS_Y_Y (1 << (WINED3DVS_SWIZZLE_SHIFT + 2)) -#define WINED3DVS_Y_Z (2 << (WINED3DVS_SWIZZLE_SHIFT + 2)) -#define WINED3DVS_Y_W (3 << (WINED3DVS_SWIZZLE_SHIFT + 2)) - -#define WINED3DVS_Z_X (0 << (WINED3DVS_SWIZZLE_SHIFT + 4)) -#define WINED3DVS_Z_Y (1 << (WINED3DVS_SWIZZLE_SHIFT + 4)) -#define WINED3DVS_Z_Z (2 << (WINED3DVS_SWIZZLE_SHIFT + 4)) -#define WINED3DVS_Z_W (3 << (WINED3DVS_SWIZZLE_SHIFT + 4)) - -#define WINED3DVS_W_X (0 << (WINED3DVS_SWIZZLE_SHIFT + 6)) -#define WINED3DVS_W_Y (1 << (WINED3DVS_SWIZZLE_SHIFT + 6)) -#define WINED3DVS_W_Z (2 << (WINED3DVS_SWIZZLE_SHIFT + 6)) -#define WINED3DVS_W_W (3 << (WINED3DVS_SWIZZLE_SHIFT + 6)) - -#define WINED3DVS_NOSWIZZLE (WINED3DVS_X_X | WINED3DVS_Y_Y | WINED3DVS_Z_Z | WINED3DVS_W_W) - #define WINED3DSP_NOSWIZZLE \ ((0 << (WINED3DSP_SWIZZLE_SHIFT + 0)) | (1 << (WINED3DSP_SWIZZLE_SHIFT + 2)) | \ (2 << (WINED3DSP_SWIZZLE_SHIFT + 4)) | (3 << (WINED3DSP_SWIZZLE_SHIFT + 6)))

1 0

Henri Verbeet : wined3d: Handle the swizzle shift in the frontend rather than the backend.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: fec1fa93cf3ed240781f2479f641f1731777db96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec1fa93cf3ed240781f2479f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 10:48:34 2009 +0200 wined3d: Handle the swizzle shift in the frontend rather than the backend. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/baseshader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 13 ++++++------- dlls/wined3d/wined3d_private_types.h | 4 +--- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5a77f44..9b56958 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -436,7 +436,7 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, char *ptr = swizzle_str; /* swizzle bits fields: wwzzyyxx */ - DWORD swizzle = param->swizzle >> WINED3DSP_SWIZZLE_SHIFT; + DWORD swizzle = param->swizzle; DWORD swizzle_x = swizzle & 0x03; DWORD swizzle_y = (swizzle >> 2) & 0x03; DWORD swizzle_z = (swizzle >> 4) & 0x03; @@ -444,7 +444,8 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to * generate a swizzle string. Unless we need to our own swizzling. */ - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { + if (swizzle != WINED3DSP_NOSWIZZLE || fixup) + { *ptr++ = '.'; if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { *ptr++ = swizzle_chars[swizzle_x]; @@ -1076,8 +1077,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * with more than one component. Thus replicate the first source argument over all * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ struct wined3d_shader_src_param tmp_src = ins->src[0]; - tmp_src.swizzle = ((ins->src[0].swizzle >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) - * (0x55 << WINED3DSP_SWIZZLE_SHIFT); + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_add_src_param(ins, &tmp_src, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5145a41..d3e0e1e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -147,7 +147,7 @@ static int shader_get_param(const DWORD *pToken, DWORD shader_version, DWORD *pa *addr_token = (1 << 31) | ((WINED3DSPR_ADDR << WINED3DSP_REGTYPE_SHIFT2) & WINED3DSP_REGTYPE_MASK2) | ((WINED3DSPR_ADDR << WINED3DSP_REGTYPE_SHIFT) & WINED3DSP_REGTYPE_MASK) - | WINED3DSP_NOSWIZZLE; + | (WINED3DSP_NOSWIZZLE << WINED3DSP_SWIZZLE_SHIFT); } else { @@ -245,7 +245,7 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->register_idx = param & WINED3DSP_REGNUM_MASK; - src->swizzle = param & WINED3DSP_SWIZZLE_MASK; + src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; src->modifiers = param & WINED3DSP_SRCMOD_MASK; src->rel_addr = rel_addr; } @@ -789,7 +789,7 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp * swizzle bits fields: * RRGGBBAA */ - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle) + if (swizzle != WINED3DSP_NOSWIZZLE) { if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da30432..dcb0763 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1246,14 +1246,13 @@ static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD ma * but addressed as "rgba". To fix this we need to swap the register's x * and z components. */ const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; - DWORD s = swizzle >> WINED3DSP_SWIZZLE_SHIFT; *str++ = '.'; /* swizzle bits fields: wwzzyyxx */ - if (mask & WINED3DSP_WRITEMASK_0) *str++ = swizzle_chars[s & 0x03]; - if (mask & WINED3DSP_WRITEMASK_1) *str++ = swizzle_chars[(s >> 2) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_2) *str++ = swizzle_chars[(s >> 4) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_3) *str++ = swizzle_chars[(s >> 6) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_0) *str++ = swizzle_chars[swizzle & 0x03]; + if (mask & WINED3DSP_WRITEMASK_1) *str++ = swizzle_chars[(swizzle >> 2) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_2) *str++ = swizzle_chars[(swizzle >> 4) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_3) *str++ = swizzle_chars[(swizzle >> 6) & 0x03]; *str = '\0'; } @@ -1951,7 +1950,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { - if (((ins->src[0].swizzle >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) + if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; @@ -2033,7 +2032,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { - if (((ins->src[0].swizzle >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) + if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 42ed6c9..751cc43 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -101,9 +101,7 @@ typedef enum _WINED3DVS_RASTOUT_OFFSETS { #define WINED3DSP_SWIZZLE_SHIFT 16 #define WINED3DSP_SWIZZLE_MASK (0xFF << WINED3DSP_SWIZZLE_SHIFT) -#define WINED3DSP_NOSWIZZLE \ - ((0 << (WINED3DSP_SWIZZLE_SHIFT + 0)) | (1 << (WINED3DSP_SWIZZLE_SHIFT + 2)) | \ - (2 << (WINED3DSP_SWIZZLE_SHIFT + 4)) | (3 << (WINED3DSP_SWIZZLE_SHIFT + 6))) +#define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) #define WINED3DSP_SRCMOD_SHIFT 24 #define WINED3DSP_SRCMOD_MASK (0xF << WINED3DSP_SRCMOD_SHIFT)

1 0

Henri Verbeet : wined3d: Handle the source modifier shift in the frontend rather than the backend.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: cf1bfc8c685277e2673a6e9231e4d7ebc14eba13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1bfc8c685277e2673a6e923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 10:48:34 2009 +0200 wined3d: Handle the source modifier shift in the frontend rather than the backend. --- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/wined3d_private_types.h | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d3e0e1e..31fffc5 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -246,7 +246,7 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->register_idx = param & WINED3DSP_REGNUM_MASK; src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - src->modifiers = param & WINED3DSP_SRCMOD_MASK; + src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; src->rel_addr = rel_addr; } @@ -781,7 +781,7 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp case WINED3DSPSM_ABSNEG: TRACE(")"); break; case WINED3DSPSM_ABS: TRACE(")"); break; default: - TRACE("_unknown_modifier(%#x)", modifier >> WINED3DSP_SRCMOD_SHIFT); + TRACE("_unknown_modifier(%#x)", modifier); } } diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 751cc43..8a52e39 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -107,20 +107,20 @@ typedef enum _WINED3DVS_RASTOUT_OFFSETS { #define WINED3DSP_SRCMOD_MASK (0xF << WINED3DSP_SRCMOD_SHIFT) typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { - WINED3DSPSM_NONE = 0 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_NEG = 1 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_BIAS = 2 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_BIASNEG = 3 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_SIGN = 4 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_SIGNNEG = 5 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_COMP = 6 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_X2 = 7 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_X2NEG = 8 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_DZ = 9 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_DW = 10 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_ABS = 11 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_ABSNEG = 12 << WINED3DSP_SRCMOD_SHIFT, - WINED3DSPSM_NOT = 13 << WINED3DSP_SRCMOD_SHIFT, + WINED3DSPSM_NONE = 0, + WINED3DSPSM_NEG = 1, + WINED3DSPSM_BIAS = 2, + WINED3DSPSM_BIASNEG = 3, + WINED3DSPSM_SIGN = 4, + WINED3DSPSM_SIGNNEG = 5, + WINED3DSPSM_COMP = 6, + WINED3DSPSM_X2 = 7, + WINED3DSPSM_X2NEG = 8, + WINED3DSPSM_DZ = 9, + WINED3DSPSM_DW = 10, + WINED3DSPSM_ABS = 11, + WINED3DSPSM_ABSNEG = 12, + WINED3DSPSM_NOT = 13, WINED3DSPSM_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_SRCMOD_TYPE;

1 0

Christian Costa : d3dxof: Accept longer string size.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 8dc455bc6388688eb317659896330d1529019d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc455bc6388688eb31765989… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 21 23:31:14 2009 +0200 d3dxof: Accept longer string size. --- dlls/d3dxof/parsing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1205e48..4a0ecaa 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -467,7 +467,7 @@ static BOOL is_integer(parse_buffer* buf) static BOOL is_string(parse_buffer* buf) { - char tmp[32]; + char tmp[100]; DWORD pos = 0; char c; BOOL ok = 0; @@ -475,7 +475,7 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 31)) + while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 99)) { if (c == '"') {

1 0

Christian Costa : mciqtz32: Remove all remaining tabs.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: ca0503d3e1223cbaaa56823819fb96d86bdb173b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0503d3e1223cbaaa5682381… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 21 23:32:09 2009 +0200 mciqtz32: Remove all remaining tabs. --- dlls/mciqtz32/mciqtz.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 0719c91..63b80f5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -34,21 +34,21 @@ static DWORD MCIQTZ_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); /*======================================================================* - * MCI QTZ implementation * + * MCI QTZ implementation * *======================================================================*/ HINSTANCE MCIQTZ_hInstance = 0; /*********************************************************************** - * DllMain (MCIQTZ.0) + * DllMain (MCIQTZ.0) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - MCIQTZ_hInstance = hInstDLL; - break; + MCIQTZ_hInstance = hInstDLL; + break; } return TRUE; } @@ -415,11 +415,11 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS } /*======================================================================* - * MCI QTZ entry points * + * MCI QTZ entry points * *======================================================================*/ /************************************************************************** - * DriverProc (MCIQTZ.@) + * DriverProc (MCIQTZ.@) */ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2)

1 0