October 2011 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the mostly unused "pfd" variable in context_create().
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 67b097cd6e92567d0335bc8894c87eaaca3bc5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b097cd6e92567d0335bc889… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:06 2011 +0200 wined3d: Get rid of the mostly unused "pfd" variable in context_create(). --- dlls/wined3d/context.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e44ee81..61398e6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1294,7 +1294,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; - PIXELFORMATDESCRIPTOR pfd; BOOL auxBuffers = FALSE; int pixel_format; unsigned int s; @@ -1363,7 +1362,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - DescribePixelFormat(hdc, pixel_format, sizeof(pfd), &pfd); if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc);

1 0

Henri Verbeet : gameux: Don't shadow hr in GAMEUX_RegisterGame().
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: a4ee6226ae4ecbf921a4dac2060c796f1b1ad5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee6226ae4ecbf921a4dac20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:05 2011 +0200 gameux: Don't shadow hr in GAMEUX_RegisterGame(). --- dlls/gameux/gameexplorer.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index c6935c9..bada386 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -565,7 +565,6 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, { struct parse_gdf_thread_param thread_param; HANDLE thread; - HRESULT hr; DWORD ret; thread_param.GameData = &GameData;

1 0

Andrew Talbot : winealsa.drv: Add some return statements to mark semantic separations.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 654f280947e638ddf622f9226c86a7b68db130d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654f280947e638ddf622f9226… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 13 22:17:47 2011 +0100 winealsa.drv: Add some return statements to mark semantic separations. --- dlls/winealsa.drv/midi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 24fe227..ff762eb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1314,6 +1314,7 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: ALSA_MidiInit(); + return 0; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1357,6 +1358,7 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: ALSA_MidiInit(); + return 0; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE:

1 0

Dan Kegel : gdiplus/tests: Must define biClrUsed when calling CreateDIBSection.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: fa4cafd80eacea5b180aad3fc7c9deeb117b4fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4cafd80eacea5b180aad3fc… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 13 13:47:10 2011 -0700 gdiplus/tests: Must define biClrUsed when calling CreateDIBSection. --- dlls/gdiplus/tests/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 44554a5..8535aad 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -886,6 +886,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bmi.bmiHeader.biBitCount = 24; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hbm != NULL, "CreateDIBSection failed\n");

1 0

Piotr Caban : msvcrt: Added missing calling convention specification.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 95f3be6573fda49f8ab90ab7956265d13d0d9763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f3be6573fda49f8ab90ab79… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 23:28:51 2011 +0200 msvcrt: Added missing calling convention specification. --- dlls/msvcrt/dir.c | 4 ++-- dlls/msvcrt/locale.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 66feeb5..01f63ec 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -983,7 +983,7 @@ int CDECL MSVCRT__wrmdir(const MSVCRT_wchar_t * dir) /****************************************************************** * _splitpath_s (MSVCRT.@) */ -int _splitpath_s(const char* inpath, +int CDECL _splitpath_s(const char* inpath, char* drive, MSVCRT_size_t sz_drive, char* dir, MSVCRT_size_t sz_dir, char* fname, MSVCRT_size_t sz_fname, @@ -1075,7 +1075,7 @@ void CDECL _splitpath(const char *inpath, char *drv, char *dir, * * Secure version of _wsplitpath */ -int _wsplitpath_s(const MSVCRT_wchar_t* inpath, +int CDECL _wsplitpath_s(const MSVCRT_wchar_t* inpath, MSVCRT_wchar_t* drive, MSVCRT_size_t sz_drive, MSVCRT_wchar_t* dir, MSVCRT_size_t sz_dir, MSVCRT_wchar_t* fname, MSVCRT_size_t sz_fname, diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 0fbc0fe..8d71c11 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -655,7 +655,7 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) } /* _create_locale - not exported in native msvcrt */ -MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) +MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) { static const char collate[] = "COLLATE="; static const char ctype[] = "CTYPE=";

1 0

Alexandre Julliard : gdi32/tests: Add tests for DIB conversions from various source formats.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 1af12ff9b598cd67cd70a9bc1ea2faf7424e3a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af12ff9b598cd67cd70a9bc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 22:32:25 2011 +0200 gdi32/tests: Add tests for DIB conversions from various source formats. --- dlls/gdi32/tests/dib.c | 283 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 262 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1af12ff9b598cd67cd70a…

1 0

Alexandre Julliard : gdi32/tests: Add more tests for various palette formats as destination.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: deb195869ca3d02d1cac6c0d9dab85ea8d27b0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb195869ca3d02d1cac6c0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 23:14:48 2011 +0200 gdi32/tests: Add more tests for various palette formats as destination. --- dlls/gdi32/tests/dib.c | 255 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 249 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deb195869ca3d02d1cac6…

1 0

Alexandre Julliard : gdi32/tests: Add more tests for arbitrary 32-bpp bitfields as destination.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 5500e97d192bae4e15bfbef097a0d9274b6244cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5500e97d192bae4e15bfbef09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 13:06:49 2011 +0200 gdi32/tests: Add more tests for arbitrary 32-bpp bitfields as destination. --- dlls/gdi32/tests/dib.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 167 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5500e97d192bae4e15bfb…

1 0

Alexandre Julliard : gdi32: Use a reduced precision for RGB to palette mapping in DIB conversions.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: a9be526a9c81f43eabc43fedf4dad721e1fee3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9be526a9c81f43eabc43fedf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 00:47:05 2011 +0200 gdi32: Use a reduced precision for RGB to palette mapping in DIB conversions. --- dlls/gdi32/dibdrv/primitives.c | 70 +++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index da009a2..7322686 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -2404,6 +2404,12 @@ static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) return !memcmp(d1->color_table, d2->color_table, d1->color_table_size * sizeof(d1->color_table[0])); } +static inline DWORD rgb_lookup_colortable(const dib_info *dst, BYTE r, BYTE g, BYTE b) +{ + /* Windows reduces precision to 5 bits, probably in order to build some sort of lookup cache */ + return rgb_to_pixel_colortable( dst, (r & ~7) + 4, (g & ~7) + 4, (b & ~7) + 4 ); +} + static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_8(dst, 0, 0), *dst_pixel; @@ -2425,7 +2431,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, src_val >> 16, src_val >> 8, src_val ); + *dst_pixel++ = rgb_lookup_colortable(dst, src_val >> 16, src_val >> 8, src_val ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2441,10 +2447,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - src_val >> src->red_shift, - src_val >> src->green_shift, - src_val >> src->blue_shift ); + *dst_pixel++ = rgb_lookup_colortable(dst, + src_val >> src->red_shift, + src_val >> src->green_shift, + src_val >> src->blue_shift ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2460,10 +2466,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - get_field(src_val, src->red_shift, src->red_len), - get_field(src_val, src->green_shift, src->green_len), - get_field(src_val, src->blue_shift, src->blue_len)); + *dst_pixel++ = rgb_lookup_colortable(dst, + get_field(src_val, src->red_shift, src->red_len), + get_field(src_val, src->green_shift, src->green_len), + get_field(src_val, src->blue_shift, src->blue_len)); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2483,7 +2489,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec src_pixel = src_start; for(x = src_rect->left; x < src_rect->right; x++, src_pixel += 3) { - *dst_pixel++ = rgb_to_pixel_colortable(dst, src_pixel[2], src_pixel[1], src_pixel[0] ); + *dst_pixel++ = rgb_lookup_colortable(dst, src_pixel[2], src_pixel[1], src_pixel[0] ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2504,10 +2510,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - ((src_val >> 7) & 0xf8) | ((src_val >> 12) & 0x07), - ((src_val >> 2) & 0xf8) | ((src_val >> 7) & 0x07), - ((src_val << 3) & 0xf8) | ((src_val >> 2) & 0x07) ); + *dst_pixel++ = rgb_lookup_colortable(dst, + ((src_val >> 7) & 0xf8) | ((src_val >> 12) & 0x07), + ((src_val >> 2) & 0xf8) | ((src_val >> 7) & 0x07), + ((src_val << 3) & 0xf8) | ((src_val >> 2) & 0x07) ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2523,13 +2529,13 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - (((src_val >> src->red_shift) << 3) & 0xf8) | - (((src_val >> src->red_shift) >> 2) & 0x07), - (((src_val >> src->green_shift) << 3) & 0xf8) | - (((src_val >> src->green_shift) >> 2) & 0x07), - (((src_val >> src->blue_shift) << 3) & 0xf8) | - (((src_val >> src->blue_shift) >> 2) & 0x07) ); + *dst_pixel++ = rgb_lookup_colortable(dst, + (((src_val >> src->red_shift) << 3) & 0xf8) | + (((src_val >> src->red_shift) >> 2) & 0x07), + (((src_val >> src->green_shift) << 3) & 0xf8) | + (((src_val >> src->green_shift) >> 2) & 0x07), + (((src_val >> src->blue_shift) << 3) & 0xf8) | + (((src_val >> src->blue_shift) >> 2) & 0x07) ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2545,13 +2551,13 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - (((src_val >> src->red_shift) << 3) & 0xf8) | - (((src_val >> src->red_shift) >> 2) & 0x07), - (((src_val >> src->green_shift) << 2) & 0xfc) | - (((src_val >> src->green_shift) >> 4) & 0x03), - (((src_val >> src->blue_shift) << 3) & 0xf8) | - (((src_val >> src->blue_shift) >> 2) & 0x07) ); + *dst_pixel++ = rgb_lookup_colortable(dst, + (((src_val >> src->red_shift) << 3) & 0xf8) | + (((src_val >> src->red_shift) >> 2) & 0x07), + (((src_val >> src->green_shift) << 2) & 0xfc) | + (((src_val >> src->green_shift) >> 4) & 0x03), + (((src_val >> src->blue_shift) << 3) & 0xf8) | + (((src_val >> src->blue_shift) >> 2) & 0x07) ); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride; @@ -2567,10 +2573,10 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec for(x = src_rect->left; x < src_rect->right; x++) { src_val = *src_pixel++; - *dst_pixel++ = rgb_to_pixel_colortable(dst, - get_field(src_val, src->red_shift, src->red_len), - get_field(src_val, src->green_shift, src->green_len), - get_field(src_val, src->blue_shift, src->blue_len)); + *dst_pixel++ = rgb_lookup_colortable(dst, + get_field(src_val, src->red_shift, src->red_len), + get_field(src_val, src->green_shift, src->green_len), + get_field(src_val, src->blue_shift, src->blue_len)); } if(pad_size) memset(dst_pixel, 0, pad_size); dst_start += dst->stride;

1 0

Dan Kegel : winealsa.drv: When allocating opaque blobs for alsa, initialize them to zero.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 78e6287f71cca2b7dfb30cc0f1d2151f0f00da8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e6287f71cca2b7dfb30cc0f… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 13 11:14:18 2011 -0700 winealsa.drv: When allocating opaque blobs for alsa, initialize them to zero. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 640b191..29c3f72 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -258,7 +258,7 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char int err, device; snd_pcm_info_t *info; - info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_info_sizeof()); if(!info) return E_OUTOFMEMORY; @@ -943,7 +943,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - sw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_sw_params_sizeof()); + sw_params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof()); if(!sw_params){ hr = E_OUTOFMEMORY; goto exit; @@ -1364,7 +1364,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!fmt) return E_OUTOFMEMORY; - formats = HeapAlloc(GetProcessHeap(), 0, snd_pcm_format_mask_sizeof()); + formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_format_mask_sizeof()); if(!formats){ CoTaskMemFree(fmt); return E_OUTOFMEMORY;

1 0