January 2012 - Wine-commits

Jacek Caban : jscript: Run sanity check with invoke_version 0.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: afcb9a013067d5bcaf04bdba6e186e0f5977b156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcb9a013067d5bcaf04bdba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:43:38 2012 +0100 jscript: Run sanity check with invoke_version 0. --- dlls/jscript/tests/run.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 66f70b9..e5bd072 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,7 +108,7 @@ static const CHAR test_valA[] = "testVal"; static BOOL strict_dispid_check; static const char *test_name = "(null)"; static IDispatch *script_disp; -static int invoke_version = 2; +static int invoke_version; static IActiveScriptError *script_error; /* Returns true if the user interface is in English. Note that this does not @@ -1680,6 +1680,7 @@ START_TEST(run) if(!check_jscript()) { win_skip("Broken engine, probably too old\n"); }else if(argc > 2) { + invoke_version = 2; run_from_file(argv[2]); }else { trace("invoke version 0\n");

1 0

Jacek Caban : jscript: Fixed jscript tests on some broken versions.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 5561ee635c02a794cde8811d6c84f4a0cf9b93bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5561ee635c02a794cde8811d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:48:00 2012 +0100 jscript: Fixed jscript tests on some broken versions. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 152329b..7c81328 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -644,7 +644,7 @@ static void test_aggregation(void) &IID_IUnknown, (void**)&unk); ok(hres == CLASS_E_NOAGGREGATION || broken(E_INVALIDARG) /* win2k */, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); - ok(!unk, "unk = %p\n", unk); + ok(!unk || broken(unk != NULL), "unk = %p\n", unk); } static BOOL check_jscript(void)

1 0

Francois Gouget : comdlg32: Specify a context for the luminance and saturation abbreviations.
by Alexandre Julliard 12 Jan '12

12 Jan '12

1 0

Alexandre Julliard : gdi32: Simplify the CreateCompatibleBitmap implementation.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 9ecc1e070212f5218bfe743c665010f35c31c217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ecc1e070212f5218bfe743c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 21:28:19 2012 +0100 gdi32: Simplify the CreateCompatibleBitmap implementation. --- dlls/gdi32/bitmap.c | 90 +++++++++++++-------------------------------------- 1 files changed, 23 insertions(+), 67 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a539b9d..cee9204 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -135,78 +135,34 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, */ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) { - HBITMAP hbmpRet = 0; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *bi = (BITMAPINFO *)buffer; + DIBSECTION dib; - TRACE("(%p,%d,%d) =\n", hdc, width, height); + TRACE("(%p,%d,%d)\n", hdc, width, height); if (GetObjectType( hdc ) != OBJ_MEMDC) - { - hbmpRet = CreateBitmap(width, height, - GetDeviceCaps(hdc, PLANES), - GetDeviceCaps(hdc, BITSPIXEL), - NULL); - } - else /* Memory DC */ - { - DIBSECTION dib; - HBITMAP bitmap = GetCurrentObject( hdc, OBJ_BITMAP ); - INT size = GetObjectW( bitmap, sizeof(dib), &dib ); - - if (!size) return 0; - - if (size == sizeof(BITMAP)) - { - /* A device-dependent bitmap is selected in the DC */ - hbmpRet = CreateBitmap(width, height, - dib.dsBm.bmPlanes, - dib.dsBm.bmBitsPixel, - NULL); - } - else - { - /* A DIB section is selected in the DC */ - BITMAPINFO *bi; - void *bits; - - /* Allocate memory for a BITMAPINFOHEADER structure and a - color table. The maximum number of colors in a color table - is 256 which corresponds to a bitmap with depth 8. - Bitmaps with higher depths don't have color tables. */ - bi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + return CreateBitmap( width, height, + GetDeviceCaps(hdc, PLANES), GetDeviceCaps(hdc, BITSPIXEL), NULL ); - if (bi) - { - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biWidth = width; - bi->bmiHeader.biHeight = height; - bi->bmiHeader.biPlanes = dib.dsBmih.biPlanes; - bi->bmiHeader.biBitCount = dib.dsBmih.biBitCount; - bi->bmiHeader.biCompression = dib.dsBmih.biCompression; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biXPelsPerMeter = dib.dsBmih.biXPelsPerMeter; - bi->bmiHeader.biYPelsPerMeter = dib.dsBmih.biYPelsPerMeter; - bi->bmiHeader.biClrUsed = dib.dsBmih.biClrUsed; - bi->bmiHeader.biClrImportant = dib.dsBmih.biClrImportant; - - if (bi->bmiHeader.biCompression == BI_BITFIELDS) - { - /* Copy the color masks */ - CopyMemory(bi->bmiColors, dib.dsBitfields, 3 * sizeof(DWORD)); - } - else if (bi->bmiHeader.biBitCount <= 8) - { - /* Copy the color table */ - GetDIBColorTable(hdc, 0, 256, bi->bmiColors); - } - - hbmpRet = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); - HeapFree(GetProcessHeap(), 0, bi); - } - } + switch (GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) + { + case sizeof(BITMAP): /* A device-dependent bitmap is selected in the DC */ + return CreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); + + case sizeof(DIBSECTION): /* A DIB section is selected in the DC */ + bi->bmiHeader = dib.dsBmih; + bi->bmiHeader.biWidth = width; + bi->bmiHeader.biHeight = height; + if (dib.dsBmih.biCompression == BI_BITFIELDS) /* copy the color masks */ + memcpy(bi->bmiColors, dib.dsBitfields, sizeof(dib.dsBitfields)); + else if (dib.dsBmih.biBitCount <= 8) /* copy the color table */ + GetDIBColorTable(hdc, 0, 256, bi->bmiColors); + return CreateDIBSection( hdc, bi, DIB_RGB_COLORS, NULL, NULL, 0 ); + + default: + return 0; } - - TRACE("\t\t%p\n", hbmpRet); - return hbmpRet; }

1 0

Alexandre Julliard : gdi32: Store foreground/ background color even when passed CLR_INVALID.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: f8fa169da0c8fd7aa75c3d87a6d7c5ba1625bf20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8fa169da0c8fd7aa75c3d87a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 15:51:54 2012 +0100 gdi32: Store foreground/background color even when passed CLR_INVALID. --- dlls/gdi32/dc.c | 16 ++++------------ dlls/gdi32/tests/dc.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b1065de..e4f31814 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -853,12 +853,8 @@ COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color ) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetBkColor ); - color = physdev->funcs->pSetBkColor( physdev, color ); - if (color != CLR_INVALID) - { - ret = dc->backgroundColor; - dc->backgroundColor = color; - } + ret = dc->backgroundColor; + dc->backgroundColor = physdev->funcs->pSetBkColor( physdev, color ); release_dc_ptr( dc ); } return ret; @@ -894,12 +890,8 @@ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextColor ); - color = physdev->funcs->pSetTextColor( physdev, color ); - if (color != CLR_INVALID) - { - ret = dc->textColor; - dc->textColor = color; - } + ret = dc->textColor; + dc->textColor = physdev->funcs->pSetTextColor( physdev, color ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 25d6982..d8276f4 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -54,6 +54,41 @@ static void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } +static void test_dc_values(void) +{ + HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + COLORREF color; + + ok( hdc != NULL, "CreateDC failed\n" ); + color = SetBkColor( hdc, 0x12345678 ); + ok( color == 0xffffff, "initial color %08x\n", color ); + color = GetBkColor( hdc ); + ok( color == 0x12345678, "wrong color %08x\n", color ); + color = SetBkColor( hdc, 0xffffffff ); + ok( color == 0x12345678, "wrong color %08x\n", color ); + color = GetBkColor( hdc ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = SetBkColor( hdc, 0 ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = GetBkColor( hdc ); + ok( color == 0, "wrong color %08x\n", color ); + + color = SetTextColor( hdc, 0xffeeddcc ); + ok( color == 0, "initial color %08x\n", color ); + color = GetTextColor( hdc ); + ok( color == 0xffeeddcc, "wrong color %08x\n", color ); + color = SetTextColor( hdc, 0xffffffff ); + ok( color == 0xffeeddcc, "wrong color %08x\n", color ); + color = GetTextColor( hdc ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = SetTextColor( hdc, 0 ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = GetTextColor( hdc ); + ok( color == 0, "wrong color %08x\n", color ); + + DeleteDC( hdc ); +} + static void test_savedc_2(void) { HWND hwnd; @@ -999,6 +1034,7 @@ static void test_printer_dc(void) START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandle("gdi32.dll"), "SetLayout"); + test_dc_values(); test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW();

1 0

Andrew Eikum : winealsa.drv: Remove "strange number of channels" FIXME.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: d82cca65edbe76a8d720f6e4d1de047139118140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82cca65edbe76a8d720f6e4d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 12 08:06:38 2012 -0600 winealsa.drv: Remove "strange number of channels" FIXME. --- dlls/winealsa.drv/mmdevdrv.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 29933e8..55035bd 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1407,11 +1407,9 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, goto exit; } - if(max_channels > 2){ - FIXME("Don't know what to do with %u channels, pretending there's " - "only 2 channels\n", max_channels); + if(max_channels > 2) fmt->Format.nChannels = 2; - }else + else fmt->Format.nChannels = max_channels; fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels);

1 0

Jörg Höhle : winealsa: Reset accounts for dropped frames in capture mode.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: be90732e5e9658882a4b0d19d5eaac7f473dd03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90732e5e9658882a4b0d19d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 11 23:13:23 2012 +0100 winealsa: Reset accounts for dropped frames in capture mode. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 55035bd..e791feb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1776,9 +1776,13 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(snd_pcm_prepare(This->pcm_handle) < 0) WARN("snd_pcm_prepare failed\n"); - This->last_pos_frames = 0; + if(This->dataflow == eRender){ + This->written_frames = 0; + This->last_pos_frames = 0; + }else{ + This->written_frames += This->held_frames; + } This->held_frames = 0; - This->written_frames = 0; This->lcl_offs_frames = 0; LeaveCriticalSection(&This->lock);

1 0

Jörg Höhle : winealsa: Stop may not use snd_pcm_drop or lose written frames.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 77e01019c5ceb7fd2389764328a10903a99fb1c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e01019c5ceb7fd238976432… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 15 10:18:39 2011 +0100 winealsa: Stop may not use snd_pcm_drop or lose written frames. --- dlls/winealsa.drv/mmdevdrv.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e791feb..8e79c6e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1718,14 +1718,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) return S_FALSE; } - if(snd_pcm_drop(This->pcm_handle) < 0) - WARN("snd_pcm_drop failed\n"); - - if(snd_pcm_reset(This->pcm_handle) < 0) - WARN("snd_pcm_reset failed\n"); - - if(snd_pcm_prepare(This->pcm_handle) < 0) - WARN("snd_pcm_prepare failed\n"); + /* Stop without losing written frames or position. + * snd_pcm_pause would be appropriate but is unsupported by dmix. + * snd_pcm_drain yields EAGAIN in NONBLOCK mode, except with Pulse. */ event = CreateEventW(NULL, TRUE, FALSE, NULL); wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTRANSFORMSTATETYPE typedef.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: f38e94af7cc22941876634bb05925801690c5235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38e94af7cc22941876634bb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 11 21:27:32 2012 +0100 wined3d: Get rid of the WINED3DTRANSFORMSTATETYPE typedef. --- dlls/ddraw/device.c | 69 ++++-- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/viewport.c | 4 +- dlls/wined3d/context.c | 8 +- dlls/wined3d/device.c | 16 +- dlls/wined3d/state.c | 611 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 10 +- dlls/wined3d/utils.c | 37 ++-- dlls/wined3d/wined3d_private.h | 8 +- include/wine/wined3d.h | 45 ++-- 10 files changed, 419 insertions(+), 391 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f38e94af7cc2294187663…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DBASISTYPE typedef.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 7dac3e0921b7b2267fc618b544bca958378cd915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dac3e0921b7b2267fc618b54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 11 21:27:33 2012 +0100 wined3d: Get rid of the WINED3DBASISTYPE typedef. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/utils.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 15 +++++++-------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 61fbb85..707e364 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -834,7 +834,7 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch */ ERR("Vertex stride is not a multiple of sizeof(GLfloat)\n"); } - if (info->basis != WINED3DBASIS_BEZIER) + if (info->basis != WINED3D_BASIS_BEZIER) FIXME("Basis is %s, how to handle this?\n", debug_d3dbasis(info->basis)); if (info->degree != WINED3D_DEGREE_CUBIC) FIXME("Degree is %s, how to handle this?\n", debug_d3ddegree(info->degree)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 10db6d8..917d297 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2398,11 +2398,13 @@ const char *debug_glerror(GLenum error) { } } -const char *debug_d3dbasis(WINED3DBASISTYPE basis) { - switch(basis) { - case WINED3DBASIS_BEZIER: return "WINED3DBASIS_BEZIER"; - case WINED3DBASIS_BSPLINE: return "WINED3DBASIS_BSPLINE"; - case WINED3DBASIS_INTERPOLATE: return "WINED3DBASIS_INTERPOLATE"; +const char *debug_d3dbasis(enum wined3d_basis_type basis) +{ + switch (basis) + { + case WINED3D_BASIS_BEZIER: return "WINED3D_BASIS_BEZIER"; + case WINED3D_BASIS_BSPLINE: return "WINED3D_BASIS_BSPLINE"; + case WINED3D_BASIS_INTERPOLATE: return "WINED3D_BASIS_INTERPOLATE"; default: return "unrecognized"; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15e29ec..80162b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2508,7 +2508,7 @@ const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN const char *debug_d3dpool(WINED3DPOOL pool) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; -const char *debug_d3dbasis(WINED3DBASISTYPE basis) DECLSPEC_HIDDEN; +const char *debug_d3dbasis(enum wined3d_basis_type basis) DECLSPEC_HIDDEN; const char *debug_d3ddegree(enum wined3d_degree_type order) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d5cf9aa..5366c18 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -641,13 +641,12 @@ enum wined3d_transform_state #define WINED3D_TS_WORLD_MATRIX(index) (enum wined3d_transform_state)(index + 256) -typedef enum _WINED3DBASISTYPE +enum wined3d_basis_type { - WINED3DBASIS_BEZIER = 0, - WINED3DBASIS_BSPLINE = 1, - WINED3DBASIS_INTERPOLATE = 2, - WINED3DBASIS_FORCE_DWORD = 0x7fffffff -} WINED3DBASISTYPE; + WINED3D_BASIS_BEZIER = 0, + WINED3D_BASIS_BSPLINE = 1, + WINED3D_BASIS_INTERPOLATE = 2, +}; typedef enum _WINED3DCUBEMAP_FACES { @@ -1583,7 +1582,7 @@ struct wined3d_rect_patch_info UINT width; UINT height; UINT stride; - WINED3DBASISTYPE basis; + enum wined3d_basis_type basis; enum wined3d_degree_type degree; }; @@ -1591,7 +1590,7 @@ struct wined3d_tri_patch_info { UINT start_vertex_offset; UINT vertex_count; - WINED3DBASISTYPE basis; + enum wined3d_basis_type basis; enum wined3d_degree_type degree; };

1 0