October 2011 - Wine-commits

Henri Verbeet : wined3d: Also restore the pixel format in context_restore_gl_context().
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 25b1130b44c2d64effbf259ba174fc5a32d33c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b1130b44c2d64effbf259ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:31 2011 +0200 wined3d: Also restore the pixel format in context_restore_gl_context(). --- dlls/wined3d/context.c | 29 ++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ef8b94e..fc66a98 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -724,7 +724,8 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC { if (!SetPixelFormat(dc, format, NULL)) { - ERR("Failed to set pixel format %d on device context %p, last error %#x.\n", + /* This may also happen if the dc belongs to a destroyed window. */ + WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", format, dc, GetLastError()); return FALSE; } @@ -758,8 +759,16 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC static BOOL context_set_gl_context(struct wined3d_context *ctx) { struct wined3d_swapchain *swapchain = ctx->swapchain; + BOOL backup = FALSE; - if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) + if (!context_set_pixel_format(ctx->gl_info, ctx->hdc, ctx->pixel_format)) + { + WARN("Failed to set pixel format %d on device context %p.\n", + ctx->pixel_format, ctx->hdc); + backup = TRUE; + } + + if (backup || !pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { HDC dc; @@ -804,8 +813,15 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return TRUE; } -static void context_restore_gl_context(HDC dc, HGLRC gl_ctx) +static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx, int pf) { + if (!context_set_pixel_format(gl_info, dc, pf)) + { + ERR("Failed to restore pixel format %d on device context %p.\n", pf, dc); + context_set_current(NULL); + return; + } + if (!pwglMakeCurrent(dc, gl_ctx)) { ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", @@ -876,9 +892,11 @@ static void context_destroy_gl_resources(struct wined3d_context *context) HGLRC restore_ctx; HDC restore_dc; unsigned int i; + int restore_pf; restore_ctx = pwglGetCurrentContext(); restore_dc = pwglGetCurrentDC(); + restore_pf = GetPixelFormat(restore_dc); if (context->valid && restore_ctx != context->glCtx) context_set_gl_context(context); @@ -961,7 +979,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (restore_ctx) { - context_restore_gl_context(restore_dc, restore_ctx); + context_restore_gl_context(gl_info, restore_dc, restore_ctx, restore_pf); } else if (pwglGetCurrentContext() && !pwglMakeCurrent(NULL, NULL)) { @@ -1060,7 +1078,7 @@ void context_release(struct wined3d_context *context) if (!--context->level && context->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); - context_restore_gl_context(context->restore_dc, context->restore_ctx); + context_restore_gl_context(context->gl_info, context->restore_dc, context->restore_ctx, context->restore_pf); context->restore_ctx = NULL; context->restore_dc = NULL; } @@ -1081,6 +1099,7 @@ static void context_enter(struct wined3d_context *context) current_gl, pwglGetCurrentDC()); context->restore_ctx = current_gl; context->restore_dc = pwglGetCurrentDC(); + context->restore_pf = GetPixelFormat(context->restore_dc); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5ed787..ebe277b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1099,6 +1099,7 @@ struct wined3d_context UINT level; HGLRC restore_ctx; HDC restore_dc; + int restore_pf; HGLRC glCtx; HWND win_handle; HDC hdc;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_render_target() const.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: ebbd5ecf7c41a0a9afde070a5e2341a61e439de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbd5ecf7c41a0a9afde070a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:32 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_render_target() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 20bf808..c56dfe5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4939,7 +4939,7 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); } -HRESULT CDECL wined3d_device_get_render_target(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target) { TRACE("device %p, render_target_idx %u, render_target %p.\n", diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e466400..b93bfb2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2238,7 +2238,7 @@ HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *de UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value); -HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_depth_stencil() const.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: fcd1de2b09b11ce8fb67cd3457e7448b04b6b81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd1de2b09b11ce8fb67cd345… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:33 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_depth_stencil() const. --- dlls/wined3d/device.c | 3 ++- include/wine/wined3d.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c56dfe5..10ea92d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4962,7 +4962,8 @@ HRESULT CDECL wined3d_device_get_render_target(const struct wined3d_device *devi return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil) +HRESULT CDECL wined3d_device_get_depth_stencil(const struct wined3d_device *device, + struct wined3d_surface **depth_stencil) { TRACE("device %p, depth_stencil %p.\n", device, depth_stencil); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b93bfb2..7e382e1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2211,7 +2211,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); -HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, struct wined3d_surface **depth_stencil); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device,

1 0

Marcus Meissner : winhttp: Fixed sizeof calls (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 8648c1314011afd6300f97f9671af6797a205a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8648c1314011afd6300f97f96… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 22:55:32 2011 +0200 winhttp: Fixed sizeof calls (Coverity). --- dlls/winhttp/tests/winhttp.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 24478ad..01b74e3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -659,7 +659,8 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, sizeof(reverse ? test_flag_coalesce_reverse : test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, + reverse ? sizeof(test_flag_coalesce_reverse) : sizeof(test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, @@ -683,7 +684,8 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, sizeof(reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma)) == 0, + ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, + reverse ? sizeof(test_flag_coalesce_comma_reverse) : sizeof(test_flag_coalesce_comma)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); @@ -709,7 +711,8 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, sizeof(reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon)) == 0, + ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, + reverse ? sizeof(test_flag_coalesce_semicolon_reverse) : sizeof(test_flag_coalesce_semicolon)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer);

1 0

Marcus Meissner : wined3d: Fixed sizeof (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: f90d40261057b5f4c9dc4190129df6275e6a0c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90d40261057b5f4c9dc41901… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 23:11:48 2011 +0200 wined3d: Fixed sizeof (Coverity). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 126a991..1678dce 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -987,7 +987,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTY const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context)); + swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context) { ERR("Failed to create the context array.\n");

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.30
by Jeremy Newman 14 Oct '11

14 Oct '11

Module: website Branch: master Commit: 2b943bcc0f2ac86b90cf3656b965f23a1e97beb7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2b943bcc0f2ac86b90cf36… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 14 19:03:40 2011 +0200 Polish translation for release 1.3.30 --- news/pl/2011101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011101001.xml b/news/pl/2011101001.xml new file mode 100644 index 0000000..4befb95 --- /dev/null +++ b/news/pl/2011101001.xml @@ -0,0 +1,17 @@ +<news> +<date>Październik 10, 2011</date> +<title>Wydano Wine 1.3.30</title> +<body> + Wydanie rozwojowe Wine 1.3.30 jest już dostępne. + <a href="{$root}/announce/1.3.30">Co nowego</a> w tym wydaniu: +<ul> + <li>DirectSound ponownie zaimplementowane w oparciu o MMDevAPI.</li> + <li>Wsparcie dla StretchBlt w silniku DIB.</li> + <li>Ulepszenia interfejsu użytkownika w pomocy HTML.</li> + <li>Pewne poprawki w MSXML.</li> + <li>Ulepszenia wydajności w cmd.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Dan Kegel : shlwapi/tests: Initialize size parameter in test_SHGetShellKey.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 876d551911f77e6f8bb85cc2d548ac42af86d77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=876d551911f77e6f8bb85cc2d… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Oct 14 08:23:08 2011 -0700 shlwapi/tests: Initialize size parameter in test_SHGetShellKey. --- dlls/shlwapi/tests/ordinal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 593307e..40ee62e 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2873,6 +2873,7 @@ static void test_SHGetShellKey(void) return; } + size = sizeof(data); hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres);

1 0

Uwe Bonnes : ntdll: Generate a single EV_TXEMPTY when the TX buffer turns empty.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 89c2a4c5961e6534ecd017d74fa007aec10e34e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c2a4c5961e6534ecd017d74… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Thu Oct 13 11:30:37 2011 +0200 ntdll: Generate a single EV_TXEMPTY when the TX buffer turns empty. --- dlls/ntdll/serial.c | 54 +++++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 1ca2cfa..231466c 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -785,6 +785,7 @@ static NTSTATUS set_XOn(int fd) typedef struct serial_irq_info { int rx , tx, frame, overrun, parity, brk, buf_overrun; + DWORD temt; }serial_irq_info; /*********************************************************************** @@ -806,7 +807,6 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { - NTSTATUS status = STATUS_NOT_IMPLEMENTED; #ifdef TIOCGICOUNT struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) @@ -818,13 +818,38 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) irq_info->parity = einfo.parity; irq_info->brk = einfo.brk; irq_info->buf_overrun = einfo.buf_overrun; - return STATUS_SUCCESS; } - TRACE("TIOCGICOUNT err %s\n", strerror(errno)); - status = FILE_GetNtStatus(); -#endif + else + { + TRACE("TIOCGICOUNT err %s\n", strerror(errno)); + memset(irq_info,0, sizeof(serial_irq_info)); + return FILE_GetNtStatus(); + } +#else memset(irq_info,0, sizeof(serial_irq_info)); - return status; + return STATUS_NOT_IMPLEMENTED; +#endif + irq_info->temt = 0; + /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ +#ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */ + if (ioctl(fd, TIOCSERGETLSR, &irq_info->temt)) + { + TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); + return FILE_GetNtStatus(); + } +#elif defined(TIOCOUTQ) /* otherwise we log when the out queue gets empty */ + if (ioctl(fd, TIOCOUTQ, &irq_info->temt)) + { + TRACE("TIOCOUTQ err %s\n", strerror(errno)); + return FILE_GetNtStatus(); + } + else + { + if (irq_info->temt == 0) + irq_info->temt = 1; + } +#endif + return STATUS_SUCCESS; } @@ -862,21 +887,8 @@ static DWORD check_events(int fd, DWORD mask, } if (mask & EV_TXEMPTY) { - queue = 0; -/* We really want to know when all characters have gone out of the transmitter */ -#if defined(TIOCSERGETLSR) - if (ioctl(fd, TIOCSERGETLSR, &queue)) - WARN("TIOCSERGETLSR returned error\n"); - if (queue) -/* TIOCOUTQ only checks for an empty buffer */ -#elif defined(TIOCOUTQ) - if (ioctl(fd, TIOCOUTQ, &queue)) - WARN("TIOCOUTQ returned error\n"); - if (!queue) -#endif - ret |= EV_TXEMPTY; - TRACE("OUTQUEUE %d, Transmitter %sempty\n", - queue, (ret & EV_TXEMPTY) ? "" : "not "); + if (!old->temt && new->temt) + ret |= EV_TXEMPTY; } return ret & mask; }

1 0

Daniel Santos : winex11.drv: Add on-screen PS_USERSTYLE support to pens.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: f2ad9df45d1ca32ac38ea25f860c28bbf88b65b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ad9df45d1ca32ac38ea25f8… Author: Daniel Santos <danielfsantos(a)att.net> Date: Fri Oct 14 00:32:05 2011 -0500 winex11.drv: Add on-screen PS_USERSTYLE support to pens. --- dlls/winex11.drv/pen.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 45a1f6f..b677515 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -42,11 +42,11 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGPEN logpen; int i; + EXTLOGPEN *elp = NULL; if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN *elp; INT size = GetObjectW( hpen, 0, NULL ); if (!size) return 0; @@ -55,13 +55,10 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) elp = HeapAlloc( GetProcessHeap(), 0, size ); GetObjectW( hpen, size, elp ); - /* FIXME: add support for user style pens */ logpen.lopnStyle = elp->elpPenStyle; logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; logpen.lopnColor = elp->elpColor; - - HeapFree( GetProcessHeap(), 0, elp ); } else physDev->pen.ext = 0; @@ -109,8 +106,10 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) memcpy(physDev->pen.dashes, PEN_alternate, physDev->pen.dash_len); break; case PS_USERSTYLE: - FIXME("PS_USERSTYLE is not supported\n"); - /* fall through */ + physDev->pen.dash_len = min(elp->elpNumEntries, MAX_DASHLEN); + for(i = 0; i < physDev->pen.dash_len ; i++) + physDev->pen.dashes[i] = min(elp->elpStyleEntry[i], 255); + break; default: physDev->pen.dash_len = 0; break; @@ -120,6 +119,8 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) for(i = 0; i < physDev->pen.dash_len; i++) physDev->pen.dashes[i] *= (physDev->pen.width ? physDev->pen.width : 1); + HeapFree( GetProcessHeap(), 0, elp ); + return hpen; }

1 0

Daniel Santos : gdi32: Remove PS_USERSTYLE FIXME and workarounds.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 7a4349bb99a3c54863e03a3dcc82f4ef2de51dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4349bb99a3c54863e03a3dc… Author: Daniel Santos <danielfsantos(a)att.net> Date: Fri Oct 14 00:32:11 2011 -0500 gdi32: Remove PS_USERSTYLE FIXME and workarounds. --- dlls/gdi32/pen.c | 10 +--------- dlls/gdi32/tests/pen.c | 6 ------ 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 425b5aa..1f92b87 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -115,8 +115,6 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) /*********************************************************************** * ExtCreatePen (GDI32.@) - * - * FIXME: PS_USERSTYLE not handled */ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, @@ -137,13 +135,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, return 0; } - if ((style & PS_TYPE_MASK) == PS_COSMETIC) - { - /* FIXME: PS_USERSTYLE workaround */ - FIXME("PS_COSMETIC | PS_USERSTYLE not handled\n"); - style = (style & ~PS_STYLE_MASK) | PS_SOLID; - } - else + if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) { UINT i; BOOL has_neg = FALSE, all_zero = TRUE; diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index df13f6e..86250a0 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -311,12 +311,6 @@ static void test_logpen(void) break; } -if (pen[i].style == PS_USERSTYLE) -{ - todo_wine - ok(ext_pen.elp.elpPenStyle == pen[i].style, "expected %x, got %x\n", pen[i].style, ext_pen.elp.elpPenStyle); -} -else ok(ext_pen.elp.elpPenStyle == pen[i].style, "expected %x, got %x\n", pen[i].style, ext_pen.elp.elpPenStyle); ok(ext_pen.elp.elpWidth == 1, "expected 1, got %x\n", ext_pen.elp.elpWidth); ok(ext_pen.elp.elpColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, ext_pen.elp.elpColor);

1 0