October 2008 - Wine-Commits

Dylan Smith : richedit: Added riched32 tests for word wrap.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 9b4c821185af5ecf62c5becc6e790a7003be0988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4c821185af5ecf62c5becc6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Oct 26 23:38:07 2008 -0400 richedit: Added riched32 tests for word wrap. --- dlls/riched32/tests/editor.c | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 2bf44f9..15876f4 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -817,6 +817,111 @@ static void test_EM_POSFROMCHAR(void) DestroyWindow(hwndRichEdit); } +static void test_word_wrap(void) +{ + HWND hwnd; + POINTL point = {0, 60}; /* This point must be below the first line */ + const char *text = "Must be long enough to test line wrapping"; + DWORD dwCommonStyle = WS_VISIBLE|WS_POPUP|WS_VSCROLL|ES_MULTILINE; + int res, pos, lines; + + /* Test the effect of WS_HSCROLL and ES_AUTOHSCROLL styles on wrapping + * when specified on window creation and set later. */ + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); + + SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle|WS_HSCROLL, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + todo_wine ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + todo_wine ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); + + SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + todo_wine ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle|ES_AUTOHSCROLL, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, + dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + /* Test the effect of EM_SETTARGETDEVICE on word wrap. */ + res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 1); + todo_wine ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 0); + todo_wine ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + DestroyWindow(hwnd); + + /* Test to see if wrapping happens with redraw disabled. */ + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + 0, 0, 400, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + ok(IsWindowVisible(hwnd), "Window should be visible.\n"); + SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + /* redraw is disabled by making the window invisible. */ + ok(!IsWindowVisible(hwnd), "Window shouldn't be visible.\n"); + res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + ok(res, "EM_REPLACESEL failed.\n"); + MoveWindow(hwnd, 0, 0, 100, 80, TRUE); + SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); + /* Wrapping didn't happen while redraw was disabled. */ + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + todo_wine ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); + /* There isn't even a rewrap from resizing the window. */ + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + todo_wine ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); + res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + ok(res, "EM_REPLACESEL failed.\n"); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { @@ -838,6 +943,7 @@ START_TEST( editor ) test_EM_LINELENGTH(); test_EM_FINDTEXT(); test_EM_POSFROMCHAR(); + test_word_wrap(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Roderick Colenbrander : opengl32: Mark some opengl3 tests as wine_todo.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: fae40b2176da88e595422951ce15a819a4989975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae40b2176da88e595422951c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 25 19:53:38 2008 +0000 opengl32: Mark some opengl3 tests as wine_todo. --- dlls/opengl32/tests/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8b5aa4a..35eb8ae 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -446,7 +446,7 @@ static void test_opengl3(HDC hdc) gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); error = GetLastError(); - ok(error == ERROR_DC_NOT_FOUND, "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); + todo_wine ok(error == ERROR_DC_NOT_FOUND, "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); wglDeleteContext(gl3Ctx); } @@ -457,7 +457,7 @@ static void test_opengl3(HDC hdc) gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); - ok(error == ERROR_INVALID_OPERATION, "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + todo_wine ok(error == ERROR_INVALID_OPERATION, "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); } @@ -508,7 +508,7 @@ static void test_opengl3(HDC hdc) /* OpenGL 3.0 allows offscreen rendering WITHOUT a drawable */ /* NOTE: Nvidia's 177.89 beta drivers don't allow this yet */ res = wglMakeCurrent(0, gl3Ctx); - ok(res == TRUE, "OpenGL 3.0 should allow windowless rendering, but the test failed!\n"); + todo_wine ok(res == TRUE, "OpenGL 3.0 should allow windowless rendering, but the test failed!\n"); if(res) wglMakeCurrent(0, 0);

1 0

Roderick Colenbrander : Opengl32: Add defines for WGL_/ GLX_ARB_create_context.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 35f58e92ddb19b46763d946f3c9d176e0d840ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f58e92ddb19b46763d946f3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 25 20:36:52 2008 +0000 Opengl32: Add defines for WGL_/GLX_ARB_create_context. --- include/wine/wgl.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 8de19f8..7a2e77e 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -182,6 +182,22 @@ # define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 #endif +/** WGL_ARB_create_context */ +#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 +#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 +#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 +#define WGL_CONTEXT_FLAGS_ARB 0x2094 +#define ERROR_INVALID_VERSION_ARB 0x2095 +#ifndef GLX_ARB_create_context +#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 +#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define GLX_CONTEXT_FLAGS_ARB 0x2094 +#endif + /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float */

1 0

Roderick Colenbrander : winex11: Move all delayed GLX context creation code to create_glxcontext in order to prepare for WGL_ARB_create_context .
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: a1e11f353357331ef51834ef99c01ac6500e76c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e11f353357331ef51834ef9… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 25 21:36:32 2008 +0000 winex11: Move all delayed GLX context creation code to create_glxcontext in order to prepare for WGL_ARB_create_context. --- dlls/winex11.drv/opengl.c | 41 ++++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index bf1a9b6..b4845ad 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1013,6 +1013,18 @@ static inline void sync_context(Wine_GLContext *context) } +static GLXContext create_glxcontext(Display *display, Wine_GLContext *context, GLXContext shareList, BOOL direct) +{ + GLXContext ctx; + if(context->vis) + ctx = pglXCreateContext(gdi_display, context->vis, shareList, direct); + else /* Create a GLX Context for a pbuffer */ + ctx = pglXCreateNewContext(gdi_display, context->fmt->fbconfig, context->fmt->render_type, shareList, direct); + + return ctx; +} + + Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent) { return pglXCreateGLXPixmap(display, vis, parent); @@ -1581,19 +1593,13 @@ BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { if (!src->ctx) { DWORD type = GetObjectType(src->hdc); wine_tsx11_lock(); - if(src->vis) - src->ctx = pglXCreateContext(gdi_display, src->vis, NULL, type == OBJ_MEMDC ? False : True); - else /* Create a GLX Context for a pbuffer */ - src->ctx = pglXCreateNewContext(gdi_display, src->fmt->fbconfig, src->fmt->render_type, NULL, True); + src->ctx = create_glxcontext(gdi_display, src, NULL, type == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", src->ctx); } else if (!dst->ctx) { DWORD type = GetObjectType(dst->hdc); wine_tsx11_lock(); - if(dst->vis) - dst->ctx = pglXCreateContext(gdi_display, dst->vis, NULL, type == OBJ_MEMDC ? False : True); - else /* Create a GLX Context for a pbuffer */ - dst->ctx = pglXCreateNewContext(gdi_display, dst->fmt->fbconfig, dst->fmt->render_type, NULL, True); + dst->ctx = create_glxcontext(gdi_display, dst, NULL, type == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", dst->ctx); } } @@ -1772,11 +1778,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { * We are certain that the drawable and context are compatible as we only allow compatible formats. */ TRACE(" Creating GLX Context\n"); - if(ctx->vis) - ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); - else /* Create a GLX Context for a pbuffer */ - ctx->ctx = pglXCreateNewContext(gdi_display, ctx->fmt->fbconfig, ctx->fmt->render_type, NULL, True); - + ctx->ctx = create_glxcontext(gdi_display, ctx, NULL, type == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); @@ -1829,7 +1831,7 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* p Drawable d_read = get_glxdrawable(pReadDev); if (ctx->ctx == NULL) { - ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, !indirect); + ctx->ctx = create_glxcontext(gdi_display, ctx, NULL, !indirect); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } ctx->hdc = pDrawDev->hdc; @@ -1869,10 +1871,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { wine_tsx11_lock(); describeContext(org); - if(org->vis) - org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, !indirect); - else /* Create a GLX Context for a pbuffer */ - org->ctx = pglXCreateNewContext(gdi_display, org->fmt->fbconfig, org->fmt->render_type, NULL, True); + org->ctx = create_glxcontext(gdi_display, org, NULL, !indirect); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); } @@ -1880,11 +1879,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { int indirect = (GetObjectType(dest->hdc) == OBJ_MEMDC); wine_tsx11_lock(); describeContext(dest); - /* Create the destination context with display lists shared */ - if(dest->vis) - dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, !indirect); - else /* Create a GLX Context for a pbuffer */ - dest->ctx = pglXCreateNewContext(gdi_display, dest->fmt->fbconfig, dest->fmt->render_type, org->ctx, True); + dest->ctx = create_glxcontext(gdi_display, dest, org->ctx, !indirect); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); return TRUE;

1 0

Clinton Stimpson : comctl32: Fix getting of min size of monthcal when changing font.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 9f1ea3f15b7883b096e321e248c906148a5e5f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1ea3f15b7883b096e321e24… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Sat Oct 25 10:04:52 2008 -0600 comctl32: Fix getting of min size of monthcal when changing font. --- dlls/comctl32/monthcal.c | 2 ++ dlls/comctl32/tests/monthcal.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6f9da81..e3e4d2a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1874,6 +1874,8 @@ static LRESULT MONTHCAL_SetFont(MONTHCAL_INFO *infoPtr, HFONT hFont, BOOL redraw lf.lfWeight = FW_BOLD; infoPtr->hBoldFont = CreateFontIndirectW(&lf); + MONTHCAL_UpdateSize(infoPtr); + if (redraw) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 6f2ae70..8aade81 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1112,6 +1112,34 @@ static void test_monthcal_MaxSelDay(HWND hwnd) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_max_sel_day_seq, "monthcal MaxSelDay", FALSE); } +static void test_monthcal_size(HWND hwnd) +{ + int res; + RECT r1, r2; + HFONT hFont1, hFont2; + LOGFONTA logfont; + + lstrcpyA(logfont.lfFaceName, "Arial"); + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + hFont1 = CreateFontIndirectA(&logfont); + + logfont.lfHeight = 24; + hFont2 = CreateFontIndirectA(&logfont); + + /* initialize to a font we can compare against */ + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont1, 0); + res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r1); + + /* check that setting a larger font results in an larger rect */ + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont2, 0); + res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r2); + + OffsetRect(&r1, -r1.left, -r1.top); + OffsetRect(&r2, -r2.left, -r2.top); + + ok(r1.bottom < r2.bottom, "Failed to get larger rect with larger font\n"); +} START_TEST(monthcal) { @@ -1153,6 +1181,7 @@ START_TEST(monthcal) test_monthcal_monthrange(hwnd); test_monthcal_HitTest(hwnd); test_monthcal_todaylink(hwnd); + test_monthcal_size(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd);

1 0

Hervé Chanal : shell32: A nicer icon for "folder".
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 51f3e69120caf133becb122fc48c9414d83222d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f3e69120caf133becb122fc… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Fri Oct 24 18:08:20 2008 +0200 shell32: A nicer icon for "folder". --- dlls/shell32/Makefile.in | 4 +- dlls/shell32/folder.ico | Bin 4710 -> 15086 bytes dlls/shell32/folder.svg | 729 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 732 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51f3e69120caf133becb1…

1 0

Hervé Chanal : shell32: A nicer icon for "Open folder" .
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: ed2c8669f0e131791bca22ee122c156f85382b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2c8669f0e131791bca22ee1… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Fri Oct 24 18:06:23 2008 +0200 shell32: A nicer icon for "Open folder". --- dlls/shell32/Makefile.in | 2 + dlls/shell32/folder_open.ico | Bin 1406 -> 15086 bytes dlls/shell32/folder_open.svg | 729 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 731 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed2c8669f0e131791bca2…

1 0

Michael Stefaniuc : cmdlgtst: HGDIOBJ is interchangeable with other handle types; no casts are needed.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: a195777b8590051427220edc4a751760f8a10974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a195777b8590051427220edc4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 23:40:08 2008 +0200 cmdlgtst: HGDIOBJ is interchangeable with other handle types; no casts are needed. --- programs/cmdlgtst/cmdlgtst.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index 33727f4..eeaf23b 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -290,9 +290,9 @@ static void paintMainWindow(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lPar BeginPaint(hWnd, &ps); GetClientRect(hWnd, (LPRECT) &rect); - pen = (HPEN) SelectObject(ps.hdc, CreatePen(0, 0, fgColor)); - brush = (HBRUSH) SelectObject(ps.hdc, CreateSolidBrush(bgColor)); - font = (HFONT) SelectObject(ps.hdc, CreateFontIndirect(&cf_lf)); + pen = SelectObject(ps.hdc, CreatePen(0, 0, fgColor)); + brush = SelectObject(ps.hdc, CreateSolidBrush(bgColor)); + font = SelectObject(ps.hdc, CreateFontIndirect(&cf_lf)); /* * Ideally, we'd only need to draw the exposed bit. @@ -324,11 +324,11 @@ static void paintMainWindow(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lPar * and delete the newly created objects. */ - pen = (HPEN) SelectObject(ps.hdc, pen); + pen = SelectObject(ps.hdc, pen); DeleteObject(pen); - brush = (HBRUSH) SelectObject(ps.hdc, brush); + brush = SelectObject(ps.hdc, brush); DeleteObject(brush); - font = (HFONT) SelectObject(ps.hdc, font); + font = SelectObject(ps.hdc, font); DeleteObject(font); EndPaint(hWnd, &ps); @@ -999,7 +999,7 @@ static int registerMainWindowClass(HINSTANCE hInstance) #endif wndClass.hIcon = 0; wndClass.hCursor = 0; - wndClass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); + wndClass.hbrBackground = GetStockObject(WHITE_BRUSH); wndClass.lpszMenuName = menuName; wndClass.lpszClassName = className;

1 0

Michael Stefaniuc : taskmgr: HGDIOBJ is interchangeable with other handle types; no casts are needed.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 2d90c85adadc1facccace5f12e6e4efbb3d82d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d90c85adadc1facccace5f12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 23:39:55 2008 +0200 taskmgr: HGDIOBJ is interchangeable with other handle types; no casts are needed. --- programs/taskmgr/graphctl.c | 14 +++++++------- programs/taskmgr/taskmgr.c | 2 +- programs/taskmgr/trayicon.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 38156fe..7b5db77 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -210,7 +210,7 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) { this->m_dcGrid = CreateCompatibleDC(dc); this->m_bitmapGrid = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - this->m_bitmapOldGrid = (HBITMAP)SelectObject(this->m_dcGrid, this->m_bitmapGrid); + this->m_bitmapOldGrid = SelectObject(this->m_dcGrid, this->m_bitmapGrid); } SetBkColor(this->m_dcGrid, this->m_crBackColor); @@ -234,7 +234,7 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;/* m_rectPlot.Width(); */ /* draw the plot rectangle */ - oldPen = (HPEN)SelectObject(this->m_dcGrid, solidPen); + oldPen = SelectObject(this->m_dcGrid, solidPen); MoveToEx(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top, NULL); LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.top); LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.bottom+1); @@ -286,7 +286,7 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) DEFAULT_PITCH|FF_SWISS, "Arial"); /* grab the horizontal font */ - oldFont = (HFONT)SelectObject(m_dcGrid, axisFont); + oldFont = SelectObject(m_dcGrid, axisFont); /* y max */ SetTextColor(m_dcGrid, m_crGridColor); @@ -317,7 +317,7 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) SelectObject(m_dcGrid, oldFont); /* y units */ - oldFont = (HFONT)SelectObject(m_dcGrid, yUnitFont); + oldFont = SelectObject(m_dcGrid, yUnitFont); SetTextAlign(m_dcGrid, TA_CENTER|TA_BASELINE); TextOut(m_dcGrid, (m_rectClient.left+m_rectPlot.left)/2, (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, _tcslen(m_strYUnitsString)); @@ -331,7 +331,7 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) { this->m_dcPlot = CreateCompatibleDC(dc); this->m_bitmapPlot = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - this->m_bitmapOldPlot = (HBITMAP)SelectObject(this->m_dcPlot, this->m_bitmapPlot); + this->m_bitmapOldPlot = SelectObject(this->m_dcPlot, this->m_bitmapPlot); } /* make sure the plot bitmap is cleared */ @@ -379,7 +379,7 @@ void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) /* and then BitBlt it to the client */ memDC = CreateCompatibleDC(dc); memBitmap = (HBITMAP)CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - oldBitmap = (HBITMAP)SelectObject(memDC, memBitmap); + oldBitmap = SelectObject(memDC, memBitmap); if (memDC != NULL) { @@ -434,7 +434,7 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this) for (i = 0; i < MAX_PLOTS; i++) { /* grab the plotting pen */ - oldPen = (HPEN)SelectObject(this->m_dcPlot, this->m_penPlot[i]); + oldPen = SelectObject(this->m_dcPlot, this->m_penPlot[i]); /* move to the previous point */ prevX = this->m_rectPlot.right-this->m_nPlotShiftPixels; diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 70f3bfc..d2f88ec 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -97,7 +97,7 @@ void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) hFontDC = CreateCompatibleDC(hDC); hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); - hOldBitmap = (HBITMAP)SelectObject(hFontDC, hFontBitmap); + hOldBitmap = SelectObject(hFontDC, hFontBitmap); for (i = 0; lpwszText[i]; i++) { if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) { diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 25a5121..90705ec 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -78,7 +78,7 @@ HICON TrayIcon_GetProcessorUsageIcon(void) * Select the bitmap into our device context * so we can draw on it. */ - hOldBitmap = (HBITMAP) SelectObject(hDC, hBitmap); + hOldBitmap = SelectObject(hDC, hBitmap); /* * Get the cpu usage

1 0

Michael Stefaniuc : gdi32/tests: HGDIOBJ is interchangeable with other handle types; no casts are needed.
by Alexandre Julliard Oct. 27, 2008

Oct. 27, 2008

Module: wine Branch: master Commit: 8ff77fce45386cc9d1cf7c63a477eb805ccec7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff77fce45386cc9d1cf7c63a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 23:39:38 2008 +0200 gdi32/tests: HGDIOBJ is interchangeable with other handle types; no casts are needed. --- dlls/gdi32/tests/bitmap.c | 18 +++++++++--------- dlls/gdi32/tests/brush.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 3d801e7..7607667 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1158,7 +1158,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) /* Select the DIB into a DC */ dib_dc = CreateCompatibleDC(NULL); - old_bmp = (HBITMAP) SelectObject(dib_dc, dib); + old_bmp = SelectObject(dib_dc, dib); dc = CreateCompatibleDC(NULL); bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib_size); assert(bits2); @@ -1239,7 +1239,7 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) /* Set the pixels */ ddb_dc = CreateCompatibleDC(NULL); - old_bmp = (HBITMAP) SelectObject(ddb_dc, ddb); + old_bmp = SelectObject(ddb_dc, ddb); for (i = 0; i < width; i++) { for (j=0; j < height; j++) @@ -1281,7 +1281,7 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) memcpy(info2, info, sizeof(BITMAPINFOHEADER)); /* Select the DDB into another DC */ - old_bmp = (HBITMAP) SelectObject(ddb_dc, ddb); + old_bmp = SelectObject(ddb_dc, ddb); /* Get the bits */ res = GetDIBits(dc, ddb, 0, height, bits2, info2, DIB_RGB_COLORS); @@ -1894,15 +1894,15 @@ static void test_CreateBitmap(void) HBITMAP bm1 = CreateCompatibleBitmap(screenDC, 0, 0); HBITMAP bm4 = CreateBitmap(0, 1, 0, 0, 0); HBITMAP bm5 = CreateDiscardableBitmap(hdc, 0, 0); - HBITMAP curObj1 = (HBITMAP)GetCurrentObject(hdc, OBJ_BITMAP); - HBITMAP curObj2 = (HBITMAP)GetCurrentObject(screenDC, OBJ_BITMAP); + HBITMAP curObj1 = GetCurrentObject(hdc, OBJ_BITMAP); + HBITMAP curObj2 = GetCurrentObject(screenDC, OBJ_BITMAP); /* these 2 are not the stock monochrome bitmap */ HBITMAP bm2 = CreateCompatibleBitmap(hdc, 1, 1); HBITMAP bm3 = CreateBitmap(1, 1, 1, 1, 0); - HBITMAP old1 = (HBITMAP)SelectObject(hdc, bm2); - HBITMAP old2 = (HBITMAP)SelectObject(screenDC, bm3); + HBITMAP old1 = SelectObject(hdc, bm2); + HBITMAP old2 = SelectObject(screenDC, bm3); SelectObject(hdc, old1); SelectObject(screenDC, old2); @@ -2153,8 +2153,8 @@ void test_GdiAlphaBlend() bmpSrc = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldDst = (HBITMAP)SelectObject(hdcDst, bmpDst); - oldSrc = (HBITMAP)SelectObject(hdcSrc, bmpSrc); + oldDst = SelectObject(hdcDst, bmpDst); + oldSrc = SelectObject(hdcSrc, bmpSrc); blend.BlendOp = AC_SRC_OVER; blend.BlendFlags = 0; diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 70d608f..2197f7e 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -51,7 +51,7 @@ static void test_solidbrush(void) solidBrush = CreateSolidBrush(stock[i].color); if(stock[i].stockobj != -1) { - stockBrush = (HBRUSH)GetStockObject(stock[i].stockobj); + stockBrush = GetStockObject(stock[i].stockobj); ok(stockBrush!=solidBrush || broken(stockBrush==solidBrush), /* win9x does return stock object */ "Stock %s brush equals solid %s brush\n", stock[i].name, stock[i].name);

1 0