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

Nikolay Sivov : user32: Implemented GetWindowRgnBox with some tests.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: a2b7aafdaea0fde68cfdee6650eff44a28b3b5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b7aafdaea0fde68cfdee665… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 2 03:53:00 2009 -0400 user32: Implemented GetWindowRgnBox with some tests. --- dlls/user32/tests/win.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 20 ++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 89eefcd..4aa3674 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -51,6 +51,7 @@ static BOOL (WINAPI *pGetLayeredWindowAttributes)(HWND,COLORREF*,BYTE*,DWORD*); static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -5529,6 +5530,48 @@ static void test_handles( HWND full_hwnd ) #endif } +static void test_winregion(void) +{ + HWND hwnd; + RECT r; + int ret; + HRGN hrgn; + + if (!pGetWindowRgnBox) + { + win_skip("GetWindowRgnBox not supported\n"); + return; + } + + hwnd = CreateWindowExA(0, "static", NULL, WS_VISIBLE, 10, 10, 10, 10, NULL, 0, 0, NULL); + /* NULL prect */ + SetLastError(0xdeadbeef); + ret = pGetWindowRgnBox(hwnd, NULL); + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); + + hrgn = CreateRectRgn(2, 3, 10, 15); + ok( hrgn != NULL, "Region creation failed\n"); + if (hrgn) + { + SetWindowRgn(hwnd, hrgn, FALSE); + + SetLastError(0xdeadbeef); + ret = pGetWindowRgnBox(hwnd, NULL); + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); + + r.left = r.top = r.right = r.bottom = 0; + ret = pGetWindowRgnBox(hwnd, &r); + ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); + ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, + "Expected (2,3,10,15), got (%d,%d,%d,%d)\n", r.left, r.top, + r.right, r.bottom); + DeleteObject(hrgn); + } + DestroyWindow(hwnd); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -5539,6 +5582,7 @@ START_TEST(win) pSetLayeredWindowAttributes = (void *)GetProcAddress( user32, "SetLayeredWindowAttributes" ); pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); + pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); if (!RegisterWindowClasses()) assert(0); @@ -5608,6 +5652,7 @@ START_TEST(win) test_SetForegroundWindow(hwndMain); test_shell_window(); test_handles( hwndMain ); + test_winregion(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d55717..8efdf0a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -385,7 +385,7 @@ @ stdcall GetWindowPlacement(long ptr) @ stdcall GetWindowRect(long ptr) @ stdcall GetWindowRgn(long long) -# @ stub GetWindowRgnBox +@ stdcall GetWindowRgnBox(long ptr) @ stdcall GetWindowTextA(long ptr long) @ stdcall GetWindowTextLengthA(long) @ stdcall GetWindowTextLengthW(long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 42904d9..7f18da5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -155,6 +155,26 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) return nRet; } +/*********************************************************************** + * GetWindowRgnBox (USER32.@) + */ +int WINAPI GetWindowRgnBox( HWND hwnd, LPRECT prect ) +{ + int ret = ERROR; + HRGN hrgn; + + if (!prect) + return ERROR; + + if ((hrgn = CreateRectRgn(0, 0, 0, 0))) + { + if ((ret = GetWindowRgn( hwnd, hrgn )) != ERROR ) + ret = GetRgnBox( hrgn, prect ); + DeleteObject(hrgn); + } + + return ret; +} /*********************************************************************** * SetWindowRgn (USER32.@)

1 0

Nikolay Sivov : comctl32: Enable selection overwriting in IP Address control.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 4902dd9801a2e6068dec3b6aee44ceb0564a7135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4902dd9801a2e6068dec3b6ae… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 1 17:43:08 2009 -0400 comctl32: Enable selection overwriting in IP Address control. --- dlls/comctl32/ipaddress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index e5631a2..a90f6e9 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -508,7 +508,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return return_val; } else if (len == 3 && startsel==endsel && endsel==len) IPADDRESS_GotoNextField (infoPtr, index, POS_SELALL); - else if (len < 3) break; + else if (len < 3 || startsel != endsel) break; } else if(c == '.' || c == ' ') { if(len && startsel==endsel && startsel != 0) { IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL);

1 0

Henri Verbeet : wined3d: Remove some code that doesn' t make a whole lot of sense.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: c697bdc3a15e8dad13c4cd58d52ce6891bc3e999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c697bdc3a15e8dad13c4cd58d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:40:59 2009 +0200 wined3d: Remove some code that doesn't make a whole lot of sense. The "instr" parameter to shader_glsl_gen_modifier() is actually a source parameter, so comparing against WINED3DSIO_TEXKILL is just silly. --- dlls/wined3d/glsl_shader.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae9aa7f..7b7a7b3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -941,9 +941,6 @@ static void shader_glsl_gen_modifier ( char *out_str) { out_str[0] = 0; - - if (instr == WINED3DSIO_TEXKILL) - return; switch (instr & WINED3DSP_SRCMOD_MASK) { case WINED3DSPSM_DZ: /* Need to handle this in the instructions itself (texld & texcrd). */

1 0

Henri Verbeet : wined3d: Compare num_params against 1 in shader_glsl_map2gl ().
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: fb6547a3e121fe0b0511526247d6ebb538ffc19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6547a3e121fe0b051152624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Compare num_params against 1 in shader_glsl_map2gl(). num_params includes the destination parameter, while we're only interested in source parameters. This doesn't cause problems for any of the instrctions currently handled by shader_glsl_map2gl() though, since they all happen to have at least 1 source parameter. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7b7a7b3..9953764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1740,7 +1740,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(", instruction); - if (curOpcode->num_params > 0) { + if (curOpcode->num_params > 1) + { shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param); shader_addline(buffer, "%s", src_param.param_str); for (i = 2; i < curOpcode->num_params; ++i) {

1 0

Henri Verbeet : wined3d: Store the instruction handler index in struct wined3d_shader_instruction.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 44648b2b91fb01b2b2b1ab0140ce4a67c77913ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=44648b2b91fb01b2b2b1ab014… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Store the instruction handler index in struct wined3d_shader_instruction. This allows us to avoid comparing against WINED3DSIO_*, which is specific to the bytecode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 42 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44648b2b91fb01b2b2b1a…

1 0

Henri Verbeet : wined3d: Avoid comparing against WINED3DSIO_* in the ARB shader backend.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: d633b6d47e03b43b64317301fc21de251daa7958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d633b6d47e03b43b64317301f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Avoid comparing against WINED3DSIO_* in the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 111 ++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4eee164..bf0c114 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -907,33 +907,33 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) char arguments[256]; unsigned int i; - switch (curOpcode->opcode) + switch (ins->handler_idx) { - case WINED3DSIO_ABS: instruction = "ABS"; break; - case WINED3DSIO_ADD: instruction = "ADD"; break; - case WINED3DSIO_CRS: instruction = "XPD"; break; - case WINED3DSIO_DP3: instruction = "DP3"; break; - case WINED3DSIO_DP4: instruction = "DP4"; break; - case WINED3DSIO_DST: instruction = "DST"; break; - case WINED3DSIO_EXP: instruction = "EX2"; break; - case WINED3DSIO_EXPP: instruction = "EXP"; break; - case WINED3DSIO_FRC: instruction = "FRC"; break; - case WINED3DSIO_LIT: instruction = "LIT"; break; - case WINED3DSIO_LOG: instruction = "LG2"; break; - case WINED3DSIO_LOGP: instruction = "LOG"; break; - case WINED3DSIO_LRP: instruction = "LRP"; break; - case WINED3DSIO_MAD: instruction = "MAD"; break; - case WINED3DSIO_MAX: instruction = "MAX"; break; - case WINED3DSIO_MIN: instruction = "MIN"; break; - case WINED3DSIO_MOV: instruction = "MOV"; break; - case WINED3DSIO_MUL: instruction = "MUL"; break; - case WINED3DSIO_NOP: instruction = "NOP"; break; - case WINED3DSIO_POW: instruction = "POW"; break; - case WINED3DSIO_SGE: instruction = "SGE"; break; - case WINED3DSIO_SLT: instruction = "SLT"; break; - case WINED3DSIO_SUB: instruction = "SUB"; break; + case WINED3DSIH_ABS: instruction = "ABS"; break; + case WINED3DSIH_ADD: instruction = "ADD"; break; + case WINED3DSIH_CRS: instruction = "XPD"; break; + case WINED3DSIH_DP3: instruction = "DP3"; break; + case WINED3DSIH_DP4: instruction = "DP4"; break; + case WINED3DSIH_DST: instruction = "DST"; break; + case WINED3DSIH_EXP: instruction = "EX2"; break; + case WINED3DSIH_EXPP: instruction = "EXP"; break; + case WINED3DSIH_FRC: instruction = "FRC"; break; + case WINED3DSIH_LIT: instruction = "LIT"; break; + case WINED3DSIH_LOG: instruction = "LG2"; break; + case WINED3DSIH_LOGP: instruction = "LOG"; break; + case WINED3DSIH_LRP: instruction = "LRP"; break; + case WINED3DSIH_MAD: instruction = "MAD"; break; + case WINED3DSIH_MAX: instruction = "MAX"; break; + case WINED3DSIH_MIN: instruction = "MIN"; break; + case WINED3DSIH_MOV: instruction = "MOV"; break; + case WINED3DSIH_MUL: instruction = "MUL"; break; + case WINED3DSIH_NOP: instruction = "NOP"; break; + case WINED3DSIH_POW: instruction = "POW"; break; + case WINED3DSIH_SGE: instruction = "SGE"; break; + case WINED3DSIH_SLT: instruction = "SLT"; break; + case WINED3DSIH_SUB: instruction = "SUB"; break; default: instruction = ""; - FIXME("Unhandled opcode %s\n", curOpcode->name); + FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; } @@ -1018,12 +1018,12 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if ((WINED3DSHADER_VERSION_MAJOR(ins->reg_maps->shader_version) == 1 && !shader_is_pshader_version(ins->reg_maps->shader_version) && shader_get_regtype(ins->dst) == WINED3DSPR_ADDR) - || ins->opcode->opcode == WINED3DSIO_MOVA) + || ins->handler_idx == WINED3DSIH_MOVA) { SHADER_BUFFER *buffer = ins->buffer; char src0_param[256]; - if (ins->opcode->opcode == WINED3DSIO_MOVA) + if (ins->handler_idx == WINED3DSIH_MOVA) FIXME("mova should round\n"); src0_param[0] = '\0'; @@ -1271,7 +1271,7 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, reg_dest_code, reg_coord, "TMP", FALSE, FALSE); - if (ins->opcode->opcode == WINED3DSIO_TEXBEML && has_luminance) + if (ins->handler_idx == WINED3DSIH_TEXBEML && has_luminance) { shader_addline(buffer, "MAD TMP, T%u.z, luminance%d.x, luminance%d.y;\n", src, reg_dest_code, reg_dest_code); @@ -1554,30 +1554,30 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) tmp_ins.src_addr[1] = ins->src_addr[1]; tmp_ins.reg_maps = ins->reg_maps; - switch(ins->opcode->opcode) + switch(ins->handler_idx) { - case WINED3DSIO_M4x4: - nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); - break; - case WINED3DSIO_M4x3: - nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); - break; - case WINED3DSIO_M3x4: - nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); - break; - case WINED3DSIO_M3x3: - nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); - break; - case WINED3DSIO_M3x2: - nComponents = 2; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); - break; - default: - break; + case WINED3DSIH_M4x4: + nComponents = 4; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + break; + case WINED3DSIH_M4x3: + nComponents = 3; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + break; + case WINED3DSIH_M3x4: + nComponents = 4; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + break; + case WINED3DSIH_M3x3: + nComponents = 3; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + break; + case WINED3DSIH_M3x2: + nComponents = 2; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + break; + default: + break; } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; @@ -1590,7 +1590,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { - CONST SHADER_OPCODE *curOpcode = ins->opcode; SHADER_BUFFER *buffer = ins->buffer; DWORD dst = ins->dst; DWORD src = ins->src[0]; @@ -1599,12 +1598,12 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) char tmpLine[256]; - switch(curOpcode->opcode) + switch(ins->handler_idx) { - case WINED3DSIO_RSQ: instruction = "RSQ"; break; - case WINED3DSIO_RCP: instruction = "RCP"; break; + case WINED3DSIH_RSQ: instruction = "RSQ"; break; + case WINED3DSIH_RCP: instruction = "RCP"; break; default: instruction = ""; - FIXME("Unhandled opcode %s\n", curOpcode->name); + FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; }

1 0

Henri Verbeet : wined3d: Store the source and destination parameter count in struct wined3d_shader_instruction .
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 7bde2792c2122704d7b89cbbe76c041461107fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bde2792c2122704d7b89cbbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Store the source and destination parameter count in struct wined3d_shader_instruction. --- dlls/wined3d/arb_program_shader.c | 2 ++ dlls/wined3d/baseshader.c | 6 ++++-- dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bf0c114..a30041e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1581,6 +1581,8 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; + tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; + tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; i++) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL)|(WINED3DSP_WRITEMASK_0<<i); tmp_ins.src[1] = ins->src[1]+i; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a8fe8c3..71c5420 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -845,7 +845,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, ins.coissue = opcode_token & WINED3DSI_COISSUE; /* Destination token */ - if (curOpcode->dst_token) + ins.dst_count = curOpcode->dst_token ? 1 : 0; + if (ins.dst_count) { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); @@ -857,7 +858,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) ins.predicate = *pToken++; /* Other source tokens */ - for (i = 0; i < (curOpcode->num_params - curOpcode->dst_token); ++i) + ins.src_count = curOpcode->num_params - curOpcode->dst_token; + for (i = 0; i < ins.src_count; ++i) { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 615b90e..72c07ea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1293,7 +1293,7 @@ void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instructi { DWORD mask = ins->dst & WINED3DSP_DSTMOD_MASK; - if (ins->opcode->dst_token && mask) + if (ins->dst_count && mask) { glsl_dst_param_t dst_param; @@ -1712,7 +1712,6 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { - CONST SHADER_OPCODE *curOpcode = ins->opcode; SHADER_BUFFER *buffer = ins->buffer; glsl_src_param_t src_param; const char *instruction; @@ -1741,12 +1740,13 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(", instruction); - if (curOpcode->num_params > 1) + if (ins->src_count) { shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param); shader_addline(buffer, "%s", src_param.param_str); - for (i = 2; i < curOpcode->num_params; ++i) { - shader_glsl_add_src_param(ins, ins->src[i-1], ins->src_addr[i-1], write_mask, &src_param); + for (i = 1; i < ins->src_count; ++i) + { + shader_glsl_add_src_param(ins, ins->src[i], ins->src_addr[i], write_mask, &src_param); shader_addline(buffer, ", %s", src_param.param_str); } } @@ -2076,6 +2076,8 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; + tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; + tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; ++i) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f557509..fe71327 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -464,6 +464,8 @@ struct wined3d_shader_instruction DWORD src[4]; DWORD src_addr[4]; SHADER_BUFFER *buffer; + UINT dst_count; + UINT src_count; }; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *);

1 0

Alexandre Julliard : winecrt0: Disable the delay import destructor on Mac OS, it cannot be made to work.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: b2d35c3620be73ca662e73fed49a280b405d1f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d35c3620be73ca662e73fed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:13:42 2009 +0200 winecrt0: Disable the delay import destructor on Mac OS, it cannot be made to work. --- dlls/winecrt0/delay_load.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 5926770..ac257ba 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -52,7 +52,7 @@ FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) return proc; } -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__APPLE__) /* we can't support destructors properly on Mac OS */ static void free_delay_imports(void) __attribute__((destructor)); static void free_delay_imports(void) {

1 0

Alexandre Julliard : shell32: Add implementation of WOWShellExecute.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: b1d96f6ffade16017a751f806b0c4345093458f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d96f6ffade16017a751f806… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:19:42 2009 +0200 shell32: Add implementation of WOWShellExecute. The callback is probably not fully compatible, but apps are not supposed to use that function anyway. --- dlls/shell32/shell.c | 32 +++++--------------------------- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlexec.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 67bdc01..db49c29 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -48,6 +48,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, + LPCSTR lpParameters,LPCSTR lpDirectory, + INT iShowCmd, void *callback); typedef struct { /* structure for dropped files */ WORD wSize; @@ -600,31 +603,6 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, LPCSTR lpFile, LPCSTR lpParameters, LPCSTR lpDirectory, INT16 iShowCmd ) { - SHELLEXECUTEINFOW seiW; - WCHAR *wVerb = NULL, *wFile = NULL, *wParameters = NULL, *wDirectory = NULL; - HANDLE hProcess = 0; - - seiW.lpVerb = lpOperation ? __SHCloneStrAtoW(&wVerb, lpOperation) : NULL; - seiW.lpFile = lpFile ? __SHCloneStrAtoW(&wFile, lpFile) : NULL; - seiW.lpParameters = lpParameters ? __SHCloneStrAtoW(&wParameters, lpParameters) : NULL; - seiW.lpDirectory = lpDirectory ? __SHCloneStrAtoW(&wDirectory, lpDirectory) : NULL; - - seiW.cbSize = sizeof(seiW); - seiW.fMask = 0; - seiW.hwnd = HWND_32(hWnd); - seiW.nShow = iShowCmd; - seiW.lpIDList = 0; - seiW.lpClass = 0; - seiW.hkeyClass = 0; - seiW.dwHotKey = 0; - seiW.hProcess = hProcess; - - SHELL_execute( &seiW, SHELL_Execute16 ); - - SHFree(wVerb); - SHFree(wFile); - SHFree(wParameters); - SHFree(wDirectory); - - return HINSTANCE_16(seiW.hInstApp); + return HINSTANCE_16( WOWShellExecute( HWND_32(hWnd), lpOperation, lpFile, lpParameters, + lpDirectory, iShowCmd, SHELL_Execute16 )); } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index b64d8ef..5713c49 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -438,4 +438,4 @@ @ stdcall StrStrIA(str str) shlwapi.StrStrIA @ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW @ stdcall StrStrW(wstr wstr) shlwapi.StrStrW -@ stub WOWShellExecute +@ stdcall WOWShellExecute(long str str str str long ptr) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 67815ca..3be5962 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1956,6 +1956,42 @@ HINSTANCE WINAPI ShellExecuteW(HWND hwnd, LPCWSTR lpOperation, LPCWSTR lpFile, } /************************************************************************* + * WOWShellExecute [SHELL32.@] + * + * FIXME: the callback function most likely doesn't work the same way on Windows. + */ +HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, + LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback) +{ + SHELLEXECUTEINFOW seiW; + WCHAR *wVerb = NULL, *wFile = NULL, *wParameters = NULL, *wDirectory = NULL; + HANDLE hProcess = 0; + + seiW.lpVerb = lpOperation ? __SHCloneStrAtoW(&wVerb, lpOperation) : NULL; + seiW.lpFile = lpFile ? __SHCloneStrAtoW(&wFile, lpFile) : NULL; + seiW.lpParameters = lpParameters ? __SHCloneStrAtoW(&wParameters, lpParameters) : NULL; + seiW.lpDirectory = lpDirectory ? __SHCloneStrAtoW(&wDirectory, lpDirectory) : NULL; + + seiW.cbSize = sizeof(seiW); + seiW.fMask = 0; + seiW.hwnd = hWnd; + seiW.nShow = iShowCmd; + seiW.lpIDList = 0; + seiW.lpClass = 0; + seiW.hkeyClass = 0; + seiW.dwHotKey = 0; + seiW.hProcess = hProcess; + + SHELL_execute( &seiW, callback ); + + SHFree(wVerb); + SHFree(wFile); + SHFree(wParameters); + SHFree(wDirectory); + return seiW.hInstApp; +} + +/************************************************************************* * OpenAs_RunDLLA [SHELL32.@] */ void WINAPI OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow)

1 0

Alexandre Julliard : shell32: Make shell. dll into a stand-alone 16-bit module.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 129ba5ade016a470150ce11ed8f6383bb1103772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129ba5ade016a470150ce11ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:20:13 2009 +0200 shell32: Make shell.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++++++++ configure.ac | 1 + dlls/Makefile.in | 4 --- dlls/shell.dll16/Makefile.in | 19 ++++++++++++++++++ dlls/{shell32 => shell.dll16}/shell.c | 10 +++++++- .../shell.spec => shell.dll16/shell.dll16.spec} | 0 .../version16.rc => shell.dll16/version.rc} | 0 dlls/shell32/Makefile.in | 12 ----------- dlls/shell32/shell32_main.h | 21 -------------------- dlls/shell32/shellreg.c | 1 - dlls/shell32/shlexec.c | 1 - 12 files changed, 37 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 8120c55..93ff5f2 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,6 @@ dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/setupx.dll16 dlls/shdocvw/shdocvw_v1.tlb -dlls/shell.dll16 dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/system.drv16 diff --git a/configure b/configure index b45a122..5468a78 100755 --- a/configure +++ b/configure @@ -26853,6 +26853,14 @@ dlls/shdocvw/tests/Makefile: dlls/shdocvw/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/shdocvw/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/shell.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shell.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/shell.dll16/Makefile: dlls/shell.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/shell.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shell32/Makefile" test "x$enable_shell32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ shell32" @@ -29204,6 +29212,7 @@ do "dlls/shdoclc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdoclc/Makefile" ;; "dlls/shdocvw/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdocvw/Makefile" ;; "dlls/shdocvw/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdocvw/tests/Makefile" ;; + "dlls/shell.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shell.dll16/Makefile" ;; "dlls/shell32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shell32/Makefile" ;; "dlls/shell32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shell32/tests/Makefile" ;; "dlls/shfolder/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shfolder/Makefile" ;; diff --git a/configure.ac b/configure.ac index a243045..e3d4b63 100644 --- a/configure.ac +++ b/configure.ac @@ -2188,6 +2188,7 @@ WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/shell.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index badffb6..498cb65 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -25,7 +25,6 @@ WIN16_FILES = \ mmsystem.dll16 \ msvideo.dll16 \ setupx.dll16 \ - shell.dll16 \ system.drv16 \ toolhelp.dll16 \ user.exe16 \ @@ -58,9 +57,6 @@ msvideo.dll16: setupx.dll16: echo "setupapi.dll" >$@ -shell.dll16: - echo "shell32.dll" >$@ - ddeml.dll16 user.exe16: echo "user32.dll" >$@ diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in new file mode 100644 index 0000000..07cf620 --- /dev/null +++ b/dlls/shell.dll16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = shell.dll16 +IMPORTS = shell32 user32 advapi32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,shell32.dll +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = shell.dll16.spec + +C_SRCS = shell.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/shell32/shell.c b/dlls/shell.dll16/shell.c similarity index 98% rename from dlls/shell32/shell.c rename to dlls/shell.dll16/shell.c index db49c29..9964b60 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell.dll16/shell.c @@ -42,7 +42,6 @@ #include "shlwapi.h" #include "wine/winbase16.h" -#include "shell32_main.h" #include "wine/debug.h" @@ -52,6 +51,11 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback); +#define HICON_16(h32) (LOWORD(h32)) +#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) +#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) +#define HINSTANCE_16(h32) (LOWORD(h32)) + typedef struct { /* structure for dropped files */ WORD wSize; POINT16 ptMousePos; @@ -170,7 +174,9 @@ HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory, */ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) -{ return (BOOL16)AboutDlgProc( HWND_32(hWnd), msg, wParam, lParam ); +{ + FIXME( "stub\n" ); + return FALSE; } diff --git a/dlls/shell32/shell.spec b/dlls/shell.dll16/shell.dll16.spec similarity index 100% rename from dlls/shell32/shell.spec rename to dlls/shell.dll16/shell.dll16.spec diff --git a/dlls/shell32/version16.rc b/dlls/shell.dll16/version.rc similarity index 100% rename from dlls/shell32/version16.rc rename to dlls/shell.dll16/version.rc diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index d416eec..6900d31 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -64,22 +64,10 @@ SVG_SRCS = \ mydocs.svg \ trash_file.svg -C_SRCS16 = shell.c -RC_SRCS16 = version16.rc -SPEC_SRCS16 = shell.spec - EXTRA_OBJS = authors.o @MAKE_DLL_RULES@ -# Special rules for 16-bit resource files - -version16.res: version16.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc - -shell.spec.o: shell.spec version16.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec - authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \ diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 973e526..eea2e18 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -35,7 +35,6 @@ #include "undocshell.h" #include "shlobj.h" #include "shellapi.h" -#include "wine/windef16.h" #include "wine/unicode.h" /******************************************* @@ -153,20 +152,6 @@ void FreeChangeNotifications(void); BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); -/* 16-bit functions */ -void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b); -UINT16 WINAPI DragQueryFile16(HDROP16 hDrop, WORD wFile, LPSTR lpszFile, WORD wLength); -void WINAPI DragFinish16(HDROP16 h); -BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p); -HINSTANCE16 WINAPI ShellExecute16(HWND16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT16); -HICON16 WINAPI ExtractIcon16(HINSTANCE16,LPCSTR,UINT16); -HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16,LPSTR,LPWORD); -HICON16 WINAPI ExtractIconEx16 ( LPCSTR, INT16, HICON16 *, HICON16 *, UINT16 ); -HINSTANCE16 WINAPI FindExecutable16(LPCSTR,LPCSTR,LPSTR); -HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD); -BOOL16 WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16); -BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM); - static inline BOOL SHELL_OsIsUnicode(void) { /* if high-bit of version is 0, we are emulating NT */ @@ -205,12 +190,6 @@ static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) return *target; } -/* handle conversions */ -#define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) -#define HINSTANCE_16(h32) (LOWORD(h32)) - typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index fe87e96..37f3d9e 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -33,7 +33,6 @@ #include "winreg.h" #include "undocshell.h" -#include "wine/winbase16.h" #include "wine/debug.h" diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 3be5962..201791f 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -42,7 +42,6 @@ #include "shlwapi.h" #include "ddeml.h" -#include "wine/winbase16.h" #include "shell32_main.h" #include "pidl.h" #include "shresdef.h"

1 0