March 2012 - Wine-Commits - list.winehq.org

Józef Kucia : wpp: Reset lexer state after unexpected end of file.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 1d9bb50230edd3c8cfdeb6c763aaaf5655d24aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9bb50230edd3c8cfdeb6c76… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sat Mar 10 19:58:43 2012 +0100 wpp: Reset lexer state after unexpected end of file. --- libs/wpp/ppl.l | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 2718fd0..8d979dc 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -774,7 +774,10 @@ void pp_writestring(const char *format, ...) if(!bep) { if(YY_START != INITIAL) + { ppy_error("Unexpected end of file during preprocessing"); + BEGIN(INITIAL); + } yyterminate(); } else if(bep->should_pop == 2)

1 0

Nikolay Sivov : comctl32: Update thumb position on WM_MOUSEMOVE instead of deferring it.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 3d4a4dae700698bcd68631d6dd38ddb0a4e3f60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4a4dae700698bcd68631d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 19:09:35 2012 +0300 comctl32: Update thumb position on WM_MOUSEMOVE instead of deferring it. --- dlls/comctl32/tests/trackbar.c | 20 ++++++++------------ dlls/comctl32/trackbar.c | 3 +-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 687ed07..7a0e398 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -33,11 +33,7 @@ static HWND hWndParent; static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; -static const struct message create_trackbar_wnd_seq[] = { - {0} -}; - -static const struct message parent_empty_test_seq[] = { +static const struct message empty_seq[] = { {0} }; @@ -545,7 +541,7 @@ static void test_line_size(HWND hWndTrackbar){ expect(4, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, line_size_test_seq, "linesize test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent line test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent line test sequence", FALSE); } @@ -565,7 +561,7 @@ static void test_page_size(HWND hWndTrackbar){ expect(20, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, page_size_test_seq, "page size test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent page size test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent page size test sequence", FALSE); /* check for zero page size */ r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, 0); @@ -861,7 +857,7 @@ static void test_tic_placement(HWND hWndTrackbar){ ok(r > 0, "Expected r > 0, got %d\n", r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tic_placement_test_seq, "get tic placement test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent get tic placement test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent get tic placement test sequence", FALSE); } @@ -905,7 +901,7 @@ static void test_tool_tips(HWND hWndTrackbar){ ok(rTest == hWndTooltip, "Expected hWndTooltip\n"); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tool_tips_test_seq, "tool tips test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent tool tips test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent tool tips test sequence", FALSE); } @@ -924,7 +920,7 @@ static void test_unicode(HWND hWndTrackbar){ ok(r == FALSE, "Expected FALSE, got %d\n",r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, unicode_test_seq, "unicode test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent unicode test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent unicode test sequence", FALSE); } static void test_ignore_selection(HWND hWndTrackbar){ @@ -966,7 +962,7 @@ static void test_ignore_selection(HWND hWndTrackbar){ expect(0, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, ignore_selection_test_seq, "ignore selection setting test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent ignore selection setting test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent ignore selection setting test sequence", FALSE); } static void test_initial_state(void) @@ -1075,7 +1071,7 @@ START_TEST(trackbar) return; } - ok_sequence(sequences, TRACKBAR_SEQ_INDEX, create_trackbar_wnd_seq, "create Trackbar Window", FALSE); + ok_sequence(sequences, TRACKBAR_SEQ_INDEX, empty_seq, "create Trackbar Window", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_trackbar_wnd_seq, "parent trackbar window", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCE); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 299c44c..22d5945 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1664,11 +1664,10 @@ TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, INT x, INT y) if (dragPos == oldPos) return TRUE; infoPtr->lPos = dragPos; + TRACKBAR_UpdateThumb (infoPtr); - infoPtr->flags |= TB_THUMBPOSCHANGED; notify_with_scroll (infoPtr, TB_THUMBTRACK | (infoPtr->lPos<<16)); - TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, dragPos); UpdateWindow (infoPtr->hwndSelf);

1 0

Michael Stefaniuc : riched20: Drop the WINE_ prefix from a FIXME.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 51998b929a31d30c106ecfca2864208c1d305061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51998b929a31d30c106ecfca2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 9 16:17:32 2012 +0100 riched20: Drop the WINE_ prefix from a FIXME. --- dlls/riched20/paint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6b13fb5..e1f838e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -316,7 +316,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, hPen = CreatePen(PS_DOT, 1, rgb); break; default: - WINE_FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); /* fall through */ case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ case CFU_UNDERLINENONE:

1 0

Dmitry Timoshkov : gdiplus: Create GDI bitmap only when needed.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: b39425f3cfb497c329e2bb3d05645a62221a5424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39425f3cfb497c329e2bb3d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 11 14:58:08 2012 +0800 gdiplus: Create GDI bitmap only when needed. --- dlls/gdiplus/brush.c | 11 ----------- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/graphics.c | 9 +++++---- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ca4d8eb..0b326ed 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -47,15 +47,9 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) switch(brush->bt){ case BrushTypeSolidColor: { - GpSolidFill *fill; *clone = GdipAlloc(sizeof(GpSolidFill)); if (!*clone) return OutOfMemory; - - fill = (GpSolidFill*)*clone; - memcpy(*clone, brush, sizeof(GpSolidFill)); - - fill->bmp = ARGB2BMP(fill->color); break; } case BrushTypeHatchFill: @@ -654,7 +648,6 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->brush.bt = BrushTypeSolidColor; (*sf)->color = color; - (*sf)->bmp = ARGB2BMP(color); TRACE("<-- %p\n", *sf); @@ -899,10 +892,6 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); break; - case BrushTypeSolidColor: - if (((GpSolidFill*)brush)->bmp) - DeleteObject(((GpSolidFill*)brush)->bmp); - break; case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); GdipFree(((GpLineGradient*)brush)->blendpos); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2a5fe69..2081290 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -183,7 +183,6 @@ struct GpHatch{ struct GpSolidFill{ GpBrush brush; ARGB color; - HBITMAP bmp; }; struct GpPathGradient{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d300f59..fee6935 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -847,7 +847,9 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) case BrushTypeSolidColor: { GpSolidFill *fill = (GpSolidFill*)brush; - if (fill->bmp) + HBITMAP bmp = ARGB2BMP(fill->color); + + if (bmp) { RECT rc; /* partially transparent fill */ @@ -856,12 +858,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); - HBITMAP oldbmp; BLENDFUNCTION bf; if (!hdc) break; - oldbmp = SelectObject(hdc, fill->bmp); + SelectObject(hdc, bmp); bf.BlendOp = AC_SRC_OVER; bf.BlendFlags = 0; @@ -870,10 +871,10 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) GdiAlphaBlend(graphics->hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, hdc, 0, 0, 1, 1, bf); - SelectObject(hdc, oldbmp); DeleteDC(hdc); } + DeleteObject(bmp); break; } /* else fall through */

1 0

André Hentschel : winedbg: Respect Thumb mode when adjusting PC on ARM.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 2c5a7743be823caefde72a14ef85221b1d521497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5a7743be823caefde72a14e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 18:26:05 2012 +0100 winedbg: Respect Thumb mode when adjusting PC on ARM. --- programs/winedbg/be_arm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index c39043c..6c1cc05 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -205,13 +205,15 @@ static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx) static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) { + INT step = (ctx->Cpsr & 0x20) ? 2 : 4; + if (way) { - ctx->Pc-=4; - return -4; + ctx->Pc -= step; + return -step; } - ctx->Pc+=4; - return 4; + ctx->Pc += step; + return step; } static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Dmitry Timoshkov : kernel32: Make CreateFile called with creation == 0 work when opening a vxd in win9x mode.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 495a0cba3da1986c52e026f1843fc5f559de3984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495a0cba3da1986c52e026f18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 11 13:41:31 2012 +0800 kernel32: Make CreateFile called with creation == 0 work when opening a vxd in win9x mode. --- dlls/kernel32/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a3b4411..089f693 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1310,6 +1310,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, else if (GetVersion() & 0x80000000) { vxd_name = filename + 4; + if (!creation) creation = OPEN_EXISTING; } } else dosdev = RtlIsDosDeviceName_U( filename );

1 0

Alistair Leslie-Hughes : advapi32: Correct tests under WOW64.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 02b3700779ca2ea5eed43986ca762ee2784e9d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b3700779ca2ea5eed43986c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 12 11:22:03 2012 +1100 advapi32: Correct tests under WOW64. --- dlls/advapi32/tests/security.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4cc1402..c8db437 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1455,9 +1455,11 @@ static void test_token_attr(void) Size = 0; ret = GetTokenInformation(Token, TokenGroups, Groups, Size2, &Size); ok(Size > 1, "got %d\n", Size); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok((!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) || broken(ret) /* wow64 */, "%d with error %d\n", ret, GetLastError()); - ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + if(!ret) + ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + HeapFree(GetProcessHeap(), 0, Groups); SetLastError(0xdeadbeef);

1 0

Matteo Bruni : d3d9/tests: Reenable a VS fog test.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 393b2f137cc086e234857635bccc7d70e0051435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393b2f137cc086e234857635b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:17 2012 +0100 d3d9/tests: Reenable a VS fog test. --- dlls/d3d9/tests/visual.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 72e4d21..a0695a7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1847,7 +1847,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, -#if 0 /* FIXME: these fail on GeForce 8500 */ + /* These tests fail on older Nvidia drivers */ /* foggy vertex shader */ {2, 0, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, @@ -1861,7 +1861,6 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, -#endif /* foggy vertex shader and pixel shader. First 4 tests with vertex fog, * all using the fixed fog-coord linear fog

1 0

Matteo Bruni : wined3d: Clamp fog coordinate in the ARB backend too.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 4ed605f081b21ea311adfa3a0027204165dac6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed605f081b21ea311adfa3a0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:16 2012 +0100 wined3d: Clamp fog coordinate in the ARB backend too. --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf9b909..50cd91a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -344,6 +344,7 @@ static BOOL need_helper_const(const struct arb_vshader_private *shader_data, if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ if (reg_maps->usesnrm) return TRUE; /* 0.0 */ if (reg_maps->usespow) return TRUE; /* EPS, 0.0 and 1.0 */ + if (reg_maps->fog) return TRUE; /* Clamping fog coord, 0.0 and 1.0 */ return FALSE; } @@ -962,7 +963,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction const struct wined3d_shader_register *reg, char *register_name, BOOL *is_color) { /* oPos, oFog and oPts in D3D */ - static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; + static const char * const rastout_reg_names[] = {"TMP_OUT", "TMP_FOGCOORD", "result.pointsize"}; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); @@ -3139,10 +3140,26 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ if (args->super.fog_src == VS_FOG_Z) + { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - else if (!reg_maps->fog) - /* posFixup.x is always 1.0, so we can safely use it */ - shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + else + { + if (!reg_maps->fog) + { + /* posFixup.x is always 1.0, so we can safely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + else + { + /* Clamp fogcoord */ + const char *zero = arb_get_helper_value(reg_maps->shader_version.type, ARB_ZERO); + const char *one = arb_get_helper_value(reg_maps->shader_version.type, ARB_ONE); + + shader_addline(buffer, "MIN TMP_FOGCOORD.x, TMP_FOGCOORD.x, %s;\n", one); + shader_addline(buffer, "MAX result.fogcoord.x, TMP_FOGCOORD.x, %s;\n", zero); + } + } /* Clipplanes are always stored without y inversion */ if (use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) @@ -3962,7 +3979,7 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig } priv_ctx->color_output[0] = "result.color.primary"; priv_ctx->color_output[1] = "result.color.secondary"; - priv_ctx->fog_output = "result.fogcoord"; + priv_ctx->fog_output = "TMP_FOGCOORD"; /* Map declared regs to builtins. Use "TA" to /dev/null unread output */ for (i = 0; i < (sizeof(shader->output_signature) / sizeof(*shader->output_signature)); ++i) @@ -4148,6 +4165,8 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } shader_addline(buffer, "TEMP TMP_OUT;\n"); + if (reg_maps->fog) + shader_addline(buffer, "TEMP TMP_FOGCOORD;\n"); if (need_helper_const(shader_data, reg_maps, gl_info)) { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps);

1 0

Matteo Bruni : d3d8/tests: Port fog_with_shader_test() from d3d9 tests.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 9f4eda2b8d098a94b8c258c7d56419fe61ba90d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4eda2b8d098a94b8c258c7d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:18 2012 +0100 d3d8/tests: Port fog_with_shader_test() from d3d9 tests. --- dlls/d3d8/tests/visual.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f4eda2b8d098a94b8c25…

1 0