January 2012 - Wine-commits

Aric Stewart : usp10: Limit runs in ScriptStringAnalyse to 255.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: f50f05da231ab5f1f463cd5ba929bb77009d1141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50f05da231ab5f1f463cd5ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:15 2012 -0600 usp10: Limit runs in ScriptStringAnalyse to 255. --- dlls/usp10/usp10.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index beecce9..1342303 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1772,19 +1772,12 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - while (hr == E_OUTOFMEMORY) + if FAILED(hr) { - SCRIPT_ITEM *tmp; - - num_items *= 2; - if (!(tmp = heap_realloc_zero(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) - goto error; - - analysis->pItem = tmp; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); + if (hr == E_OUTOFMEMORY) + hr = E_INVALIDARG; + goto error; } - if (hr != S_OK) goto error; /* set back to out of memory for default goto error behaviour */ hr = E_OUTOFMEMORY;

1 0

Stefan Dösinger : ddraw/tests: Port the depth blit test to ddraw7.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 8a82f0083ad1c7c0ad52a24b930522b6c27f54a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a82f0083ad1c7c0ad52a24b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 30 08:41:57 2012 +0100 ddraw/tests: Port the depth blit test to ddraw7. --- dlls/ddraw/tests/ddraw7.c | 183 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7564cb8..8eb7098 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -944,6 +944,188 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } +static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) +{ + IDirectDrawSurface7 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(rt); + return ret; +} + +static void test_depth_blit(void) +{ + IDirect3DDevice7 *device; + static struct + { + float x, y, z; + DWORD color; + } + quad1[] = + { + { -1.0, 1.0, 0.50f, 0xff00ff00}, + { 1.0, 1.0, 0.50f, 0xff00ff00}, + { -1.0, -1.0, 0.50f, 0xff00ff00}, + { 1.0, -1.0, 0.50f, 0xff00ff00}, + }; + static const D3DCOLOR expected_colors[4][4] = + { + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + }; + DDSURFACEDESC2 ddsd_new, ddsd_existing; + + IDirectDrawSurface7 *ds1, *ds2, *ds3, *rt; + RECT src_rect, dst_rect; + unsigned int i, j; + D3DCOLOR color; + HRESULT hr; + IDirect3D7 *d3d; + IDirectDraw7 *ddraw; + DDBLTFX fx; + HWND window; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw7 interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + ds1 = get_depth_stencil(device); + + memset(&ddsd_new, 0, sizeof(ddsd_new)); + ddsd_new.dwSize = sizeof(ddsd_new); + memset(&ddsd_existing, 0, sizeof(ddsd_existing)); + ddsd_existing.dwSize = sizeof(ddsd_existing); + hr = IDirectDrawSurface7_GetSurfaceDesc(ds1, &ddsd_existing); + ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + ddsd_new.dwWidth = ddsd_existing.dwWidth; + ddsd_new.dwHeight = ddsd_existing.dwHeight; + U4(ddsd_new).ddpfPixelFormat = U4(ddsd_existing).ddpfPixelFormat; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd_new, &ds2, NULL); + ok(SUCCEEDED(hr), "Failed to create a z buffer, hr %#x.\n", hr); + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd_new, &ds3, NULL); + ok(SUCCEEDED(hr), "Failed to create a z buffer, hr %#x.\n", hr); + IDirectDraw7_Release(ddraw); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the z buffer, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Different locations. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 320, 240, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Streched. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Flipped. */ + SetRect(&src_rect, 0, 480, 640, 0); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 480, 640, 0); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Depth -> color blit: Succeeds on Win7 + Radeon HD 5700, fails on WinXP + Radeon X1600 */ + + /* Depth blit inside a BeginScene / EndScene pair */ + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start scene, hr %#x.\n", hr); + /* From the current depth stencil */ + hr = IDirectDrawSurface7_Blt(ds2, NULL, ds1, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* To the current depth stencil */ + hr = IDirectDrawSurface7_Blt(ds1, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Between unbound surfaces */ + hr = IDirectDrawSurface7_Blt(ds3, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Avoid changing the depth stencil, it doesn't work properly on Windows. + * Instead use DDBLT_DEPTHFILL to clear the depth stencil. Unfortunately + * drivers disagree on the meaning of dwFillDepth. Only 0 seems to produce + * a reliable result(z = 0.0) */ + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + hr = IDirectDrawSurface7_Blt(ds2, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to clear the source z buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the color and z buffers, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface7_Blt(ds1, &dst_rect, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(ds3); + IDirectDrawSurface7_Release(ds2); + IDirectDrawSurface7_Release(ds1); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, + quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, expected_colors[i][j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + + IDirectDrawSurface7_Release(rt); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -960,4 +1142,5 @@ START_TEST(ddraw7) test_coop_level_d3d_state(); test_surface_interface_mismatch(); test_coop_level_threaded(); + test_depth_blit(); }

1 0

Alexandre Julliard : notepad: Use virtkeys for all accelerators.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 7115ef108b70fe43e7c578b00c8d6ce8226b30cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7115ef108b70fe43e7c578b00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:13:34 2012 +0100 notepad: Use virtkeys for all accelerators. --- po/ar.po | 114 +++++++++++++++++++++++++++++++------------ po/bg.po | 114 +++++++++++++++++++++++++++++++------------ po/ca.po | 102 ++++++++++++++++++++++++++++---------- po/cs.po | 96 ++++++++++++++++++++++++++++-------- po/da.po | 102 ++++++++++++++++++++++++++++---------- po/de.po | 104 +++++++++++++++++++++++++++++---------- po/el.po | 96 +++++++++++++++++++++++++++--------- po/en.po | 114 +++++++++++++++++++++++++++++++------------ po/en_US.po | 114 +++++++++++++++++++++++++++++++------------ po/eo.po | 96 +++++++++++++++++++++++++++--------- po/es.po | 96 +++++++++++++++++++++++++++--------- po/fa.po | 94 +++++++++++++++++++++++++++-------- po/fi.po | 94 +++++++++++++++++++++++++++-------- po/fr.po | 114 +++++++++++++++++++++++++++++++------------ po/he.po | 102 ++++++++++++++++++++++++++++---------- po/hi.po | 94 +++++++++++++++++++++++++++-------- po/hu.po | 102 ++++++++++++++++++++++++++++---------- po/it.po | 102 ++++++++++++++++++++++++++++---------- po/ja.po | 102 ++++++++++++++++++++++++++++---------- po/ko.po | 114 +++++++++++++++++++++++++++++++------------ po/lt.po | 114 +++++++++++++++++++++++++++++++------------ po/ml.po | 92 +++++++++++++++++++++++++++-------- po/nb_NO.po | 102 ++++++++++++++++++++++++++++---------- po/nl.po | 104 +++++++++++++++++++++++++++++---------- po/or.po | 92 +++++++++++++++++++++++++++-------- po/pa.po | 92 +++++++++++++++++++++++++++-------- po/pl.po | 114 +++++++++++++++++++++++++++++++------------ po/pt_BR.po | 106 +++++++++++++++++++++++++++++----------- po/pt_PT.po | 104 +++++++++++++++++++++++++++++---------- po/rm.po | 92 +++++++++++++++++++++++++++-------- po/ro.po | 104 +++++++++++++++++++++++++++++---------- po/ru.po | 102 ++++++++++++++++++++++++++++---------- po/sk.po | 94 +++++++++++++++++++++++++++-------- po/sl.po | 105 +++++++++++++++++++++++++++++----------- po/sr_RS(a)cyrillic.po | 100 ++++++++++++++++++++++++++++--------- po/sr_RS(a)latin.po | 100 ++++++++++++++++++++++++++++--------- po/sv.po | 102 ++++++++++++++++++++++++++++---------- po/te.po | 92 +++++++++++++++++++++++++++-------- po/th.po | 96 +++++++++++++++++++++++++++--------- po/tr.po | 96 +++++++++++++++++++++++++++--------- po/uk.po | 104 +++++++++++++++++++++++++++++---------- po/wa.po | 94 +++++++++++++++++++++++++++-------- po/wine.pot | 92 +++++++++++++++++++++++++++-------- po/zh_CN.po | 96 +++++++++++++++++++++++++++--------- po/zh_TW.po | 96 +++++++++++++++++++++++++++--------- programs/notepad/notepad.rc | 22 ++++---- 46 files changed, 3412 insertions(+), 1161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7115ef108b70fe43e7c57…

1 0

Alexandre Julliard : winefile: Get rid of the exit accelerator.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 90acb6842590b852d6b6e2142682d842afe2c0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=90acb6842590b852d6b6e2142… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:12:59 2012 +0100 winefile: Get rid of the exit accelerator. All window managers already have a key shortcut for that. --- po/ar.po | 170 +++++++++++++++++++--------------------- po/bg.po | 170 +++++++++++++++++++--------------------- po/ca.po | 169 +++++++++++++++++++--------------------- po/cs.po | 174 +++++++++++++++++++---------------------- po/da.po | 174 +++++++++++++++++++---------------------- po/de.po | 169 +++++++++++++++++++--------------------- po/el.po | 169 +++++++++++++++++++--------------------- po/en.po | 171 +++++++++++++++++++--------------------- po/en_US.po | 171 +++++++++++++++++++--------------------- po/eo.po | 174 +++++++++++++++++++---------------------- po/es.po | 169 +++++++++++++++++++--------------------- po/fa.po | 170 +++++++++++++++++++--------------------- po/fi.po | 169 +++++++++++++++++++--------------------- po/fr.po | 171 +++++++++++++++++++--------------------- po/he.po | 169 +++++++++++++++++++--------------------- po/hi.po | 169 +++++++++++++++++++--------------------- po/hu.po | 169 +++++++++++++++++++--------------------- po/it.po | 169 +++++++++++++++++++--------------------- po/ja.po | 169 +++++++++++++++++++--------------------- po/ko.po | 171 +++++++++++++++++++--------------------- po/lt.po | 171 +++++++++++++++++++--------------------- po/ml.po | 169 +++++++++++++++++++--------------------- po/nb_NO.po | 174 +++++++++++++++++++---------------------- po/nl.po | 169 +++++++++++++++++++--------------------- po/or.po | 169 +++++++++++++++++++--------------------- po/pa.po | 169 +++++++++++++++++++--------------------- po/pl.po | 171 +++++++++++++++++++--------------------- po/pt_BR.po | 169 +++++++++++++++++++--------------------- po/pt_PT.po | 169 +++++++++++++++++++--------------------- po/rm.po | 170 +++++++++++++++++++--------------------- po/ro.po | 174 +++++++++++++++++++---------------------- po/ru.po | 169 +++++++++++++++++++--------------------- po/sk.po | 169 +++++++++++++++++++--------------------- po/sl.po | 169 +++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 170 +++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 170 +++++++++++++++++++--------------------- po/sv.po | 169 +++++++++++++++++++--------------------- po/te.po | 169 +++++++++++++++++++--------------------- po/th.po | 170 +++++++++++++++++++--------------------- po/tr.po | 169 +++++++++++++++++++--------------------- po/uk.po | 169 +++++++++++++++++++--------------------- po/wa.po | 170 +++++++++++++++++++--------------------- po/wine.pot | 169 +++++++++++++++++++--------------------- po/zh_CN.po | 169 +++++++++++++++++++--------------------- po/zh_TW.po | 169 +++++++++++++++++++--------------------- programs/winefile/winefile.rc | 7 +-- 46 files changed, 3607 insertions(+), 4050 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90acb6842590b852d6b6e…

1 0

Alexandre Julliard : view: Get rid of the quit accelerator.
by Alexandre Julliard 30 Jan '12

30 Jan '12

1 0

Alexandre Julliard : winemine: Get rid of the exit accelerator.
by Alexandre Julliard 30 Jan '12

30 Jan '12

1 0

Thomas Faber : comctl32: Fix MSVC build in monthcal.c.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 05253f900fa62a48c848b99f80c89523404806fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=05253f900fa62a48c848b99f8… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jan 27 23:56:10 2012 +0100 comctl32: Fix MSVC build in monthcal.c. --- dlls/comctl32/monthcal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 83adf60..e148a62 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -160,8 +160,8 @@ static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; -static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; +static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; +static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; /* Prev/Next buttons */ enum nav_direction

1 0

Dmitry Timoshkov : riched20: Fix some GDI object leaks.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: e2264859c8f8837b808e2ef9ce1dc0fe6b571e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2264859c8f8837b808e2ef9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jan 28 20:27:03 2012 +0800 riched20: Fix some GDI object leaks. --- dlls/riched20/richole.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8e90204..9c74cfe 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1669,6 +1669,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); } + DeleteDC(hMemDC); if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF:

1 0

Nikolay Sivov : urlmon: Recognize <head> start tag as text/html MIME type.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: f2dfe86ac442839ed93d71c1d96b36aa1d0c25b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2dfe86ac442839ed93d71c1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 23:33:04 2012 +0300 urlmon: Recognize <head> start tag as text/html MIME type. --- dlls/urlmon/tests/misc.c | 10 +++++++++- dlls/urlmon/urlmon_main.c | 20 +++++++++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ea634c1..bbb657f 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -563,6 +563,10 @@ static BYTE data83[] = {'.','s','n','d'}; static BYTE data84[] = {'.','s','n','d',0,'<','h','t','m','l','>',1,1}; static BYTE data85[] = {'.','S','N','D',0}; static BYTE data86[] = {0x49,0x49,0x2a,0xff}; +static BYTE data87[] = {' ','<','h','e','a','d'}; +static BYTE data88[] = {' ','<','h','e','a','d','>'}; +static BYTE data89[] = {'\t','\r','<','h','e','a','d','>'}; +static BYTE data90[] = {'<','H','e','A','d','>'}; static const struct { BYTE *data; @@ -654,7 +658,11 @@ static const struct { {data83, sizeof(data83), mimeTextPlain}, {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, {data85, sizeof(data85), mimeTextPlain}, - {data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain} + {data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain}, + {data87, sizeof(data87), mimeTextPlain}, + {data88, sizeof(data88), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data89, sizeof(data89), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data90, sizeof(data90), mimeTextHtml, mimeTextPlain /* IE8 */} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index edd6930..a3d1c10 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -566,13 +566,19 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) if(size < 5) return FALSE; - for(i=0; i < size-5; i++) { - if(b[i] == '<' - && (b[i+1] == 'h' || b[i+1] == 'H') - && (b[i+2] == 't' || b[i+2] == 'T') - && (b[i+3] == 'm' || b[i+3] == 'M') - && (b[i+4] == 'l' || b[i+4] == 'L')) - return TRUE; + for(i = 0; i < size-5; i++) { + if((b[i] == '<' + && (b[i+1] == 'h' || b[i+1] == 'H') + && (b[i+2] == 't' || b[i+2] == 'T') + && (b[i+3] == 'm' || b[i+3] == 'M') + && (b[i+4] == 'l' || b[i+4] == 'L')) || + ((size - i >= 6) + && b[i] == '<' + && (b[i+1] == 'h' || b[i+1] == 'H') + && (b[i+2] == 'e' || b[i+2] == 'E') + && (b[i+3] == 'a' || b[i+3] == 'A') + && (b[i+4] == 'd' || b[i+4] == 'D') + && b[i+5] == '>')) return TRUE; } return FALSE;

1 0

Frédéric Delanoy : ws2_32/tests: Remove dead code in test_completion_port (Coverity).
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 09213db643cd77b328d40fff04d9ac160f1d69a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09213db643cd77b328d40fff0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 29 22:37:38 2012 +0100 ws2_32/tests: Remove dead code in test_completion_port (Coverity). --- dlls/ws2_32/tests/sock.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e111f8..2de23c9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5599,9 +5599,6 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - - if (dest != INVALID_SOCKET) - closesocket(dest); if (src != INVALID_SOCKET) closesocket(src); if (connector != INVALID_SOCKET)

1 0