February 2015 - Wine-Devel - list.winehq.org

Re: d3d8/tests: Test the return value of CreateVolumeTexture (PVS-Studio)
by Marvin Feb. 21, 2015

Feb. 21, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=11656 Your paranoid android. === w8 (32 bit device) === device.c:1222: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1267: Test failed: Reset failed, hr 0x88760868. device.c:1269: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1273: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1280: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1281: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1282: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1283: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1284: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1285: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1290: Test failed: Screen width is 640, expected 800. device.c:1291: Test failed: Screen height is 480, expected 600. device.c:1297: Test failed: Back buffer width is 640, expected 800. device.c:1299: Test failed: Back buffer height is 480, expected 600. device.c:1329: Test failed: Screen width is 640, expected 1024. device.c:1330: Test failed: Screen height is 480, expected 768. device.c:2557: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2562: Test failed: The focus window is active. device.c:2570: Test failed: Got unexpected hr 0x88760869. device.c:2576: Test failed: Got unexpect screen size 800x600. device.c:2591: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2600: Test failed: Got unexpect screen size 800x600. device.c:2613: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2621: Test failed: Got unexpect width 640. device.c:2622: Test failed: Got unexpect height 480.

2 1

Re: [PATCH 2/5] d3d9/tests: Add a test for 2D D3DFMT_V16U16 textures.
by Stefan Dösinger Feb. 20, 2015

Feb. 20, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I am working on a more comprehensive test for V8U8, V16U16, L6V5U5, X8L8V8U8 and Q8W8V8U8. I have attached the current status of this test. I am still struggling with finding the right precision that makes all Windows machines happy. There are also some problems with our conversion code. Your test tests the case of a non-even width, whereas my test doesn't do that. I can build that into my test as well. We can still commit your test if you want, and I'll remove it again in my patch (together with x8l8v8u8_test). Stefan Am 2015-02-20 um 13:06 schrieb Matteo Bruni: > --- > dlls/d3d9/tests/visual.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 148 insertions(+) > > diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c > index 5f64ec3..2152ba6 100644 > --- a/dlls/d3d9/tests/visual.c > +++ b/dlls/d3d9/tests/visual.c > @@ -16208,6 +16208,153 @@ done: > DestroyWindow(window); > } > > +static void v16u16_test(void) > +{ > + IDirect3DTexture9 *texture; > + IDirect3DPixelShader9 *shader; > + IDirect3DDevice9 *device; > + D3DLOCKED_RECT rect; > + IDirect3D9 *d3d; > + unsigned int i; > + ULONG refcount; > + D3DCAPS9 caps; > + SHORT *texel; > + DWORD color; > + HWND window; > + HRESULT hr; > + > + static const struct > + { > + struct vec3 position; > + struct vec2 texcrd; > + } > + quads[] = > + { > + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f}}, > + {{-1.0f, 1.0f, 0.0f}, {0.0f, 1.0f}}, > + {{ 1.0f, -1.0f, 1.0f}, {1.0f, 0.0f}}, > + {{ 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f}}, > + }; > + static const DWORD shader_code[] = > + { > + 0xffff0101, /* ps_1_1 */ > + 0x00000051, 0xa00f0000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, */ > + 0x3f000000, 0x3f000000, /* 0.5, 0.5 */ > + 0x00000042, 0xb00f0000, /* tex t0 */ > + 0x00000004, 0x800f0000, 0xb0e40000, 0xa0e40000, 0xa0e40000, /* mad r0, t0, c0, c0 */ > + 0x0000ffff /* end */ > + }; > + > + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, > + 0, 0, 640, 480, NULL, NULL, NULL, NULL); > + d3d = Direct3DCreate9(D3D_SDK_VERSION); > + ok(!!d3d, "Failed to create a D3D object.\n"); > + if (!(device = create_device(d3d, window, window, TRUE))) > + { > + skip("Failed to create a D3D device, skipping tests.\n"); > + goto done; > + } > + > + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); > + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); > + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) > + { > + skip("No ps_1_1 support, skipping tests.\n"); > + IDirect3DDevice9_Release(device); > + goto done; > + } > + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, > + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_V16U16))) > + { > + skip("V16U16 textures are not supported, skipping test.\n"); > + IDirect3DDevice9_Release(device); > + goto done; > + } > + > + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); > + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); > + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); > + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); > + hr = IDirect3DDevice9_SetPixelShader(device, shader); > + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); > + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); > + ok(SUCCEEDED(hr), "Failed to set filter, hr %#x.\n", hr); > + > + for (i = 0; i < 2; ++i) > + { > + D3DPOOL pool; > + > + if (i) > + pool = D3DPOOL_SYSTEMMEM; > + else > + pool = D3DPOOL_MANAGED; > + > + hr = IDirect3DDevice9_CreateTexture(device, 1, 2, 1, 0, D3DFMT_V16U16, > + pool, &texture, NULL); > + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > + > + hr = IDirect3DTexture9_LockRect(texture, 0, &rect, NULL, 0); > + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); > + > + texel = (SHORT *)((BYTE *)rect.pBits + 0 * rect.Pitch); > + texel[0] = 32767; > + texel[1] = 32767; > + texel = (SHORT *)((BYTE *)rect.pBits + 1 * rect.Pitch); > + texel[0] = -32768; > + texel[1] = 0; > + > + hr = IDirect3DTexture9_UnlockRect(texture, 0); > + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); > + > + if (i) > + { > + IDirect3DTexture9 *texture2; > + > + hr = IDirect3DDevice9_CreateTexture(device, 1, 2, 1, 0, D3DFMT_V16U16, > + D3DPOOL_DEFAULT, &texture2, NULL); > + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > + > + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, > + (IDirect3DBaseTexture9 *)texture2); > + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); > + > + IDirect3DTexture9_Release(texture); > + texture = texture2; > + } > + > + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); > + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); > + > + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); > + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); > + hr = IDirect3DDevice9_BeginScene(device); > + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); > + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); > + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); > + hr = IDirect3DDevice9_EndScene(device); > + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); > + > + color = getPixelColor(device, 320, 160); > + ok (color_match(color, 0x00007fff, 1), > + "Expected color 0x00007fff, got %#x, V16U16 input -32768, 0.\n", color); > + color = getPixelColor(device, 320, 400); > + ok (color_match(color, 0x00ffffff, 1), > + "Expected color 0x00ffffff, got %#x, V16U16 input 32767, 32767.\n", color); > + > + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); > + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); > + > + IDirect3DVolumeTexture9_Release(texture); > + } > + > + IDirect3DPixelShader9_Release(shader); > + refcount = IDirect3DDevice9_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +done: > + IDirect3D9_Release(d3d); > + DestroyWindow(window); > +} > + > static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) > { > HRESULT hr; > @@ -17566,6 +17713,7 @@ START_TEST(visual) > texkill_test(); > x8l8v8u8_test(); > volume_v16u16_test(); > + v16u16_test(); > constant_clamp_ps_test(); > cnd_test(); > dp2add_ps_test(); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5yi0AAoJEN0/YqbEcdMwXdcP/2QHNZaeHncB/4If+JfpQEOv Vto9Z3ip/eGDuOCRylNjiL47VZfYyuqXHe8EoGzKkuGmtGvPjr2ZhkebUf0l9OIN g2LAqQIa17nYTJFnO6ofzHjcWb++mdIDG1lVUJFKyhIS2vl0xjfB3V4wteMLDffS R6CTtAS49vxFL2lzDwrWaEj2SYhnnybNoKLdhOY5jXH31kcz5W9k3Fzr5Umb2dPB q3tyZHZtYHHsR5kXCmJO6DA456y8euFqzR9GK5/0nDUlh8CGV74pPL6pZMnoPn7c ssXU4HzPB9zPI6zVZBTV8+oOmHWFDn1YZL1M/w50rxY35XvjkU3vs4oezuHMkZBS wXt30QYWBRhFFB3Z2lq9jv9JZXA9V2+A8WmJMbblgv662QsctIAmT9ZAc2xycm7R ye89fHEC3xXFmM6jdJqS1k5MrA5R1li5YFbS18ujcAXVYCW3v8JtK0G05h2zy9e1 KifoVA8o+cVV0Sh2GtYoifLSNvpYo2AlCrP7/cjOyR6igiShK5pF+pktRIlsraM2 3Hl0wGjr2TPhTCTQQPKsskVNvKE+017e4+fwaFI8fRgF3zYSgLSKZELPFY05bzBX OOcbNSEqjRkFtoQoerBR7vx7yrU+85lwd945AGS3URF8KqkavK1LYsAfmLnFu90y YltdeSdbSvQDHCQ4CmmL =D2Pe -----END PGP SIGNATURE-----

3 3

Re: [PATCH 5/5] d3d9/tests: Move a Present out of the loops in fog_with_shader_test().
by Henri Verbeet Feb. 20, 2015

Feb. 20, 2015

On 20 February 2015 at 13:06, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > It reduces the duration of the visual test with all the other functions > from visual.c compiled out from 9 to 1.5 seconds for me (on a Radeon > HD 5650M, Linux, Mesa). > --- For what it's worth, I think we can actually just remove most of the Present() calls in the tests. It's perhaps fun to keep for nostalgic reasons, but I think the only time anyone really wants to see what gets drawn is while debugging failures.

2 1

Is it possible to detect if a variable is in stack or heap based on its address?
by Bruno Jesus Feb. 20, 2015

Feb. 20, 2015

Hi all, the subject explains my needs. I would like to understand if printing %p of a pointer can help me check if it's in the stack or was allocated with some memory management functions. Something like: void test() { char stack[10], *heap = HeapAlloc(1234); printf("%p %p", stack, heap); } Can I be sure the first printed value is from stack and the second from heap? A plus question would be: Is it possible to know if an address is a const string? These questions are related to debugging wine functions based on trace debugs. Thanks in advance and best wishes, Bruno

2 2

Re: [PATCH 3/3] dwrite/tests: Test default colors of render target memory HDC
by Marvin Feb. 20, 2015

Feb. 20, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=11640 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/3] dwrite/tests: Fixed font instance leak
by Marvin Feb. 20, 2015

Feb. 20, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=11639 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: iccvid: Allow top-down videos to be played upside down
by Bruno Jesus Feb. 19, 2015

Feb. 19, 2015

On Wed, Feb 18, 2015 at 7:31 PM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > In my opinion this is better than not having videos played at all, and > it may attract other people attention to the real problem and possible > solutions on where to invert the buffer after decoding or maybe > decoding directly to the right buffer position inside decode_cinepak. > > Related to bug https://bugs.winehq.org/show_bug.cgi?id=29852 Please ignore this patch, Dmitry is shedding some light in this problem.

1 0

Re: xaudio2_{7, 8}: Implement IXaudio interface as stub (try 2)
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

> +static const struct IXAudio2Vtbl XAudio2_Vtbl; You wouldn't need this if you've moved XAudio2_create() after vtbl declaration. > + > +HRESULT XAudio2_create(IUnknown *pUnkOuter, LPVOID *ppObj) Please use better names, and "void **". > +{ > + IXAudio2Impl* object; > + > + TRACE("(%p, %p)\n", pUnkOuter, ppObj); > + > + if(pUnkOuter) > + return CLASS_E_NOAGGREGATION; > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IXAudio2Impl)); > + if(!object) > + return E_OUTOFMEMORY; No need for HEAP_ZERO_MEMORY. > + > + *ppObj = object; That's not how it's done - return proper interface pointer. > HRESULT WINAPI DllRegisterServer(void) > { > TRACE("\n"); > - return __wine_register_resources( instance ); > + return __wine_register_resources(instance); > } You can probably leave this as it is.

1 0

Re: [3/5] comctl32: Implement TaskDialogIndirect as a custom dialog box
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 15:23, Joachim Priesner wrote: > + WCHAR *windowTitleBuffer = NULL; > + UINT len = LoadStringW(config->hInstance, LOWORD(config->pszWindowTitle), (LPWSTR)&ptr, 0); > + if (len) > + { > + windowTitleBuffer = Alloc((len + 1) * sizeof(WCHAR)); > + if (!windowTitleBuffer) > + { > + EndDialog(hwnd, E_OUTOFMEMORY); > + return; > + } > + memcpy(windowTitleBuffer, ptr, len * sizeof(WCHAR)); > + windowTitleBuffer[len] = 0; > + SetWindowTextW(hwnd, windowTitleBuffer); > + } That's essentially the same code you're using to set IDC_CONTENT text. Could you add a helper that does all of that? Also it will probably take fewer lines to use LoadStringW() to fill your buffer and set terminating null. > + /* Destroy unused common buttons. */ > + TRACE("dwCommonButtons=%x\n", config->dwCommonButtons); > + if (!(config->dwCommonButtons & TDCBF_YES_BUTTON)) > + DestroyWindow(GetDlgItem(hwnd, IDYES)); Did you check that it's actually destroyed and not just hidden? > + WCHAR buttonText[1024]; > + int w, h; > + if (GetWindowTextW(hItem, buttonText, 1024)) Where does this limit come from? > + /* Query parent window/desktop size and center window. */ > + monitor = MonitorFromWindow(config->hwndParent ? config->hwndParent : GetActiveWindow(), > + MONITOR_DEFAULTTOPRIMARY); > + monitorInfo.cbSize = sizeof(monitorInfo); > + GetMonitorInfoW(monitor, &monitorInfo); > + windowLeft = (monitorInfo.rcWork.left + monitorInfo.rcWork.right > + - (windowClientWidth + windowBorderWidth)) / 2; > + windowTop = (monitorInfo.rcWork.top + monitorInfo.rcWork.bottom > + - (windowClientHeight + windowBorderHeight)) / 2; > + SetWindowPos(hwnd, 0, windowLeft, windowTop, > + windowClientWidth + windowBorderWidth, windowClientHeight + windowBorderHeight, > + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW); This looks overcomplicated, isn't it enough to use desktop window if no parent was specified? > + DeleteObject(mainInstructionFont); > + Free(contentBuffer); > + Free(mainInstructionBuffer); It's better to free right when you don't need it anymore, and please use simpler/shorter names.

2 1

Re: [2/5] comctl32: Add and fix tests for invalid TaskDialogIndirect arguments
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 15:22, Joachim Priesner wrote: > +static void test_TaskDialogIndirect_InvalidParameters(void) > +{ No need to be that explicit, just start test_TaskDialogIndirect() with these tests.

1 0

Re: [5/5] comctl32: Implement the TaskDialog function
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 15:23, Joachim Priesner wrote: > } > > /*********************************************************************** > + * TaskDialog [COMCTL32.@] > + */ > +HRESULT WINAPI TaskDialog(HWND hWndParent, HINSTANCE hInstance, PCWSTR pszWindowTitle, > + PCWSTR pszMainInstruction, PCWSTR pszContent, > + TASKDIALOG_COMMON_BUTTON_FLAGS dwCommonButtons, PCWSTR pszIcon, > + int *pnButton) Please don't use prefixed notation for names. > +static void test_TaskDialog_ProcAddr(void) > +{ > + void *ptr = GetProcAddress(hComctl32, (const CHAR*)344); > + ok(ptr == pTaskDialog, "got wrong pointer for ordinal 344, %p expected %p\n", ptr, pTaskDialog); > +} > + This doesn't need its own test function. > START_TEST(taskdialog) > { > ULONG_PTR ctx_cookie; > @@ -80,11 +87,22 @@ START_TEST(taskdialog) > if (!pTaskDialogIndirect) > { > win_skip("TaskDialogIndirect() is missing. Skipping the tests\n"); > - return; > + } > + else > + { > + test_TaskDialogIndirect_ProcAddr(); > + test_TaskDialogIndirect_InvalidParameters(); > } > > - test_TaskDialogIndirect_ProcAddr(); > - test_TaskDialogIndirect_InvalidParameters(); > + pTaskDialog = (void*)GetProcAddress(hComctl32, "TaskDialog"); > + if (!pTaskDialog) > + { > + win_skip("TaskDialog() is missing. Skipping the tests\n"); > + } > + else > + { > + test_TaskDialog_ProcAddr(); > + } > I don't think you need two win_skip()'s here. If TaskDialogIndirect() is available, TaskDialog() is here too, right?

1 0

Re: [v2 1/4] reg: Add sane_path function to do preliniary key validation
by Stefan Dösinger Feb. 19, 2015

Feb. 19, 2015

1 0

Re: [PATCH 1/3] ntdll/tests: Add tests for RtlIpv4StringToAddressEx, RtlIpv6StringToAddress (try 2)
by Stefan Dösinger Feb. 19, 2015

Feb. 19, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I've already talked to Mark about this on #winehackers, just repeating it for the list: My remaining request with these tests is that I believe we should test the full set of inputs against the Ex and non-Ex versions and ideally reuse the test table (for base and ex, not for ipv4 and ipv6). That will tell us if there's any difference in the IP parsing part of the base and Ex functions. It'll also be interesting how the base function handles ports in the string, and, in case of ipv6, brackets around the IP. Other than that two minor style issues: Change the subject of patch one (it only handles RtlIpv4StringToAddressEx), and you still have different levels of indentation in the line continuations of some ok() statements. Cheers, Stefan Am 2015-02-15 um 18:02 schrieb Mark Jansen: > Add test for RtlIpv4StringToAddressEx > > --- dlls/ntdll/tests/rtl.c | 101 > +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, > 101 insertions(+) > > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU4c5HAAoJEN0/YqbEcdMwnPIP/RT2i0fG4cPqKikwa26VbRyn EG2yeG78Wjx/vysLuQfGe8alhUycGrgMzW4N4m8QiAx/xNFv4eX0OdI+5gYMbSHK dYZSzTSKbqoJbnBlZwt1MoaaNceX/zIEy2WoaRCYpsUJfpscT/sOdJ+/gW55gDkH 605vvruhgJFSFVeZDVzfR9gQcY51iHB0KDemX2p1mwHElr6+HwYSHOQt+8KCL8YV wfC87NSMEAfEjIudYPL7SFHvUuLr3GoHBBt57R9p/2gNT7eJ7ll9ANvShFkRENjL jmKJQj7exehqrAGNWBqbeIPSjHBQoGl/UZPwIE39UioNhRo+sWi5A8tBbUMyL3o5 VENuxL987kU1L9Xpa6/jEcrQksgafCa742/wWSAjPGE0D2iTUr0hQN0zQoioTPA/ zuaDyDO3CBCyFaF0A9h9FzxOkuRAHo6TSKw0IYOrI2XENAoqQ+B+fX0ll9t/5Tu0 iUIea06yp2/fRButo58sJNAd3dUZpRKf1qT+Eu7Cn+AJfgi3TsKY/Lw0gvyb4XJh qOdp7EPzqY1PURn6+Z8aDwNZRA2du3NM91SSMfwz+qwZtakf8K/XtkpC1CpNLONJ kfltxHVALBKT0NTDzvprrSzvTVH90hJLE+nX/E5Qf6SzeRVqxsPomBtOj2VLuapZ 4ehIhXsaEJJz9jc31tr9 =E0dA -----END PGP SIGNATURE-----

2 2

Re: dlls/dsrole: Add undocumented api set
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 3:58, Andrew Cook wrote: > Required by native aclui.dll If it's the only user, it's questionable whether we need this module.

2 1

Re: [PATCH 4/5] wined3d: Reject unsupported pitches in wined3d_surface_update_desc().
by Stefan Dösinger Feb. 18, 2015

Feb. 18, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-18 um 14:20 schrieb Matteo Bruni: > + if (pitch & (texture_resource->format->byte_count - 1)) > + { > + WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); > + return WINED3DERR_INVALIDCALL; > + } I'd prefer this to be an ERR instead, and the return statement removed. The idea is that since we don't ever expect this check to be true it shouldn't result in different behavior and can be compiled out in a build where debugging is disabled. The basic idea originated from Henri: https://www.winehq.org/pipermail/wine-devel/2013-August/100974.html . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5KrDAAoJEN0/YqbEcdMwdj0P/0kphTArNNtcxtIbt5noekiX wTwi7X6YhxkjryHENqvYKKO8ckBftBoxJHo9o4I82Cc+IRvj9GvrvvuZ5FuiMsJO 6dGmo5JSHnGGNG3rl/oZt31v3P/1LAba3GoFAgRwBfXCULue6gNRyC8+57ahlbLy xVWc2m249URRP3ML/O9+bXlzA61oQdS+5q54T+jmYv3X8K8AgDHATu114mcpxaAq hkHIKmW2WCoigCBrNHQTzcxMG3lsavMbnuMxSvQ/01/mwrKvmYYkvvBtR/AVI6W+ I7HLF4KZlz5BLZnS71joW2LLL35/z/3qtmaHi8dq/kCMaajow9dBQmstcUFvwJ4p UknSxgcCOgKreAZH3yTOH5LNgf8qZvB21wQ5Cn0NGEBW7bZKdUxfRftFN8IQY1Ht NhGB9cmvo3Ozv0z+i7wMfcXjntT9wL/2H77RqC4Xb9Z/igo+E2LJN0XqQYvwvtj7 wG4Fw5rH7vrO4g/IcfFYvbT7CMUYrPWtFaTfiMn5IOQZ4mx2gacktHcpZJnCUjw5 /uTQo+089YosnM+xY/WvDnjjI13svZt5c3gUMlvha30RjsX7PDfih/vNrr0qR5Y/ C6TLk8ffbmPOX6TTobndfZrWdb2sP3d7x1T1tx9nMAKJG0HFy5wvFoygEDOzFRYU tG/x7wnrmr3fYfUSEPJY =LuAf -----END PGP SIGNATURE-----

3 4

Re: [PATCH 4/5] wined3d: Set GL_UNPACK_ALIGNMENT to 1 when uploading surfaces from user memory.
by Henri Verbeet Feb. 18, 2015

Feb. 18, 2015

On 10 February 2015 at 20:14, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); > + if (src_pitch & (surface_alignment - 1)) > + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); What's a bit awkward about this is that if the pitch isn't a multiple of the pixel byte width it's still not going to work. But I guess this is the best we can do.

3 5

Re: icinfo: Do not output an extra space at end of line
by Stefan Dösinger Feb. 18, 2015

Feb. 18, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-18 um 11:53 schrieb Hugh McMaster: > - if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); > + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(s_fmt, VIDCF_QUALITY_W); > if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); I don't think this works. If VIDCF_QUALITY is not set, but any other flag is, it will now print a leading space. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5IZUAAoJEN0/YqbEcdMwTg8QAI0rVUkh9r19pCZbCEPnk+AQ z5Da4dia28IpRlUYYW1bvZgxUpbWZi67NQr7oAs12fbhVMzyvoNxRI+J4bUpB/Rl sFxcNNIxwiJ47iVXzOQ54d4jO0SlhjsRB07hm9Z6o/DcNCPLXpq8UvDEErkHRHMp dZMF0D5dRTaxkqxXGIcks8kLT7yODKeCsG/T4oZ4D7eYMYoKaODmw7lUbcaRsTk1 hKcqdz9BfgmmwLk1xcs+Ssy/7sgN+smJPwGDWEWT2W0kto2M3OLb6Aot6olKncQo ngn1KIhPOzauomfW7+XFr6ezQZaBq4mPVqDYpN7ZHUewPl/1TUDYYIzMxDaXwZrx xcgNPcrKR3HQEF2JycYoWgxb3zTfn5h9M4Q5vtz218ytgD7h8dQGgGBBDnjhTnr6 JyJnvrj4OezLZF2BR4kDYfIKCSPk9VVfFiRe/b+HfcKH56Dv9ALcI8Dq0tk/G35G VY/4YQEselJ9P7KL/D4gqvl6pJLOwSU9162qUQzKEAktfzIREZqmyQQya1hgtwP3 TyY9rMJ8uubLh2Tqn0cUiZxQO7XjhTP1r/BSEyxrJkl3lAx/TCnIsBwNgd849JJK MVFHBFqzsvXdCG+CYU393HviueMdWnJ1nxZmhAIK9i/FpHRHw1fZtxUGlQYYiB28 sqoZ3ohbVUpuGCNjDRHI =+LZ8 -----END PGP SIGNATURE-----

2 1

Re: [PATCH] msvcr120: Implemented Concurrency::details::_Condition_variable.
by Piotr Caban Feb. 18, 2015

Feb. 18, 2015

Hi, On 02/14/15 01:52, Yifu Wang wrote: > Implementation of Concurrency::details::_Condition_variable along with a producer-consumer test case. > The class is used in msvcp120.dll by _Cnd_t functions, which are used in std::condition_variable and std::thread. > --- > dlls/msvcr120/msvcr120.spec | 36 +++--- > dlls/msvcr120/tests/msvcr120.c | 277 +++++++++++++++++++++++++++++++++++++++++ > dlls/msvcrt/lock.c | 171 +++++++++++++++++++++++++ > 3 files changed, 466 insertions(+), 18 deletions(-) > Please also update msvcr110.spec and msvcr120_app.spec files. +@ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr ptr) _Condition_variable_wait_for The arguments types in spec file are incorrect (in this case there should be: ptr ptr long). I was not checking other entries. /* signal */ produced = consumed = 0; for(i = 0; i < NUM_PRODUCER; ++ i) t[i] = CreateThread(0, 0, producer_thread, (LPVOID)0, 0, 0); for(i = NUM_PRODUCER; i < NUM_PRODUCER + NUM_CONSUMER; ++ i) t[i] = CreateThread(0, 0, consumer_thread, (LPVOID)0, 0, 0); You don't need the (LPVOID)0 casts here. /* a quick sanity test on timed wait */ for(i = 0; i < 200; i += 10) { call_func1(p_critical_section_lock, &buf_cs); wake = (MSVCRT_bool)call_func3(p__Condition_variable_wait_for, &buf_not_empty, &buf_cs, i); ok(wake == FALSE, "_Condition_variable not supposed to wake\n"); call_func1(p_critical_section_unlock, &buf_cs); } I don't think that spending ~2 seconds on this tests is useful. It's enough to test it once (not in a loop). Cheers, Piotr

1 1

Re: version: Fix wrong length reported when selecting a block. (resend)
by Matteo Bruni Feb. 18, 2015

Feb. 18, 2015

2015-02-18 8:49 GMT+01:00 Mark Jansen <learn0more+wine(a)gmail.com>: > You shouldnt make the buffer static or const, because the VerQuery > functions will write to it. Ah yes, you're right. Ignore that point then. BTW, adding back wine-devel to cc.

1 0

Re: kernel32/tests: Add tests for job objects (try 3)
by Andrew Cook Feb. 18, 2015

Feb. 18, 2015

I'm never going to get this code in, am i? On Tue, 2015-02-17 at 11:00 +1100, Andrew Cook wrote: > Forgot a semicolon (i actually tested this one, it compiles) > > --- > dlls/kernel32/tests/Makefile.in | 1 + > dlls/kernel32/tests/job.c | 393 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 394 insertions(+) > create mode 100644 dlls/kernel32/tests/job.c > >

3 3

Re: [PATCH] uxtheme: fix colour errors in UXTHEME_StretchBlt
by Nikolay Sivov Feb. 17, 2015

Feb. 17, 2015

On 18.02.2015 3:59, Mark Harmstone wrote: > + old_stretch_mode = GetStretchBltMode(hdcDst); > + SetStretchBltMode(hdcDst, HALFTONE); This could be reduced to a single line.

1 0

Re: wininet: Include <unistd.h> in case we need off_t for zlib.
by Jacek Caban Feb. 17, 2015

Feb. 17, 2015

Hi Gerald, On 02/15/15 17:16, Gerald Pfeifer wrote: > After commit 5436fef80722fe7896aed5e659c31fdade4ef5b3 > > Author: Jacek Caban <jacek(a)codeweavers.com> > Date: Fri Feb 13 12:12:29 2015 +0100 > > wininet: Always use winsock sockets. > > FreeBSD not longer builds due to the following change: > > #include "config.h" > -#include "wine/port.h" > > -#if defined(__MINGW32__) || defined (_MSC_VER) > -#include <ws2tcpip.h> > +#ifdef HAVE_ZLIB > +# define Z_SOLO > +# include <zlib.h> > #endif > > zlib.h on FreeBSD 10.x uses off_t, but at this point this is not > defined yet. Including unistd.h before including zlib.h addresses > this. I'd expect zlib.h to handle its dependences, it's probably Z_SOLO that's doesn't work on FreeBSD. Could you try my recent wininet patches? They should fix the build. Thanks, Jacek

2 1

Re: version: Fix wrong length reported when selecting a block. (resend)
by Stefan Dösinger Feb. 17, 2015

Feb. 17, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-12 um 20:15 schrieb Mark Jansen: > LPWSTR lpSubBlockW; > + UINT dum = 0; > + if (!puLen) > + puLen = &dum; > > len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0); > lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > @@ -965,7 +968,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, > > HeapFree(GetProcessHeap(), 0, lpSubBlockW); > > - if (ret && isText) > + if (ret && isText && *puLen) I am afraid I have no idea what this patch is doing. I am not even sure I understand the original function properly :-( . VerQueryValueA seems like an A to W wrapper for VersionInfo32_QueryValue, but with the quirky behavior that it appends the ascii string after the unicode string. Can you elaborate a bit on what exactly goes wrong? What are the input values, and what does VersionInfo32_QueryValue return? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU3dGbAAoJEN0/YqbEcdMwpwEP+wabxLJtbw7O7enIEu21l8ls m6vxZr1PXP5RnTmOs4nk/QmWT4Oa68qY2EBdArZ79WwyVULLI7BjNJ1aLS67dw/Z l6Dk9fh8orxoD4HznH0o7PxYrWNrQ1nJ2jf39k+TO4DbSHMZB/eGXnGUZxVFwKVf H7yNxmoSISC0aWgQP0/QZF+AhtsJ5TLIWtNyJULpmTnZZGu9z94Ukftd9gDL+tZU ezFsqxdDhpy0nirb4ky/Yq77jXQtsCmz/pCNi7ntYuQqY5fEmtJQMAtpfOQhdG5h XP1Py7qFTu/RgqnBsO1Z3INRyKk7NS4BsPvULcLsk4WbDvoTGEqa1WwHwqHY4Dng IDHagE938Xkc8CPiHGzqJG6WDdPPkFiRzqM+2HH87ihJ2uAaVZcK/V46lGiJCx8q jDY+DlcDyZRmw28+fjwzOjPQHZx/jH2X3wLIpkliM5Ja03Ocb27Aaud9DEQ6H0vw 0VbD2Db6oOrPBv3oyDmZhI+NTPgvsUoaH6sNE+3cIEwBWpCKkOJMzoDZ6EiqWVqj jvJklcVcOn7nfUBH0YCfnG5szQokMnfcnZaOZxzkjWnPvwJbfC36eLQyESkbtbKf Y2Z+mvbWslkhdeR0jKAmQNwfDuFcfvZflinem3U9xJAqBKEmicLeqJ0dtwUIJyC7 TnJMMCP14EDaX0DZGHw3 =94Ql -----END PGP SIGNATURE-----

3 4

Re: [resend 1/8] reg: Add system error printing function
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Jonathan Vollebregt <jnvsor(a)gmail.com> writes: > +static void reg_print_error(LSTATUS error_code) > +{ > + switch (error_code) > + { > + case ERROR_SUCCESS: > + return; > + case ERROR_BAD_COMMAND: > + reg_message(STRING_INVALID_CMDLINE); > + return; > + default: > + { > + static const WCHAR error_string[] = {'%','0','5','d',':',' ','%','s',0}; > + WCHAR *message = NULL; > + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, > + NULL, error_code, 0, (WCHAR *)&message, 0, NULL); > + > + reg_message(STRING_ERROR); > + reg_printfW(error_string, error_code, message); > + LocalFree(message); > + return; > + } > + } > +} I don't think that's an improvement. There may be a need for generic Win32 error printing through FormatMessage for unknown codes, but I don't see why you'd want to route all errors through it. In particular, having to make up your own Win32 error codes only to convert them back to string ids is quite ugly. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH (resend) 1/2] dpvoice/tests: Add GetCompressionTypes tests.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -343,6 +343,179 @@ static void create_voicetest(void) > } > } > > +static void test_GetCompressionTypes(HRESULT (__stdcall *GetCompressionTypes)(void*,void*,DWORD*,DWORD*,DWORD), > + void *iface, const char *name) These hacks with the void pointers are ugly. You should pass interface pointers and do a proper method call with one or the other, for instance something like this: if (client_iface) IDirectPlayVoiceClient_GetCompressionTypes( client_iface,... ); else IDirectPlayVoiceServer_GetCompressionTypes( server_iface,... ); -- Alexandre Julliard julliard(a)winehq.org

1 0