November 2015 - Wine-Commits

Alexandre Julliard : makefiles: Generate rules for installing IDL include files.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

1 0

Alexandre Julliard : urlmon/tests: Use the same file as wininet for FTP testing.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 27ea7102dc388fd7053e358cfe4bec76dc4ddf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ea7102dc388fd7053e358cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 14:41:09 2015 +0900 urlmon/tests: Use the same file as wininet for FTP testing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 96ee6cc..ad27c3d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2863,7 +2863,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.134/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/pub/other/winelogo.xcf.tar.bz2"; + url_a = "ftp://ftp.winehq.org/welcome.msg"; break; default: url_a = "winetest:test";

1 0

Martin Storsjo : ucrtbase: Handle the C99 'z' size_t specifier for integers.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 4a79e54917a0e4d0581b62b9fcd8242291d545b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a79e54917a0e4d0581b62b9f… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:40 2015 +0200 ucrtbase: Handle the C99 'z' size_t specifier for integers. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ++++ dlls/msvcrt/tests/printf.c | 5 +++++ dlls/ucrtbase/tests/printf.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index f68eaf6..ce7a70e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -473,6 +473,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.IntegerNative = *p++; } else if(*p == 'w') flags.WideString = *p++; +#if _MSVCR_VER >= 140 + else if(*p == 'z') + flags.IntegerNative = *p++; +#endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ else diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index c8797f3..295c6dd 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -321,6 +321,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"D"),"I64D failed: %s\n",buffer); ok( r==1, "return count wrong\n"); + format = "%zx"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "zx"), "Problem with \"z\" interpretation\n"); + ok( r==2, "return count wrong\n"); + format = "% d"; r = sprintf(buffer,format,1); ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index ae12b60..6c719ea 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -423,6 +423,29 @@ static void test_printf_legacy_three_digit_exp(void) ok(!strcmp(buf, "1.230000E+123"), "buf = %s\n", buf); } +static void test_printf_c99(void) +{ + char buf[20]; + + /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted + * as size_t size for integers. */ + if (sizeof(void*) == 8) { + vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", + (size_t) 0x12345678123456, 1); + ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); + vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, + buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); + ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); + } else { + vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", + (size_t) 0x123456, 1); + ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, + buf, sizeof(buf), "%zx %d", (size_t) 0x123456, 1); + ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + } +} + START_TEST(printf) { if (!init()) return; @@ -434,4 +457,5 @@ START_TEST(printf) test_printf_legacy_wide(); test_printf_legacy_msvcrt(); test_printf_legacy_three_digit_exp(); + test_printf_c99(); }

1 0

Andrew Eikum : winepulse: Prefer PulseAudio driver.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: a410990f7cb0fd7477d4594f8644428ca8873f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a410990f7cb0fd7477d4594f8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 3 16:22:53 2015 -0600 winepulse: Prefer PulseAudio driver. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 9aa1537..b2f83c8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -869,7 +869,7 @@ int WINAPI AUDDRV_GetPriority(void) pthread_mutex_lock(&pulse_lock); hr = pulse_test_connect(); pthread_mutex_unlock(&pulse_lock); - return SUCCEEDED(hr) ? Priority_Low : Priority_Unavailable; + return SUCCEEDED(hr) ? Priority_Preferred : Priority_Unavailable; } HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out)

1 0

Andrew Eikum : winepulse: In Shared mode, track device position in bytes.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 15323580f8e10d9883864ef7a87744f1ff8cccd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15323580f8e10d9883864ef7a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 3 16:21:53 2015 -0600 winepulse: In Shared mode, track device position in bytes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0e2bc08..e5ba869 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2207,8 +2207,12 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) pthread_mutex_lock(&pulse_lock); hr = pulse_stream_valid(This); - if (SUCCEEDED(hr)) - *freq = This->ss.rate * pa_frame_size(&This->ss); + if (SUCCEEDED(hr)) { + if (This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->ss.rate * pa_frame_size(&This->ss); + else + *freq = This->ss.rate; + } pthread_mutex_unlock(&pulse_lock); return hr; } @@ -2233,6 +2237,9 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, *pos = This->clock_written; + if (This->share == AUDCLNT_SHAREMODE_EXCLUSIVE) + *pos /= pa_frame_size(&This->ss); + /* Make time never go backwards */ if (*pos < This->clock_lastpos) *pos = This->clock_lastpos; @@ -2301,7 +2308,7 @@ static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, { ACImpl *This = impl_from_IAudioClock2(iface); HRESULT hr = AudioClock_GetPosition(&This->IAudioClock_iface, pos, qpctime); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && This->share == AUDCLNT_SHAREMODE_SHARED) *pos /= pa_frame_size(&This->ss); return hr; }

1 0

Mark Harmstone : winepulse: Handle stream create failing correctly.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 0d7cee0dd6f1008baca9fe03f9959886a00ea7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7cee0dd6f1008baca9fe03f… Author: Mark Harmstone <mark(a)harmstone.com> Date: Tue Nov 3 16:21:41 2015 -0600 winepulse: Handle stream create failing correctly. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 6b69488..3895f4c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -753,6 +753,12 @@ static HRESULT pulse_stream_connect(ACImpl *This, UINT32 period_bytes) { ret = InterlockedIncrement(&number); sprintf(buffer, "audio stream #%i", ret); This->stream = pa_stream_new(pulse_ctx, buffer, &This->ss, &This->map); + + if (!This->stream) { + WARN("pa_stream_new returned error %i\n", pa_context_errno(pulse_ctx)); + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } + pa_stream_set_state_callback(This->stream, pulse_stream_state, This); pa_stream_set_buffer_attr_callback(This->stream, pulse_attr_update, This); pa_stream_set_moved_callback(This->stream, pulse_attr_update, This);

1 0

Henri Verbeet : wined3d: Always use the same formats in context_create() when "always_offscreen" is enabled.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: c92451f295242110bf016facf0e80564f3643d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92451f295242110bf016facf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:48 2015 +0100 wined3d: Always use the same formats in context_create() when "always_offscreen" is enabled. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e97206e..13b8471 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1557,6 +1557,20 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (color_format->id == WINED3DFMT_P8_UINT) color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); + /* When "always_offscreen" is enabled, we only use the drawable for + * presentation blits, and don't do any rendering to it. That means we + * don't need depth or stencil buffers, and can mostly ignore the render + * target format. This wouldn't necessarily be quite correct for 10bpc + * display modes, but we don't currently support those. + * Using the same format regardless of the color/depth/stencil targets + * makes it much less likely that different wined3d instances will set + * conflicting pixel formats. */ + if (wined3d_settings.always_offscreen) + { + color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); + ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN); + } + /* Try to find a pixel format which matches our requirements. */ pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, FALSE);

1 0

Alexandre Julliard : makefiles: Get rid of the obsolete IMPLIB_SRCS variable.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: cc0420ac3115d04c724d3d3ee4913d38146dcb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0420ac3115d04c724d3d3ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 17:23:03 2015 +0900 makefiles: Get rid of the obsolete IMPLIB_SRCS variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 -- tools/make_makefiles | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 2851f5b..5d287a3 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -16,8 +16,6 @@ C_SRCS = \ keyboard.c \ mouse.c -IMPLIB_SRCS = data_formats.c - IDL_SRCS = dinput_classes.idl RC_SRCS = dinput.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index 1525769..28e448a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -207,7 +207,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -345,11 +345,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { - if (defined $flags{"implib"}) - { - push @{${$make}{"=IMPLIB_SRCS"}}, $name; - ${${$make}{"=flags"}}{"staticimplib"} = 1; - } + ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"}; push @{${$make}{"=C_SRCS"}}, $name; } elsif ($name =~ /\.h$/) @@ -500,7 +496,6 @@ sub update_makefiles(@) replace_makefile_variable( $file, "HEADER_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" ); - replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); }

1 0

Henri Verbeet : wined3d: Get rid of getColorBits().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: e0ab314b62cfe4c06f21e7f468b0351604eb73df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ab314b62cfe4c06f21e7f46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:45 2015 +0100 wined3d: Get rid of getColorBits(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 29 ++++++++++---------------- dlls/wined3d/directx.c | 47 ++++++++++++++---------------------------- dlls/wined3d/utils.c | 40 ----------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 26 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 978f7d7..543eaf3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1244,7 +1244,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - BYTE redBits, greenBits, blueBits, alphaBits, colorBits; BYTE depthBits=0, stencilBits=0; unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; @@ -1254,13 +1253,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), auxBuffers, findCompatible); - if (!getColorBits(color_format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) - { - ERR("Unable to get color bits for format %s (%#x)!\n", - debug_d3dformat(color_format->id), color_format->id); - return 0; - } - getDepthStencilBits(ds_format, &depthBits, &stencilBits); current_value = 0; @@ -1276,13 +1268,13 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC /* In window mode we need a window drawable format and double buffering. */ if (!(cfg->windowDrawable && cfg->doubleBuffer)) continue; - if (cfg->redSize < redBits) + if (cfg->redSize < color_format->red_size) continue; - if (cfg->greenSize < greenBits) + if (cfg->greenSize < color_format->green_size) continue; - if (cfg->blueSize < blueBits) + if (cfg->blueSize < color_format->blue_size) continue; - if (cfg->alphaSize < alphaBits) + if (cfg->alphaSize < color_format->alpha_size) continue; if (cfg->depthSize < depthBits) continue; @@ -1299,14 +1291,14 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC value += 1; if (cfg->stencilSize == stencilBits) value += 2; - if (cfg->alphaSize == alphaBits) + if (cfg->alphaSize == color_format->alpha_size) value += 4; /* We like to have aux buffers in backbuffer mode */ if (auxBuffers && cfg->auxBuffers) value += 8; - if (cfg->redSize == redBits - && cfg->greenSize == greenBits - && cfg->blueSize == blueBits) + if (cfg->redSize == color_format->red_size + && cfg->greenSize == color_format->green_size + && cfg->blueSize == color_format->blue_size) value += 16; if (value > current_value) @@ -1330,8 +1322,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC pfd.nVersion = 1; pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cAlphaBits = alphaBits; - pfd.cColorBits = colorBits; + pfd.cAlphaBits = color_format->alpha_size; + pfd.cColorBits = color_format->red_size + color_format->green_size + + color_format->blue_size + color_format->alpha_size; pfd.cDepthBits = depthBits; pfd.cStencilBits = stencilBits; pfd.iLayerType = PFD_MAIN_PLANE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a443636..e30e785 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4271,36 +4271,21 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - BYTE redSize, greenSize, blueSize, alphaSize, colorBits; - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) return FALSE; - if(cfg->iPixelType == WGL_TYPE_RGBA_ARB) { /* Integer RGBA formats */ - if (!getColorBits(format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) - { - ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - if(cfg->redSize < redSize) - return FALSE; - - if(cfg->greenSize < greenSize) - return FALSE; - - if(cfg->blueSize < blueSize) - return FALSE; - - if(cfg->alphaSize < alphaSize) - return FALSE; + /* Probably a RGBA_float or color index mode. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + return FALSE; - return TRUE; - } + if (cfg->redSize < format->red_size + || cfg->greenSize < format->green_size + || cfg->blueSize < format->blue_size + || cfg->alphaSize < format->alpha_size) + return FALSE; - /* Probably a RGBA_float or color index mode */ - return FALSE; + return TRUE; } static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, @@ -4479,17 +4464,15 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; - BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; unsigned int i; - getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); - getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); - - /* In backbuffer mode the front and backbuffer share the same WGL pixelformat. - * The format must match in RGB, alpha is allowed to be different. (Only the backbuffer can have alpha) */ - if (!((AdapterRed == CheckRed) && (AdapterGreen == CheckGreen) && (AdapterBlue == CheckBlue))) + /* In backbuffer mode the front and backbuffer share the same WGL + * pixelformat. The format must match in RGB, alpha is allowed to be + * different. (Only the backbuffer can have alpha.) */ + if (adapter_format->red_size != check_format->red_size + || adapter_format->green_size != check_format->green_size + || adapter_format->blue_size != check_format->blue_size) { TRACE("[FAILED]\n"); return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e7f9cbd..40ba09c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4016,46 +4016,6 @@ unsigned int count_bits(unsigned int mask) return count; } -/* Helper function for retrieving color info for ChoosePixelFormat and wglChoosePixelFormatARB. - * The later function requires individual color components. */ -BOOL getColorBits(const struct wined3d_format *format, - BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) -{ - TRACE("format %s.\n", debug_d3dformat(format->id)); - - switch (format->id) - { - case WINED3DFMT_B10G10R10A2_UNORM: - case WINED3DFMT_R10G10B10A2_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - case WINED3DFMT_B5G6R5_UNORM: - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_B2G3R3_UNORM: - case WINED3DFMT_P8_UINT_A8_UNORM: - case WINED3DFMT_P8_UINT: - break; - default: - FIXME("Unsupported format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - *redSize = format->red_size; - *greenSize = format->green_size; - *blueSize = format->blue_size; - *alphaSize = format->alpha_size; - *totalSize = *redSize + *greenSize + *blueSize + *alphaSize; - - TRACE("Returning red: %d, green: %d, blue: %d, alpha: %d, total: %d for format %s.\n", - *redSize, *greenSize, *blueSize, *alphaSize, *totalSize, debug_d3dformat(format->id)); - return TRUE; -} - /* Helper function for retrieving depth/stencil info for ChoosePixelFormat and wglChoosePixelFormatARB */ BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 99b025c..0fb261a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,8 +2903,6 @@ void state_pointsprite_w(struct wined3d_context *context, void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -BOOL getColorBits(const struct wined3d_format *format, - BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) DECLSPEC_HIDDEN; BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : d3dx9_36: Remove unneeded vertex_remap variable ( Coverity).
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: d17341dbd0976363bad70c0d06202e8968606133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17341dbd0976363bad70c0d0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 31 10:03:17 2015 +0100 d3dx9_36: Remove unneeded vertex_remap variable (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c597e8e..606a088 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7016,7 +7016,6 @@ HRESULT WINAPI D3DXWeldVertices(ID3DXMesh *mesh, DWORD flags, const D3DXWELDEPSI DWORD *point_reps = NULL; struct d3dx9_mesh *This = impl_from_ID3DXMesh(mesh); DWORD *vertex_face_map = NULL; - ID3DXBuffer *vertex_remap = NULL; BYTE *vertices = NULL; TRACE("mesh %p, flags %#x, epsilons %p, adjacency %p, adjacency_out %p, face_remap_out %p, vertex_remap_out %p.\n", @@ -7183,7 +7182,6 @@ cleanup: HeapFree(GetProcessHeap(), 0, vertex_face_map); if (attributes) mesh->lpVtbl->UnlockAttributeBuffer(mesh); if (indices) mesh->lpVtbl->UnlockIndexBuffer(mesh); - if (vertex_remap) ID3DXBuffer_Release(vertex_remap); if (vertices) mesh->lpVtbl->UnlockVertexBuffer(mesh); return hr;

1 0