January 2014 - Wine-Commits

André Hentschel : setupapi/tests: Remove dead code.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 0d688c7d520696dc26457317ec97864be5039a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d688c7d520696dc26457317e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:31:06 2014 +0100 setupapi/tests: Remove dead code. --- dlls/setupapi/tests/stringtable.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 8048f8a..2818e30 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -48,10 +48,6 @@ static HSTRING_TABLE (WINAPI *pStringTableInitializeEx)(DWORD, DWORD); static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); -#if 0 -static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); -static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); -#endif static HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0};

1 0

Jactry Zeng : riched20: Add UTF8 support for EM_SETTEXTEX.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 88214a5874b4fa3f009444b65a8a424105454f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88214a5874b4fa3f009444b65… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jan 21 08:55:29 2014 +0800 riched20: Add UTF8 support for EM_SETTEXTEX. --- dlls/riched20/editor.c | 16 ++++++++++++---- dlls/riched20/tests/editor.c | 8 ++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85848bc..e419bf6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3329,8 +3329,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, SETTEXTEX *pStruct = (SETTEXTEX *)wParam; int from, to, len; ME_Style *style; - BOOL bRtf, bUnicode, bSelection; + BOOL bRtf, bUnicode, bSelection, bUTF8; int oldModify = editor->nModifyStep; + static const char utf8_bom[] = {0xef, 0xbb, 0xbf}; if (!pStruct) return 0; @@ -3339,6 +3340,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf", 6))); bUnicode = !bRtf && pStruct->codepage == CP_UNICODE; + bUTF8 = (lParam && (!strncmp((char *)lParam, utf8_bom, 3))); TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), @@ -3364,9 +3366,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len = lParam ? strlen((char *)lParam) : 0; } } else { - wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); - ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_EndToUnicode(pStruct->codepage, wszText); + if (bUTF8 && !bUnicode) { + wszText = ME_ToUnicode(CP_UTF8, (void *)(lParam+3), &len); + ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(CP_UTF8, wszText); + } else { + wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); + ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(pStruct->codepage, wszText); + } } if (bSelection) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ae0f72f..2efee9a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3901,17 +3901,17 @@ static void test_EM_SETTEXTEX(void) setText.codepage = CP_ACP; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); - todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); - todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); setText.flags = 0; setText.codepage = CP_UTF8; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); - todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); - todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); DestroyWindow(hwndRichEdit); }

1 0

Andrey Gusev : Assorted spelling and typos fixes.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e7f0a8a081dd088bf50fd6e6b8b846b3c05b75a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f0a8a081dd088bf50fd6e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 22 13:25:54 2014 +0200 Assorted spelling and typos fixes. --- dlls/d3d9/tests/device.c | 2 +- dlls/d3drm/frame.c | 4 ++-- dlls/d3dxof/d3dxof.c | 2 +- dlls/d3dxof/main.c | 2 +- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 6 +++--- dlls/dbghelp/storage.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- dlls/ddraw/tests/ddraw7.c | 10 +++++----- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/utils.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f0a8a081dd088bf50fd…

1 0

Henri Verbeet : ddraw: Allow attaching surfaces other than depth buffers in ddraw_surface4_AddAttachedSurface ().
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 7c6ca2077ffef55a69f1605bb819d2595fc802da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6ca2077ffef55a69f1605bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:52 2014 +0100 ddraw: Allow attaching surfaces other than depth buffers in ddraw_surface4_AddAttachedSurface(). --- dlls/ddraw/surface.c | 84 +++++++++++++++++++-------------------------- dlls/ddraw/tests/ddraw4.c | 14 ++++---- 2 files changed, 43 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f569ae8..c503992 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1670,106 +1670,94 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface4(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface4(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface7_AddAttachedSurface(&This->IDirectDrawSurface7_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface7_iface : NULL); - if (FAILED(hr)) - { - return hr; - } - attachment_impl->attached_iface = (IUnknown *)attachment; - IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); - return hr; -} -static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) -{ - struct ddraw_surface *This = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); - HRESULT hr; - - TRACE("iface %p, attachment %p.\n", iface, attachment); - /* Tests suggest that * -> offscreen plain surfaces can be attached to other offscreen plain surfaces * -> offscreen plain surfaces can be attached to primaries * -> primaries can be attached to offscreen plain surfaces * -> z buffers can be attached to primaries */ - if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) + if (surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN)) { /* Sizes have to match */ - if (attachment_impl->surface_desc.dwWidth != This->surface_desc.dwWidth - || attachment_impl->surface_desc.dwHeight != This->surface_desc.dwHeight) + if (attachment_impl->surface_desc.dwWidth != surface->surface_desc.dwWidth + || attachment_impl->surface_desc.dwHeight != surface->surface_desc.dwHeight) { WARN("Surface sizes do not match.\n"); return DDERR_CANNOTATTACHSURFACE; } - /* OK */ } - else if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) - && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER)) - { - /* OK */ - } - else + else if (!(surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) + || !(attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER))) { WARN("Invalid attachment combination.\n"); return DDERR_CANNOTATTACHSURFACE; } - hr = ddraw_surface_attach_surface(This, attachment_impl); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface_attach_surface(surface, attachment_impl))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); return hr; } +static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); + struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); + HRESULT hr; + + TRACE("iface %p, attachment %p.\n", iface, attachment); + + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) + return hr; + + attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); + return hr; +} + static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface2(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface2(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); return hr; } static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *iface, IDirectDrawSurface *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); return hr; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 939a9b6..04d5049 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6005,25 +6005,25 @@ static void test_surface_attachment(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface1, surface2); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); /* Try the reverse without detaching first. */ hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface1); - todo_wine ok(hr == DDERR_SURFACEALREADYATTACHED, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface1); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); /* Try to detach reversed. */ hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); ok(hr == DDERR_CANNOTDETACHSURFACE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface2, 0, surface1); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface3); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface2, 0, surface3); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface1, surface4); ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7( ).
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: fffaf03c0d722aa4e9036ec69e77c2d9b2c60ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffaf03c0d722aa4e9036ec69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:51 2014 +0100 ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7(). --- dlls/ddraw/tests/ddraw1.c | 247 ++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 247 ++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 273 ++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 255 +++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 583 ------------------------------------------- 5 files changed, 1022 insertions(+), 583 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fffaf03c0d722aa4e9036…

1 0

André Hentschel : d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 28b9e1b947ae362825b5e3745bc67388f62d11db URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b9e1b947ae362825b5e3745… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:21 2014 +0100 d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles. --- dlls/d3dx9_36/tests/mesh.c | 7 ++++--- dlls/d3dx9_36/tests/shader.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 2eb2146..1c3748f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4070,14 +4070,15 @@ static void D3DXCreateTextTest(void) d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); -#if 0 +if (0) +{ /* too much detail requested, so will appear to hang */ trace("Waiting for D3DXCreateText to finish with deviation = FLT_MIN ...\n"); - hr = D3DXCreateText(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); + hr = D3DXCreateTextA(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); trace("D3DXCreateText finish with deviation = FLT_MIN\n"); -#endif +} hr = D3DXCreateTextA(device, hdc, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c0d5f00..4406cd1 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1564,11 +1564,12 @@ static void test_get_shader_samplers(void) UINT count = 2; HRESULT hr; -#if 0 +if (0) +{ /* crashes if bytecode is NULL */ hr = D3DXGetShaderSamplers(NULL, NULL, &count); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); -#endif +} hr = D3DXGetShaderSamplers(get_shader_samplers_blob, NULL, NULL); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK);

1 0

André Hentschel : d3dxof/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 81ea0cd86f67474056660f97bfce3c2eb1dd9df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ea0cd86f67474056660f97b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:33 2014 +0100 d3dxof/tests: Avoid preprocessor check to ensure it compiles. --- dlls/d3dxof/tests/d3dxof.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f4ab68a..67baac0 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -1184,12 +1184,13 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); -#if 0 +if (0) +{ hr = IDirectXFileDataReference_GetId(lpDirectXFileData, &clsid); ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); hr = IDirectXFileDataReference_GetName(lpDirectXFileData, name, &len); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); -#endif +} IDirectXFileDataReference_Resolve(p2, &pfdo); process_data(pfdo, level); IDirectXFileData_Release(pfdo);

1 0

Jactry Zeng : riched20: Use codepage in ME_ToUnicode.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: eb8f47518eae395ea10cd5defd744dfe54e83fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8f47518eae395ea10cd5def… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jan 21 08:42:58 2014 +0800 riched20: Use codepage in ME_ToUnicode. --- dlls/riched20/editor.c | 21 +++++++++++---------- dlls/riched20/editor.h | 4 ++-- dlls/riched20/string.c | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 119061f..85848bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3364,10 +3364,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len = lParam ? strlen((char *)lParam) : 0; } } else { - /* FIXME: make use of pStruct->codepage in the to unicode translation */ - wszText = ME_ToUnicode(bUnicode, (void *)lParam, &len); + wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_EndToUnicode(bUnicode, wszText); + ME_EndToUnicode(pStruct->codepage, wszText); } if (bSelection) { @@ -3555,7 +3554,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int from, to, nStartCursor; ME_Style *style; int len = 0; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &len); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &len); TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3570,7 +3570,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, */ if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); - ME_EndToUnicode(unicode, wszText); + ME_EndToUnicode(codepage, wszText); ME_CommitUndo(editor); ME_UpdateSelectionLinkAttribute(editor); if (!wParam) @@ -3626,7 +3626,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, else { int textLen; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &textLen); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &textLen); TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ if (textLen > 0) { @@ -3643,7 +3644,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); } - ME_EndToUnicode(unicode, wszText); + ME_EndToUnicode(codepage, wszText); } } else @@ -4035,8 +4036,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { WCHAR *textW; int len; - - textW = ME_ToUnicode(unicode, text, &len); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + textW = ME_ToUnicode(codepage, text, &len); if (!(editor->styleFlags & ES_MULTILINE)) { len = 0; @@ -4044,7 +4045,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len++; } ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); - ME_EndToUnicode(unicode, textW); + ME_EndToUnicode(codepage, textW); ME_SetCursorToStart(editor, &editor->pCursors[0]); ME_SetCursorToStart(editor, &editor->pCursors[1]); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ae8b81a..af7291f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -110,8 +110,8 @@ BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSP #define CP_UNICODE 1200 /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; -void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) DECLSPEC_HIDDEN; +void ME_EndToUnicode(LONG codepage, LPVOID psz) DECLSPEC_HIDDEN; static inline int ME_IsWSpace(WCHAR ch) { diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index f4cd320..12e4ad7 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -172,30 +172,30 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT } } -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) { *len = 0; if (!psz) return NULL; - if (unicode) + if (codepage == CP_UNICODE) { *len = lstrlenW(psz); return psz; } else { WCHAR *tmp; - int nChars = MultiByteToWideChar(CP_ACP, 0, psz, -1, NULL, 0); + int nChars = MultiByteToWideChar(codepage, 0, psz, -1, NULL, 0); if(!nChars) return NULL; if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) - *len = MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars) - 1; + *len = MultiByteToWideChar(codepage, 0, psz, -1, tmp, nChars) - 1; return tmp; } } -void ME_EndToUnicode(BOOL unicode, LPVOID psz) +void ME_EndToUnicode(LONG codepage, LPVOID psz) { - if (!unicode) + if (codepage != CP_UNICODE) FREE_OBJ(psz); }

1 0

André Hentschel : comctl32/tests: Avoid preprocessor checks to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e32237d34ade0f29af579fde39dd85ac34f6f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32237d34ade0f29af579fde3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:17 2014 +0100 comctl32/tests: Avoid preprocessor checks to ensure it compiles. --- dlls/comctl32/tests/imagelist.c | 5 +++-- dlls/comctl32/tests/monthcal.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index caf7539..38fb744 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -809,7 +809,8 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, image_size = DIB_GetWidthBytes(bmih->biWidth, bmih->biBitCount) * bmih->biHeight; ok(bmih->biSizeImage == image_size, "wrong biSizeImage %u\n", bmih->biSizeImage); -#if 0 + +if (0) { char fname[256]; FILE *f; @@ -818,7 +819,7 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, fwrite(bm_data, 1, bm_data_size, f); fclose(f); } -#endif + return hdr_size + image_size; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 145d20f..78ef541 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1082,7 +1082,8 @@ static void test_hittest(void) expect(mchit.uHit, res); expect_hex(MCHT_CALENDARDATEPREV, res); -#if 0 +if (0) +{ /* (125, 115) is in active area - date from this month */ mchit.pt.x = 125; mchit.pt.y = 115; @@ -1091,7 +1092,7 @@ static void test_hittest(void) expect(115, mchit.pt.y); expect(mchit.uHit, res); expect(MCHT_CALENDARDATE, res); -#endif +} /* in active area - date from next month */ mchit.pt.x = 11 * r.right / 14;

1 0

André Hentschel : d3d10/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 10fc362dfeb9dfd43469f3572b846b7a88c615c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fc362dfeb9dfd43469f3572… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:24 2014 +0100 d3d10/tests: Avoid preprocessor check to ensure it compiles. --- dlls/d3d10/tests/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e16d458..a07bc6c 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2679,11 +2679,12 @@ static void test_effect_local_shader(ID3D10Device *device) p = null_technique->lpVtbl->GetPassByName(null_technique, "invalid"); ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); -#if 0 +if (0) +{ /* This crashes on W7/DX10, if t is a valid technique and name=NULL. */ p = t->lpVtbl->GetPassByName(t, NULL); ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); -#endif +} p = t->lpVtbl->GetPassByIndex(t, 0xffffffff); ok(null_pass == p, "GetPassByIndex got %p, expected %p\n", p, null_pass);

1 0

André Hentschel : shlwapi/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e98844e5c92e47a5a8d15e70007ff8f06982cb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98844e5c92e47a5a8d15e700… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 24 23:07:39 2014 +0100 shlwapi/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shlwapi/tests/istream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index bacd0e6..95485b9 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -283,10 +283,11 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); -#if 0 /* This test crashes on WinXP SP2 */ +if (0) /* This test crashes on WinXP SP2 */ +{ ret = (*pSHCreateStreamOnFileA)(test_file, mode | stgm, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); -#endif +} stream = NULL; ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CONVERT | stgm, &stream);

1 0

Henri Verbeet : d3d10core/tests: Use D3D10CreateDevice() to create a device.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 80ce3b319a0b62016e91abc438d577b866154f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ce3b319a0b62016e91abc43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:55 2014 +0100 d3d10core/tests: Use D3D10CreateDevice() to create a device. --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/device.c | 55 ++++++-------------------------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 0dfec79..ca96a25 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d10core.dll -IMPORTS = d3d10core dxgi +IMPORTS = d3d10 C_SRCS = \ device.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 63b65bc..8278afc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -21,57 +21,18 @@ #include "d3d10.h" #include "wine/test.h" -HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); - static ID3D10Device *create_device(void) { - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; - ID3D10Device *device = NULL; - HRESULT hr; - - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - if (FAILED(hr)) goto cleanup; - - hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - } - - if (FAILED(hr)) - { - HMODULE d3d10ref; - - trace("Failed to create a HW device, trying REF\n"); - if (adapter) IDXGIAdapter_Release(adapter); - adapter = NULL; - - d3d10ref = LoadLibraryA("d3d10ref.dll"); - if (!d3d10ref) - { - trace("d3d10ref.dll not available, unable to create a REF device\n"); - goto cleanup; - } - - hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); - FreeLibrary(d3d10ref); - ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - } + ID3D10Device *device; -cleanup: - if (adapter) IDXGIAdapter_Release(adapter); - if (factory) IDXGIFactory_Release(factory); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; - return device; + return NULL; } static void test_device_interfaces(void)

1 0

Michael Stefaniuc : dmusic: Use the defines for the FOURCC codes.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2973dbb856c142812e0679c09a7bb786965cdaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2973dbb856c142812e0679c09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 27 14:48:31 2014 +0100 dmusic: Use the defines for the FOURCC codes. --- dlls/dmusic/collection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 20380fe..90a7918 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -289,7 +289,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID)); StreamSize = chunk.dwSize - sizeof(FOURCC); - if (chunk.fccID != mmioFOURCC('D','L','S',' ')) { + if (chunk.fccID != FOURCC_DLS) { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ @@ -339,7 +339,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip ListCount[0] = 0; switch (chunk.fccID) { /* pure INFO list, such can be found in dls collections */ - case mmioFOURCC('I','N','F','O'): + case DMUS_FOURCC_INFO_LIST: TRACE_(dmfile)(": INFO list\n"); do { hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); @@ -558,7 +558,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST ListSize[0] = chunk.dwSize - sizeof(FOURCC); ListCount[0] = 0; switch (chunk.fccID) { - case mmioFOURCC('I','N','F','O'): { + case DMUS_FOURCC_INFO_LIST: { TRACE_(dmfile)(": INFO list\n"); do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);

1 0

Stefan Dösinger : wined3d: Set buffer-> map_ptr to NULL on unmap.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 9f72f784310320ec219401fde54815ab05564aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f72f784310320ec219401fde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 27 14:41:47 2014 +0100 wined3d: Set buffer->map_ptr to NULL on unmap. --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b857119..c53021b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1117,6 +1117,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context_release(context); buffer_clear_dirty_areas(buffer); + buffer->map_ptr = NULL; } else if (buffer->flags & WINED3D_BUFFER_HASDESC) {

1 0

Stefan Dösinger : include: Fix IDirect3DSwapChain8_Present argument count.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: f9f52edbf77a616609e19e4f7c973dc4e934335d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f52edbf77a616609e19e4f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 22 17:50:32 2014 +0100 include: Fix IDirect3DSwapChain8_Present argument count. --- include/d3d8.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index dcc25f1..d56e67f 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -265,7 +265,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) #define IDirect3DSwapChain8_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DSwapChain8_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DSwapChain8 methods ***/ -#define IDirect3DSwapChain8_Present(p,a,b,c) (p)->lpVtbl->Present(p,a,b,c) +#define IDirect3DSwapChain8_Present(p,a,b,c,d) (p)->lpVtbl->Present(p,a,b,c,d) #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) #else /*** IUnknown methods ***/ @@ -273,7 +273,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) #define IDirect3DSwapChain8_AddRef(p) (p)->AddRef() #define IDirect3DSwapChain8_Release(p) (p)->Release() /*** IDirect3DSwapChain8 methods ***/ -#define IDirect3DSwapChain8_Present(p,a,b,c) (p)->Present(a,b,c) +#define IDirect3DSwapChain8_Present(p,a,b,c,d) (p)->Present(a,b,c,d) #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) #endif

1 0

Henri Verbeet : d3d10: Add D3D10_DRIVER_TYPE_WARP.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2d06703dc752e00b05710125d8bc3fb505ca4beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d06703dc752e00b05710125d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:53 2014 +0100 d3d10: Add D3D10_DRIVER_TYPE_WARP. --- dlls/d3d10/d3d10_main.c | 5 +++++ dlls/d3d10/utils.c | 1 + include/d3d10misc.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 01fefba..6d4d626 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -121,6 +121,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } break; } + + default: + FIXME("Unhandled driver type %#x.\n", driver_type); + IDXGIFactory_Release(factory); + return E_FAIL; } } diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 6bb7d05..9ffff13 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -34,6 +34,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); default: FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); return "unrecognized"; diff --git a/include/d3d10misc.h b/include/d3d10misc.h index 9f7f8e9..f8f5617 100644 --- a/include/d3d10misc.h +++ b/include/d3d10misc.h @@ -30,6 +30,7 @@ typedef enum D3D10_DRIVER_TYPE { D3D10_DRIVER_TYPE_REFERENCE = 1, D3D10_DRIVER_TYPE_NULL = 2, D3D10_DRIVER_TYPE_SOFTWARE = 3, + D3D10_DRIVER_TYPE_WARP = 5, } D3D10_DRIVER_TYPE; HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,

1 0

Sebastian Lackner : kernel32/tests: Add tests for TryAcquireSRWLockExclusive/Shared.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e7b3a43759fffd1dc921fb9a953526fc33beac6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b3a43759fffd1dc921fb9a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 00:37:28 2014 +0100 kernel32/tests: Add tests for TryAcquireSRWLockExclusive/Shared. --- dlls/kernel32/tests/sync.c | 207 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7b3a43759fffd1dc921f…

1 0

Austin English : mscms: Make missing lcms2 an error, not a fixme.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 77f871ab7c6b5617e35580ef7d6d3d2c73c72ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f871ab7c6b5617e35580ef7… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 22 21:28:27 2014 -0800 mscms: Make missing lcms2 an error, not a fixme. --- dlls/mscms/mscms_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 4653cc7..e4c5f28 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -54,7 +54,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); #else - FIXME( "Wine was built without support for liblcms2, expect problems\n" ); + ERR( "Wine was built without support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH:

1 0

Bruno Jesus : programs: Add support to arguments with dash in taskkill.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 8a7687d868728bd3c9fe922562f5a78045f05242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7687d868728bd3c9fe92256… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 21 21:24:54 2014 -0200 programs: Add support to arguments with dash in taskkill. --- programs/taskkill/taskkill.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 18edec3..7f0e7ad 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -447,36 +447,46 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR slashForceTerminate[] = {'/','f',0}; - static const WCHAR slashImage[] = {'/','i','m',0}; - static const WCHAR slashPID[] = {'/','p','i','d',0}; - static const WCHAR slashHelp[] = {'/','?',0}; - static const WCHAR slashTerminateChildren[] = {'/','t',0}; + static const WCHAR opForceTerminate[] = {'f',0}; + static const WCHAR opImage[] = {'i','m',0}; + static const WCHAR opPID[] = {'p','i','d',0}; + static const WCHAR opHelp[] = {'?',0}; + static const WCHAR opTerminateChildren[] = {'t',0}; if (argc > 1) { int i; + WCHAR *argdata; BOOL has_im = FALSE, has_pid = FALSE; /* Only the lone help option is recognized. */ - if (argc == 2 && !strcmpW(slashHelp, argv[1])) + if (argc == 2) { - taskkill_message(STRING_USAGE); - exit(0); + argdata = argv[1]; + if ((*argdata == '/' || *argdata == '-') && !strcmpW(opHelp, argdata + 1)) + { + taskkill_message(STRING_USAGE); + exit(0); + } } for (i = 1; i < argc; i++) { int got_im = 0, got_pid = 0; - if (!strcmpiW(slashTerminateChildren, argv[i])) - WINE_FIXME("/T not supported\n"); - if (!strcmpiW(slashForceTerminate, argv[i])) + argdata = argv[i]; + if (*argdata != '/' && *argdata != '-') + goto invalid; + argdata++; + + if (!strcmpiW(opTerminateChildren, argdata)) + WINE_FIXME("argument T not supported\n"); + if (!strcmpiW(opForceTerminate, argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !strcmpiW(slashImage, argv[i])) || - (got_pid = !strcmpiW(slashPID, argv[i]))) + else if ((got_im = !strcmpiW(opImage, argdata)) || + (got_pid = !strcmpiW(opPID, argdata))) { if (!argv[i + 1]) { @@ -501,6 +511,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) } else { + invalid: taskkill_message(STRING_INVALID_OPTION); taskkill_message(STRING_USAGE); return FALSE;

1 0

Dmitry Timoshkov : kernel32/tests: Don' t forget to delete a temporary file.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 294adeec4fff290ee67df3861ce39e59e4600774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=294adeec4fff290ee67df3861… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 21 17:51:27 2014 +0900 kernel32/tests: Don't forget to delete a temporary file. --- dlls/kernel32/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4a6828b..f89e5af 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3843,6 +3843,7 @@ static void test_SetFileValidData(void) { win_skip("cannot enable SE_MANAGE_VOLUME_NAME privilege\n"); CloseHandle(token); + DeleteFileA(filename); return; } handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -3906,7 +3907,9 @@ static void test_SetFileValidData(void) privs.Privileges[0].Attributes = 0; AdjustTokenPrivileges(token, FALSE, &privs, sizeof(privs), NULL, NULL); + CloseHandle(token); + CloseHandle(handle); DeleteFileA(filename); }

1 0

Andrew Eikum : oleaut32: Improve ITypeLib::FindName.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 57895e5a8ca237c105d543eef1bf6ffbcc0314b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57895e5a8ca237c105d543eef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 20 08:38:31 2014 -0600 oleaut32: Improve ITypeLib::FindName. --- dlls/oleaut32/tests/typelib.c | 99 +++++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 20 +++++---- 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 20e53fb..d3980f8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1554,8 +1554,10 @@ static void test_CreateTypeLib(SYSKIND sys) { ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; + ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; ITypeComp *tcomp; + MEMBERID memids[2]; FUNCDESC funcdesc, *pfuncdesc; ELEMDESC elemdesc[5], *edesc; PARAMDESCEX paramdescex; @@ -1567,6 +1569,7 @@ static void test_CreateTypeLib(SYSKIND sys) { DWORD helpcontext, ptr_size, alignment; int impltypeflags; unsigned int cnames; + USHORT found; VARIANT cust_data; HRESULT hres; TYPEKIND kind; @@ -2665,6 +2668,46 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, libattr); + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, param1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 0, "got wrong count: %u\n", found); + ok(tinfos[0] == NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == 0xdeadbeef, "got invalid memid[0]\n"); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, func1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 1, "got wrong count: %u\n", found); + ok(tinfos[0] != NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == 0, "got invalid memid[0]\n"); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + if(tinfos[0]) + ITypeInfo_Release(tinfos[0]); + + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, interface1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 1, "got wrong count: %u\n", found); + ok(tinfos[0] != NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == MEMBERID_NIL, "got invalid memid[0]: %x\n", memids[0]); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + if(tinfos[0]) + ITypeInfo_Release(tinfos[0]); + hres = ITypeLib_GetDocumentation(tl, -1, &name, &docstring, &helpcontext, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(memcmp(typelibW, name, sizeof(typelibW)) == 0, "got wrong typelib name: %s\n", @@ -4272,6 +4315,7 @@ static void test_SetVarHelpContext(void) static void test_SetFuncAndParamNames(void) { static OLECHAR nameW[] = {'n','a','m','e',0}; + static OLECHAR name2W[] = {'n','a','m','e','2',0}; static OLECHAR prop[] = {'p','r','o','p',0}; static OLECHAR *propW[] = {prop}; static OLECHAR func[] = {'f','u','n','c',0}; @@ -4280,9 +4324,13 @@ static void test_SetFuncAndParamNames(void) WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; + ITypeLib *tl; + ITypeInfo *infos[3]; + MEMBERID memids[3]; FUNCDESC funcdesc; ELEMDESC edesc; HRESULT hr; + USHORT found; GetTempFileNameA(".", "tlb", 0, filenameA); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH); @@ -4352,6 +4400,50 @@ static void test_SetFuncAndParamNames(void) ok(hr == S_OK, "got 0x%08x\n", hr); ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, name2W, TKIND_INTERFACE, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 0; + funcdesc.lprgelemdescParam = NULL; + hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 0, funcW, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); + ok(hr == S_OK, "got %08x\n", hr); + + found = 1; + memset(infos, 0, sizeof(infos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + memids[2] = 0xdeadbeef; + hr = ITypeLib_FindName(tl, func, 0, infos, memids, &found); + ok(hr == S_OK, "got %08x\n", hr); + ok(found == 1, "got wrong count: %u\n", found); + ok(infos[0] && !infos[1] && !infos[2], "got wrong typeinfo\n"); + ok(memids[0] == 0, "got wrong memid[0]\n"); + ok(memids[1] == 0xdeadbeef && memids[2] == 0xdeadbeef, "got wrong memids\n"); + + found = 3; + memset(infos, 0, sizeof(infos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + memids[2] = 0xdeadbeef; + hr = ITypeLib_FindName(tl, func, 0, infos, memids, &found); + ok(hr == S_OK, "got %08x\n", hr); + ok(found == 2, "got wrong count: %u\n", found); + ok(infos[0] && infos[1] && infos[0] != infos[1], "got same typeinfo\n"); + ok(memids[0] == 0, "got wrong memid[0]\n"); + ok(memids[1] == 0, "got wrong memid[1]\n"); + + ITypeLib_Release(tl); ICreateTypeLib2_Release(ctl); DeleteFileA(filenameA); } @@ -4543,8 +4635,7 @@ static void test_FindName(void) ti = (void*)0xdeadbeef; hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 1, "got %d\n", c); ITypeInfo_Release(ti); @@ -4556,7 +4647,7 @@ todo_wine hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine { - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 1, "got %d\n", c); } @@ -4569,7 +4660,7 @@ todo_wine { ti = (void*)0xdeadbeef; hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, invalidW), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 0, "got %d\n", c); ok(ti == (void*)0xdeadbeef, "got %p\n", ti); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d94abe7..e5a99e8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5176,26 +5176,30 @@ static HRESULT WINAPI ITypeLib2_fnFindName( return E_INVALIDARG; len = (lstrlenW(name) + 1)*sizeof(WCHAR); - for(tic = 0; tic < This->TypeInfoCount; ++tic) { + for(tic = 0; count < *found && tic < This->TypeInfoCount; ++tic) { ITypeInfoImpl *pTInfo = This->typeinfos[tic]; TLBVarDesc *var; UINT fdc; - if(!TLB_str_memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, pTInfo->Name, len)) { + memid[count] = MEMBERID_NIL; + goto ITypeLib2_fnFindName_exit; + } + for(fdc = 0; fdc < pTInfo->cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - int pc; - if(!TLB_str_memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; - for(pc = 0; pc < func->funcdesc.cParams; pc++) { - if(!TLB_str_memcmp(name, func->pParamDesc[pc].Name, len)) - goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, func->Name, len)) { + memid[count] = func->funcdesc.memid; + goto ITypeLib2_fnFindName_exit; } } var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->cVars, name); - if (var) + if (var) { + memid[count] = var->vardesc.memid; goto ITypeLib2_fnFindName_exit; + } continue; ITypeLib2_fnFindName_exit:

1 0

Nikolay Sivov : oleaut32: Use CoTaskMem* when dealing with CUSTDATA.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 1abafbffda7a1db8ba76a73a31569413c14c6440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abafbffda7a1db8ba76a73a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 00:12:11 2014 +0400 oleaut32: Use CoTaskMem* when dealing with CUSTDATA. --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 812612a..d94abe7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5343,7 +5343,7 @@ static HRESULT TLB_copy_all_custdata(struct list *custdata_list, CUSTDATA *pCust ct = list_count(custdata_list); - pCustData->prgCustData = heap_alloc_zero(ct * sizeof(CUSTDATAITEM)); + pCustData->prgCustData = CoTaskMemAlloc(ct * sizeof(CUSTDATAITEM)); if(!pCustData->prgCustData) return E_OUTOFMEMORY; @@ -11230,8 +11230,7 @@ void WINAPI ClearCustData(CUSTDATA *lpCust) for (i = 0; i < lpCust->cCustData; i++) VariantClear(&lpCust->prgCustData[i].varValue); - /* FIXME - Should be using a per-thread IMalloc */ - heap_free(lpCust->prgCustData); + CoTaskMemFree(lpCust->prgCustData); lpCust->prgCustData = NULL; } lpCust->cCustData = 0;

1 0

Sebastian Lackner : kernel32: Forward TryAcquireSRWLockShared/ Exclusive to ntdll.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 60c0637f62812456c35f227ebca40a50a5c35c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c0637f62812456c35f227eb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 00:36:20 2014 +0100 kernel32: Forward TryAcquireSRWLockShared/Exclusive to ntdll. --- dlls/kernel32/kernel32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 02b1bdb..3bb4255 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1219,6 +1219,8 @@ @ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) @ stdcall TransmitCommChar(long long) @ stub TrimVirtualBuffer +@ stdcall TryAcquireSRWLockExclusive(ptr) ntdll.RtlTryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) ntdll.RtlTryAcquireSRWLockShared @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister

1 0

Sebastian Lackner : kernel32: Forward SleepConditionVariableSRW to ntdll.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 72cf5d6f12daafc69c4b50f7803613d5fd6ba65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cf5d6f12daafc69c4b50f78… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 01:09:49 2014 +0100 kernel32: Forward SleepConditionVariableSRW to ntdll. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/sync.c | 18 ++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3bb4255..f7f3320 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1196,6 +1196,7 @@ @ stdcall SizeofResource(long long) @ stdcall Sleep(long) @ stdcall SleepConditionVariableCS(ptr ptr long) +@ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 2b7f4b0..f77637c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2339,3 +2339,21 @@ BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SEC } return TRUE; } + +/*********************************************************************** + * SleepConditionVariableSRW (KERNEL32.@) + */ +BOOL WINAPI SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, DWORD timeout, ULONG flags ) +{ + NTSTATUS status; + LARGE_INTEGER time; + + status = RtlSleepConditionVariableSRW( variable, lock, get_nt_timeout( &time, timeout ), flags ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 3c620e4..2d01c45 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2363,6 +2363,7 @@ WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC); WINBASEAPI VOID WINAPI Sleep(DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +WINBASEAPI BOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); WINBASEAPI DWORD WINAPI SleepEx(DWORD,BOOL); WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID);

1 0

Bruno Jesus : user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 06a6b189f6c9712e64f3f7da908403f410295785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a6b189f6c9712e64f3f7da9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 12:59:01 2014 -0200 user32: Cope with null LPMENUITEMINFO in SetMenuItemInfo. --- dlls/user32/menu.c | 4 ++-- dlls/user32/tests/menu.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 50545ee..bbaa5f3 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4795,8 +4795,8 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, MENUITEMINFOW *pmii_out ) { /* do we recognize the size? */ - if( pmii_in->cbSize != sizeof( MENUITEMINFOW) && - pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) { + if( !pmii_in || (pmii_in->cbSize != sizeof( MENUITEMINFOW) && + pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) ) { SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 20126d4..d02eb91 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -948,6 +948,19 @@ static void test_menu_add_string( void ) ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); } + /* Just try some invalid parameter tests */ + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, TRUE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + + SetLastError(0xdeadbeef); + rc = SetMenuItemInfoA( hmenu, 0, FALSE, NULL ); + ret = GetLastError(); + ok (!rc, "SetMenuItemInfoA succeeded unexpectedly\n"); + ok (ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + /* Just change ftype to string and see what text is stored */ memset(&info, 0x00, sizeof(info)); info.cbSize= sizeof(MENUITEMINFOA);

1 0