wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Jacek Caban : amvideo.idl: Use proper IDirectDraw forward declaration.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: d1607dbb308147abc2ac2aec0f56620d1f7e6c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1607dbb308147abc2ac2aec0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:27:58 2012 +0100 amvideo.idl: Use proper IDirectDraw forward declaration. --- include/amvideo.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index ad92055..f3dc45f 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -21,7 +21,7 @@ import "objidl.idl"; /* trick widl into thinking that it knows the DirectDraw types * as there is no IDL file for them (yet) */ cpp_quote("#if 0") -typedef void IDirectDraw; +interface IDirectDraw; typedef void DDSURFACEDESC,DDCAPS; typedef DWORD RGBQUAD; typedef LONGLONG REFERENCE_TIME;

1 0

Michael Stefaniuc : wintab32/tests: Remove a function pointer cast.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: d94b651519eea53a7d9a4b17e96a6b09271d680e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94b651519eea53a7d9a4b17e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 09:29:48 2012 +0100 wintab32/tests: Remove a function pointer cast. --- dlls/wintab32/tests/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 6b37129..5f05912 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -80,7 +80,7 @@ static void wintab_create_window(HWND* pHwnd) ZeroMemory(&testWindowClass, sizeof(testWindowClass)); - testWindowClass.lpfnWndProc = (WNDPROC)wintabTestWndProc; + testWindowClass.lpfnWndProc = wintabTestWndProc; testWindowClass.hInstance = NULL; testWindowClass.hIcon = NULL; testWindowClass.hCursor = NULL;

1 0

Michael Stefaniuc : appwiz: Use the correct types for callbacks.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 2a1a48b586a3285928869debfe93d5880c4f2a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1a48b586a3285928869debf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 09:28:43 2012 +0100 appwiz: Use the correct types for callbacks. --- dlls/appwiz.cpl/appwiz.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index c50adf7..4f6670d 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -592,7 +592,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage * lParam - additional parameter * Returns : Depends on the message */ -static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { APPINFO *iter; HKEY hkey; @@ -681,8 +681,7 @@ static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR */ static void SupportInfo(HWND hWnd, int id) { - DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_INFO), hWnd, (DLGPROC) - SupportInfoDlgProc, (LPARAM) id); + DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_INFO), hWnd, SupportInfoDlgProc, id); } /* Definition of column headers for AddListViewColumns function */ @@ -822,7 +821,7 @@ static HIMAGELIST ResetApplicationList(BOOL bFirstRun, HWND hWnd, HIMAGELIST hIm * lParam - additional parameter * Returns : Depends on the message */ -static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { int selitem; static HIMAGELIST hImageList; @@ -947,7 +946,7 @@ static void StartApplet(HWND hWnd) psp.hInstance = hInst; psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); psp.u2.pszIcon = NULL; - psp.pfnDlgProc = (DLGPROC) MainDlgProc; + psp.pfnDlgProc = MainDlgProc; psp.pszTitle = tab_title; psp.lParam = 0;

1 0

Dmitry Timoshkov : windowscodecs: Add NULL pointer checks to some color context methods.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: bfed6e5f3003a3a9b33b71290e35d0b983a9e7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfed6e5f3003a3a9b33b71290… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 13:33:48 2012 +0800 windowscodecs: Add NULL pointer checks to some color context methods. --- dlls/windowscodecs/colorcontext.c | 8 ++++++++ dlls/windowscodecs/pngformat.c | 2 ++ dlls/windowscodecs/tests/pngformat.c | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 5434fc6..457b4db 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -144,6 +144,8 @@ static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, ColorContext *This = impl_from_IWICColorContext(iface); TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; + *pType = This->type; return S_OK; } @@ -157,6 +159,8 @@ static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, if (This->type != WICColorContextProfile) return WINCODEC_ERR_NOTINITIALIZED; + if (!pcbActual) return E_INVALIDARG; + if (cbBuffer >= This->profile_len && pbBuffer) memcpy(pbBuffer, This->profile, This->profile_len); @@ -171,6 +175,8 @@ static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, ColorContext *This = impl_from_IWICColorContext(iface); TRACE("(%p,%p)\n", iface, pValue); + if (!pValue) return E_INVALIDARG; + *pValue = This->exif_color_space; return S_OK; } @@ -191,6 +197,8 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) { ColorContext *This; + if (!colorcontext) return E_INVALIDARG; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorContext)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 89f092e..6d6117e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -854,6 +854,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + if (!pcActualCount) return E_INVALIDARG; + EnterCriticalSection(&This->lock); if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b7dfbd0..3f4e855 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -331,6 +331,9 @@ static void test_color_contexts(void) ok(decoder != 0, "Failed to load PNG image data\n"); /* global color context */ + hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, NULL); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "GetColorContexts error %#x\n", hr); + count = 0xdeadbeef; hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, &count); ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "GetColorContexts error %#x\n", hr); @@ -340,6 +343,9 @@ static void test_color_contexts(void) hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); + hr = IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + count = 0xdeadbeef; hr = IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, &count); ok(hr == S_OK, "GetColorContexts error %#x\n", hr); @@ -366,19 +372,31 @@ static void test_color_contexts(void) ok(hr == S_OK, "GetColorContexts error %#x\n", hr); ok(count == 1, "unexpected count %u\n", count); + hr = IWICImagingFactory_CreateColorContext(factory, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICImagingFactory_CreateColorContext(factory, &context); ok(hr == S_OK, "CreateColorContext error %#x\n", hr); + hr = IWICColorContext_GetType(context, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + type = 0xdeadbeef; hr = IWICColorContext_GetType(context, &type); ok(hr == S_OK, "GetType error %#x\n", hr); ok(type == WICColorContextUninitialized, "unexpected type %u\n", type); + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, NULL); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "GetProfileBytes error %#x\n", hr); + size = 0; hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "GetProfileBytes error %#x\n", hr); ok(!size, "unexpected size %u\n", size); + hr = IWICColorContext_GetExifColorSpace(context, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + colorspace = 0xdeadbeef; hr = IWICColorContext_GetExifColorSpace(context, &colorspace); ok(hr == S_OK, "GetExifColorSpace error %#x\n", hr); @@ -424,6 +442,9 @@ static void test_color_contexts(void) hr = IWICBitmapFrameDecode_GetColorContexts(frame, count, &context, &count); ok(hr == S_OK, "GetColorContexts error %#x\n", hr); + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + size = 0; hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); ok(hr == S_OK, "GetProfileBytes error %#x\n", hr);

1 0

Dmitry Timoshkov : gdiplus: Avoid more cases of allocating a transformation matrix on the heap.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: b9ead1a7ea207bfb2492c59b50a34dcdbe22565f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ead1a7ea207bfb2492c59b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 11:58:48 2012 +0800 gdiplus: Avoid more cases of allocating a transformation matrix on the heap. --- dlls/gdiplus/graphics.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 083c115..f56682b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1439,7 +1439,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s const GpCustomLineCap *custom, REAL x1, REAL y1, REAL x2, REAL y2) { HGDIOBJ oldbrush = NULL, oldpen = NULL; - GpMatrix *matrix = NULL; + GpMatrix matrix; HBRUSH brush = NULL; HPEN pen = NULL; PointF ptf[4], *custptf = NULL; @@ -1584,16 +1584,17 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s custpt = GdipAlloc(count * sizeof(POINT)); tp = GdipAlloc(count); - if(!custptf || !custpt || !tp || (GdipCreateMatrix(&matrix) != Ok)) + if(!custptf || !custpt || !tp) goto custend; memcpy(custptf, custom->pathdata.Points, count * sizeof(PointF)); - GdipScaleMatrix(matrix, size, size, MatrixOrderAppend); - GdipRotateMatrix(matrix, (180.0 / M_PI) * (theta - M_PI_2), + GdipSetMatrixElements(&matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipScaleMatrix(&matrix, size, size, MatrixOrderAppend); + GdipRotateMatrix(&matrix, (180.0 / M_PI) * (theta - M_PI_2), MatrixOrderAppend); - GdipTranslateMatrix(matrix, x2, y2, MatrixOrderAppend); - GdipTransformMatrixPoints(matrix, custptf, count); + GdipTranslateMatrix(&matrix, x2, y2, MatrixOrderAppend); + GdipTransformMatrixPoints(&matrix, custptf, count); transform_and_round_points(graphics, custpt, custptf, count); @@ -1613,7 +1614,6 @@ custend: GdipFree(custptf); GdipFree(custpt); GdipFree(tp); - GdipDeleteMatrix(matrix); break; default: break; @@ -3127,7 +3127,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image RECT dst_area; GpRect src_area; int i, x, y, src_stride, dst_stride; - GpMatrix *dst_to_src; + GpMatrix dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; LPBYTE src_data, dst_data; BitmapData lockeddata; @@ -3159,22 +3159,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image m22 = (ptf[2].Y - ptf[0].Y) / srcheight; mdy = ptf[0].Y - m12 * srcx - m22 * srcy; - stat = GdipCreateMatrix2(m11, m12, m21, m22, mdx, mdy, &dst_to_src); - if (stat != Ok) return stat; + GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); - stat = GdipInvertMatrix(dst_to_src); - if (stat != Ok) - { - GdipDeleteMatrix(dst_to_src); - return stat; - } + stat = GdipInvertMatrix(&dst_to_src); + if (stat != Ok) return stat; dst_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!dst_data) - { - GdipDeleteMatrix(dst_to_src); - return OutOfMemory; - } + if (!dst_data) return OutOfMemory; dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); @@ -3187,7 +3178,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (!src_data) { GdipFree(dst_data); - GdipDeleteMatrix(dst_to_src); return OutOfMemory; } src_stride = sizeof(ARGB) * src_area.Width; @@ -3210,7 +3200,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (src_data != dst_data) GdipFree(src_data); GdipFree(dst_data); - GdipDeleteMatrix(dst_to_src); return stat; } @@ -3219,7 +3208,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_stride, ColorAdjustTypeBitmap); /* Transform the bits as needed to the destination. */ - GdipTransformMatrixPoints(dst_to_src, dst_to_src_points, 3); + GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; @@ -3246,8 +3235,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } } - GdipDeleteMatrix(dst_to_src); - GdipFree(src_data); stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top,

1 0

Henri Verbeet : d3d9/tests: Add a test for the scissor rect and viewport after SetRenderTarget() calls .
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 8180b9000ab766d885e374e3a98800384a133891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8180b9000ab766d885e374e3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:51 2012 +0100 d3d9/tests: Add a test for the scissor rect and viewport after SetRenderTarget() calls. --- dlls/d3d9/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fd3fd30..f51a8ae 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3565,6 +3565,118 @@ done: DestroyWindow(window); } +static void test_set_rt_vp_scissor(void) +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d9; + D3DVIEWPORT9 vp; + UINT refcount; + HWND window; + HRESULT hr; + RECT rect; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == screen_width, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == screen_height, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == screen_width && rect.bottom == screen_height, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + IDirect3DStateBlock9_Release(stateblock); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == 128 && rect.bottom == 128, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + vp.X = 10; + vp.Y = 20; + vp.Width = 30; + vp.Height = 40; + vp.MinZ = 0.25f; + vp.MaxZ = 0.75f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + SetRect(&rect, 50, 60, 70, 80); + hr = IDirect3DDevice9_SetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == 128 && rect.bottom == 128, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3622,6 +3734,7 @@ START_TEST(device) test_mode_change(); test_device_window_reset(); test_reset_resources(); + test_set_rt_vp_scissor(); } out:

1 0

Henri Verbeet : d3d8/tests: Add a test for the viewport after SetRenderTarget() calls.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: fa834b0bcc80f207a0ab5723bd0c3be9f6fd6e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa834b0bcc80f207a0ab5723b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:50 2012 +0100 d3d8/tests: Add a test for the viewport after SetRenderTarget() calls. --- dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e41aeb3..6dd6d30 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3284,6 +3284,96 @@ done: DestroyWindow(window); } +static void test_set_rt_vp_scissor(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + IDirect3D8 *d3d8; + DWORD stateblock; + D3DVIEWPORT8 vp; + UINT refcount; + HWND window; + HRESULT hr; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == screen_width, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == screen_height, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Failed to delete stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + vp.X = 10; + vp.Y = 20; + vp.Width = 30; + vp.Height = 40; + vp.MinZ = 0.25f; + vp.MaxZ = 0.75f; + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3340,6 +3430,7 @@ START_TEST(device) test_device_window_reset(); test_reset_resources(); depth_blit_test(); + test_set_rt_vp_scissor(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : wined3d: Update the scissor rect and viewport even on redundant wined3d_device_set_render_target () calls.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 94ab9d5ef39c14cf3cb38f650c0f72a03c277222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ab9d5ef39c14cf3cb38f650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:49 2012 +0100 wined3d: Update the scissor rect and viewport even on redundant wined3d_device_set_render_target() calls. --- dlls/wined3d/device.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6b4acf..16287ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4531,13 +4531,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - prev = device->fb.render_targets[render_target_idx]; - if (render_target == prev) - { - TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; - } - /* Render target 0 can't be set to NULL. */ if (!render_target && !render_target_idx) { @@ -4551,6 +4544,33 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + /* Set the viewport and scissor rectangles, if requested. Tests show that + * stateblock recording is ignored, the change goes directly into the + * primary stateblock. */ + if (!render_target_idx && set_viewport) + { + struct wined3d_state *state = &device->stateBlock->state; + + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = render_target->resource.width; + state->viewport.height = render_target->resource.height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; + device_invalidate_state(device, STATE_VIEWPORT); + + state->scissor_rect.top = 0; + state->scissor_rect.left = 0; + state->scissor_rect.right = render_target->resource.width; + state->scissor_rect.bottom = render_target->resource.height; + device_invalidate_state(device, STATE_SCISSORRECT); + } + + + prev = device->fb.render_targets[render_target_idx]; + if (render_target == prev) + return WINED3D_OK; + if (render_target) wined3d_surface_incref(render_target); device->fb.render_targets[render_target_idx] = render_target; @@ -4559,27 +4579,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (prev) wined3d_surface_decref(prev); - /* Render target 0 is special. */ - if (!render_target_idx && set_viewport) - { - /* Set the viewport and scissor rectangles, if requested. Tests show - * that stateblock recording is ignored, the change goes directly - * into the primary stateblock. */ - device->stateBlock->state.viewport.height = device->fb.render_targets[0]->resource.height; - device->stateBlock->state.viewport.width = device->fb.render_targets[0]->resource.width; - device->stateBlock->state.viewport.x = 0; - device->stateBlock->state.viewport.y = 0; - device->stateBlock->state.viewport.max_z = 1.0f; - device->stateBlock->state.viewport.min_z = 0.0f; - device_invalidate_state(device, STATE_VIEWPORT); - - device->stateBlock->state.scissor_rect.top = 0; - device->stateBlock->state.scissor_rect.left = 0; - device->stateBlock->state.scissor_rect.right = device->stateBlock->state.viewport.width; - device->stateBlock->state.scissor_rect.bottom = device->stateBlock->state.viewport.height; - device_invalidate_state(device, STATE_SCISSORRECT); - } - device_invalidate_state(device, STATE_FRAMEBUFFER); return WINED3D_OK;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 92a9fe463be7562e49faa088ddae8df7789313b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a9fe463be7562e49faa088d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:48 2012 +0100 ddraw: Avoid LPDIRECT3D. --- include/d3d.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 24dcad6..46fb2d6 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -409,7 +409,7 @@ DECLARE_INTERFACE_(IDirect3DLight,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DLight methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(SetLight)(THIS_ LPD3DLIGHT lpLight) PURE; STDMETHOD(GetLight)(THIS_ LPD3DLIGHT lpLight) PURE; }; @@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DMaterial methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE; @@ -652,7 +652,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -720,7 +720,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -796,7 +796,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d, GUID *guid, D3DDEVICEDESC *desc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, @@ -958,7 +958,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D *lplpDirect3D) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D **d3d) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D2.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 4a339708d6034c58cee87369a355df834d402f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a339708d6034c58cee87369a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:47 2012 +0100 ddraw: Avoid LPDIRECT3D2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f1b9e2d..24dcad6 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1036,7 +1036,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D2 *lplpDirect3D2) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D2 **d3d) PURE; /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport2 **viewport) PURE;

1 0

Michael Stefaniuc : user32: Remove two superfluous casts.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 8f7eaf26ce329e0eea0e30aa1d32bd0b183b666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7eaf26ce329e0eea0e30aa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:51:54 2012 +0100 user32: Remove two superfluous casts. --- dlls/user32/tests/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index dd4342d..346cc2a 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -170,11 +170,11 @@ static void test_accel1(void) ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0000; + ac[n++].fVirt = 0x0000; ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0001; + ac[n++].fVirt = 0x0001; hAccel = CreateAcceleratorTable( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n");

1 0

Michael Stefaniuc : msvcp: Don't cast zero.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: cf36ddd6fc8ad944d3e74df1c3472d252b55e749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36ddd6fc8ad944d3e74df1c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:46:29 2012 +0100 msvcp: Don't cast zero. --- dlls/msvcp100/locale.c | 2 +- dlls/msvcp71/locale.c | 2 +- dlls/msvcp90/locale.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 198cc33..eeb7440 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -3824,7 +3824,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found); diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 381c21e..fe6d085 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -4242,7 +4242,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c3f48d9..53b7afd 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4424,7 +4424,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found);

1 0

Michael Stefaniuc : kernel32/tests: Don't cast zero.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: f62ba6ff5c9b2cc4ce179da18f8234168e0d1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62ba6ff5c9b2cc4ce179da18… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:51:14 2012 +0100 kernel32/tests: Don't cast zero. --- dlls/kernel32/tests/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7fdb633..10f1682 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1179,7 +1179,7 @@ static void test_initonce(void) ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); - ok(g_initctxt == (void*)0x0, "got %p\n", g_initctxt); + ok(g_initctxt == NULL, "got %p\n", g_initctxt); ok(g_initcallback_called, "got %d\n", g_initcallback_called); /* so it's been called already so won't be called again */

1 0

Piotr Caban : msvcp60: Fixed basic_string::_Copy implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 0569947da09328d033fbe234587fcd31ab624ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0569947da09328d033fbe2345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:26 2012 +0100 msvcp60: Fixed basic_string::_Copy implementation. --- dlls/msvcp60/string.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 5b0b358..6fe2780 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -260,9 +260,8 @@ void __thiscall basic_string_char__Copy(basic_string_char *this, MSVCP_size_t co { TRACE("%p %lu\n", this, copy_len); - if(!basic_string_char__Grow(this, copy_len, FALSE)) + if(!basic_string_char__Grow(this, copy_len, TRUE)) return; - basic_string_char__Eos(this, copy_len); } /* ?_Pdif@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@CAIPBD0@Z */ @@ -1976,9 +1975,8 @@ void __thiscall basic_string_wchar__Copy(basic_string_wchar *this, MSVCP_size_t { TRACE("%p %lu\n", this, copy_len); - if(!basic_string_wchar__Grow(this, copy_len, FALSE)) + if(!basic_string_wchar__Grow(this, copy_len, TRUE)) return; - basic_string_wchar__Eos(this, copy_len); } /* ?_Pdif@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@CAIPBG0@Z */

1 0

Piotr Caban : msvcp60: Fixed basic_string::_Tidy implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 3a7a1d7125378aaca255149792c0d3b1ce39193e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7a1d7125378aaca25514979… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:17 2012 +0100 msvcp60: Fixed basic_string::_Tidy implementation. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2b890fa..5b0b358 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -166,7 +166,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil if(!this->ptr || !built); else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) - MSVCP_allocator_char_deallocate(NULL, this->ptr, this->res+2); + MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--; @@ -1882,7 +1882,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu if(!this->ptr || !built); else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) - MSVCP_allocator_wchar_deallocate(NULL, this->ptr, this->res+2); + MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--;

1 0

Piotr Caban : msvcp60: Fixed handling of empty strings.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 95c4284822853c1a0c7227aa38174e61337a07fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c4284822853c1a0c7227aa3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:08 2012 +0100 msvcp60: Fixed handling of empty strings. --- dlls/msvcp60/string.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index d2e1c81..2b890fa 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -236,7 +236,8 @@ void __thiscall basic_string_char__Split(basic_string_char *this) len = this->size; basic_string_char__Tidy(this, TRUE); if(basic_string_char__Grow(this, len, FALSE)) { - char_traits_char__Copy_s(this->ptr, this->res, ptr, len); + if(ptr) + char_traits_char__Copy_s(this->ptr, this->res, ptr, len); basic_string_char__Eos(this, len); } } @@ -345,8 +346,8 @@ basic_string_char* __thiscall basic_string_char_assign_substr( basic_string_char_erase(this, pos+len, basic_string_char_npos); basic_string_char_erase(this, 0, pos); } else if(basic_string_char__Grow(this, len, FALSE)) { - char_traits_char__Copy_s(this->ptr, this->res, - assign->ptr+pos, len); + if(assign->ptr) + char_traits_char__Copy_s(this->ptr, this->res, assign->ptr+pos, len); basic_string_char__Eos(this, len); } @@ -1149,8 +1150,9 @@ basic_string_char* __thiscall basic_string_char_append_substr(basic_string_char _Xlen(); if(basic_string_char__Grow(this, this->size+count, FALSE)) { - char_traits_char__Copy_s(this->ptr+this->size, - this->res-this->size, append->ptr+offset, count); + if(append->ptr) + char_traits_char__Copy_s(this->ptr+this->size, this->res-this->size, + append->ptr+offset, count); basic_string_char__Eos(this, this->size+count); } @@ -1763,7 +1765,8 @@ MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, _Xran(); if(count > this->size-off) count = this->size-off; - char_traits_char__Copy_s(dest, count, this->ptr+off, count); + if(this->ptr) + char_traits_char__Copy_s(dest, count, this->ptr+off, count); return count; } @@ -1949,7 +1952,8 @@ void __thiscall basic_string_wchar__Split(basic_string_wchar *this) len = this->size; basic_string_wchar__Tidy(this, TRUE); if(basic_string_wchar__Grow(this, len, FALSE)) { - char_traits_wchar__Copy_s(this->ptr, this->res, ptr, len); + if(ptr) + char_traits_wchar__Copy_s(this->ptr, this->res, ptr, len); basic_string_wchar__Eos(this, len); } } @@ -2058,8 +2062,9 @@ basic_string_wchar* __thiscall basic_string_wchar_assign_substr( basic_string_wchar_erase(this, pos+len, basic_string_wchar_npos); basic_string_wchar_erase(this, 0, pos); } else if(basic_string_wchar__Grow(this, len, FALSE)) { - char_traits_wchar__Copy_s(this->ptr, this->res, - assign->ptr+pos, len); + if(assign->ptr) + char_traits_wchar__Copy_s(this->ptr, this->res, + assign->ptr+pos, len); basic_string_wchar__Eos(this, len); } @@ -2861,8 +2866,9 @@ basic_string_wchar* __thiscall basic_string_wchar_append_substr(basic_string_wch _Xlen(); if(basic_string_wchar__Grow(this, this->size+count, FALSE)) { - char_traits_wchar__Copy_s(this->ptr+this->size, - this->res-this->size, append->ptr+offset, count); + if(append->ptr) + char_traits_wchar__Copy_s(this->ptr+this->size, this->res-this->size, + append->ptr+offset, count); basic_string_wchar__Eos(this, this->size+count); } @@ -3475,7 +3481,8 @@ MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, _Xran(); if(count > this->size-off) count = this->size-off; - char_traits_wchar__Copy_s(dest, count, this->ptr+off, count); + if(this->ptr) + char_traits_wchar__Copy_s(dest, count, this->ptr+off, count); return count; }

1 0

Piotr Caban : msvcp60: Export basic_ostream constructors.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 4f4f93802a1472e12c499d50a2d30c3e78877723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4f93802a1472e12c499d50a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:43:58 2012 +0100 msvcp60: Export basic_ostream constructors. --- dlls/msvcp60/ios.c | 110 +++++++++++++++++++++------------------------ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 60 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f4f93802a1472e12c499…

1 0

Piotr Caban : msvcp60: Added basic_stringbuf::_Mode implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: eae21a1fbf9f157ae172d227de49645330dafb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae21a1fbf9f157ae172d227d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:43:48 2012 +0100 msvcp60: Added basic_stringbuf::_Mode implementation. --- dlls/msvcp60/ios.c | 12 +++++++++--- dlls/msvcp60/msvcp60.spec | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 02e903d..e597a7e 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -275,9 +275,9 @@ typedef enum { typedef struct { basic_streambuf_char base; - streamsize minsize; char *endsave; char *seekhigh; + streamsize minsize; int strmode; void* (__cdecl *palloc)(MSVCP_size_t); void (__cdecl *pfree)(void*); @@ -3279,7 +3279,10 @@ int __thiscall basic_filebuf_wchar_sync(basic_filebuf_wchar *this) /* ?_Getstate@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z */ /* ?_Getstate@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z */ -static int basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode) +/* ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z */ +/* ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_stringbuf_char__Getstate, 8) +int __thiscall basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode) { int state = 0; @@ -3645,7 +3648,10 @@ basic_string_char* __thiscall basic_stringbuf_char_str_get(const basic_stringbuf /* ?_Getstate@?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@AEAAHH@Z */ /* ?_Getstate@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z */ /* ?_Getstate@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z */ -static int basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode) +/* ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z */ +/* ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_stringbuf_wchar__Getstate, 8) +int __thiscall basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode) { int state = 0; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 8dcf374..abcc88e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2303,10 +2303,10 @@ @ stub -arch=win64 ?_Makpat@?$_Mpunct@D@std@@AEAAXAEAUpattern@money_base@2@DDD@Z @ stub -arch=win32 ?_Makpat@?$_Mpunct@G@std@@AAEXAAUpattern@money_base@2@DDD@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct@G@std@@AEAAXAEAUpattern@money_base@2@DDD@Z -@ stub -arch=win32 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z -@ stub -arch=win64 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z -@ stub -arch=win32 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z -@ stub -arch=win64 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z +@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z(ptr long) basic_stringbuf_char__Getstate +@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z(ptr long) basic_stringbuf_char__Getstate +@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z(ptr long) basic_stringbuf_wchar__Getstate +@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z(ptr long) basic_stringbuf_wchar__Getstate @ stub ?_Nanv@?$_Ctr@M@std@@SAMM@Z @ stub ?_Nanv@?$_Ctr@N@std@@SANN@Z @ stub ?_Nanv@?$_Ctr@O@std@@SAOO@Z

1 0

Frédéric Delanoy : msi: Fix leaks in ITERATE_InstallService (coverity).
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 098b3c72941c810a8b4f2712e70654312bba5857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098b3c72941c810a8b4f2712e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 16 11:50:28 2012 +0100 msi: Fix leaks in ITERATE_InstallService (coverity). --- dlls/msi/action.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2bf0ed5..246b90c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5752,6 +5752,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; + UINT ret = ERROR_SUCCESS; comp = MSI_RecordGetString( rec, 12 ); component = msi_get_loaded_component( package, comp ); @@ -5809,7 +5810,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { int len = strlenW(file->TargetPath) + strlenW(args) + 2; if (!(image_path = msi_alloc(len * sizeof(WCHAR)))) - return ERROR_OUTOFMEMORY; + { + ret = ERROR_OUTOFMEMORY; + goto done; + } strcpyW(image_path, file->TargetPath); strcatW(image_path, szSpace); @@ -5843,7 +5847,7 @@ done: msi_free(depends); msi_free(args); - return ERROR_SUCCESS; + return ret; } static UINT ACTION_InstallServices( MSIPACKAGE *package )

1 0

Frédéric Delanoy : msi: Fix leaks in stop_service_dependents (coverity).
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: cac26d47a0400788de4782691780f2db1aa04eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac26d47a0400788de4782691… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 16 11:50:27 2012 +0100 msi: Fix leaks in stop_service_dependents (coverity). --- dlls/msi/action.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 833bc67..2bf0ed5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6043,6 +6043,7 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) ENUM_SERVICE_STATUSW *dependencies; SERVICE_STATUS ss; SC_HANDLE depserv; + BOOL stopped, ret = FALSE; if (EnumDependentServicesW(service, SERVICE_ACTIVE, NULL, 0, &needed, &count)) @@ -6057,24 +6058,26 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) if (!EnumDependentServicesW(service, SERVICE_ACTIVE, dependencies, needed, &needed, &count)) - goto error; + goto done; for (i = 0; i < count; i++) { depserv = OpenServiceW(scm, dependencies[i].lpServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (!depserv) - goto error; + goto done; - if (!ControlService(depserv, SERVICE_CONTROL_STOP, &ss)) - goto error; + stopped = ControlService(depserv, SERVICE_CONTROL_STOP, &ss); + CloseServiceHandle(depserv); + if (!stopped) + goto done; } - return TRUE; + ret = TRUE; -error: +done: msi_free(dependencies); - return FALSE; + return ret; } static UINT stop_service( LPCWSTR name )

1 0

Erich Hoover : wininet: Fix InternetCrackUrl parsing URLs containing a semicolon.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 499c53175bd9e886dcbf02d0a70bad0d1ac0b900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499c53175bd9e886dcbf02d0a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Nov 15 10:23:52 2012 -0700 wininet: Fix InternetCrackUrl parsing URLs containing a semicolon. --- dlls/wininet/internet.c | 4 +--- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0e83389..1877af9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1717,9 +1717,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; /* Parse <params> */ - lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl)); - if(!lpszParam) - lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl)); + lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl)); if(!lpszParam) lpszParam = memchrW(lpszap, '#', dwUrlLength - (lpszap - lpszUrl)); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 8559aae..96c3809 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -124,6 +124,9 @@ static const crack_url_test_t crack_url_tests[] = { {"http://www.winehq.org?test=123", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, 21, 9, "http", "www.winehq.org", "", "", "", "?test=123"}, + {"http://www.winehq.org/myscript.php;test=123", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 22, -1, 0, + "http", "www.winehq.org", "", "", "/myscript.php;test=123", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0

Erich Hoover : advapi32: Implement SetSecurityInfo on top of NtSetSecurityObject.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: d5e40b0eff65aa2d309b9e4be7d9867fd1cf7eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e40b0eff65aa2d309b9e4be… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Nov 15 10:16:23 2012 -0700 advapi32: Implement SetSecurityInfo on top of NtSetSecurityObject. --- dlls/advapi32/security.c | 22 +++++++- dlls/advapi32/tests/security.c | 103 ++++++++++++++++++++++++++++++++++----- 2 files changed, 108 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 699c8e0..6afcc42 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5611,9 +5611,25 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) */ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID psidOwner, - PSID psidGroup, PACL pDacl, PACL pSacl) { - FIXME("stub\n"); - return ERROR_SUCCESS; + PSID psidGroup, PACL pDacl, PACL pSacl) +{ + SECURITY_DESCRIPTOR sd; + NTSTATUS status; + + if (!InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION)) + return ERROR_INVALID_SECURITY_DESCR; + + if (SecurityInfo & OWNER_SECURITY_INFORMATION) + SetSecurityDescriptorOwner(&sd, psidOwner, FALSE); + if (SecurityInfo & GROUP_SECURITY_INFORMATION) + SetSecurityDescriptorGroup(&sd, psidGroup, FALSE); + if (SecurityInfo & DACL_SECURITY_INFORMATION) + SetSecurityDescriptorDacl(&sd, TRUE, pDacl, FALSE); + if (SecurityInfo & SACL_SECURITY_INFORMATION) + SetSecurityDescriptorSacl(&sd, TRUE, pSacl, FALSE); + + status = NtSetSecurityObject(handle, SecurityInfo, &sd); + return RtlNtStatusToDosError(status); } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 844b238..da5af04 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -120,10 +120,14 @@ static BOOL (WINAPI *pSetSecurityDescriptorControl)(PSECURITY_DESCRIPTOR, SECURI SECURITY_DESCRIPTOR_CONTROL); static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); +static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); static HMODULE hmod; static int myARGC; @@ -174,9 +178,12 @@ static void init(void) pSetEntriesInAclA = (void *)GetProcAddress(hmod, "SetEntriesInAclA"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); + pSetSecurityInfo = (void *)GetProcAddress(hmod, "SetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); + pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); + pGetAce = (void *)GetProcAddress(hmod, "GetAce"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3528,20 +3535,42 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { - HANDLE obj; - PSECURITY_DESCRIPTOR sd; + char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + ACL_SIZE_INFORMATION acl_size; + PSECURITY_DESCRIPTOR pSD; + ACCESS_ALLOWED_ACE *ace; + HANDLE token, obj; PSID owner, group; - PACL dacl; + BOOL bret = TRUE; + PACL pDacl; DWORD ret; - if (!pGetSecurityInfo) + if (!pGetSecurityInfo || !pSetSecurityInfo) { - win_skip("GetSecurityInfo is not available\n"); + win_skip("[Get|Set]SecurityInfo is not available\n"); return; } + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + GetTokenInformation(token, TokenUser, b, l, &l); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)b)->User.Sid; + /* Create something. Files have lots of associated security info. */ - obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, + obj = CreateFile(myARGV[0], GENERIC_READ|WRITE_DAC, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (obj == INVALID_HANDLE_VALUE) { @@ -3551,7 +3580,7 @@ static void test_GetSecurityInfo(void) ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, &sd); + &owner, &group, &pDacl, NULL, &pSD); if (ret == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetSecurityInfo is not implemented\n"); @@ -3559,15 +3588,15 @@ static void test_GetSecurityInfo(void) return; } ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); - ok(sd != NULL, "GetSecurityInfo\n"); + ok(pSD != NULL, "GetSecurityInfo\n"); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); - LocalFree(sd); + LocalFree(pSD); if (!pCreateWellKnownSid) { @@ -3580,15 +3609,61 @@ static void test_GetSecurityInfo(void) the other stuff, leaving us no way to free it. */ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, NULL); + &owner, &group, &pDacl, NULL, NULL); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); + /* Create security descriptor information and test that it comes back the same */ + pSD = &sd; + pDacl = (PACL)&dacl; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + ret = pSetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret); + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, NULL); + ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityInfo returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + LocalFree(pSD); + CloseHandle(obj); }

1 0

Nikolay Sivov : msxml3: Stub support for external entity resolver.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 7a00f31ecf0b5bf86cf38cb262540419d571de44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a00f31ecf0b5bf86cf38cb26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 16:46:36 2012 -0500 msxml3: Stub support for external entity resolver. --- dlls/msxml3/saxreader.c | 49 +++++++++++++++++++--------------------- dlls/msxml3/tests/saxreader.c | 9 +++++++ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 21c5b4f..073a00c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -168,6 +168,7 @@ enum saxhandler_type SAXContentHandler = 0, SAXDeclHandler, SAXDTDHandler, + SAXEntityResolver, SAXErrorHandler, SAXLexicalHandler, SAXHandler_Last @@ -197,10 +198,17 @@ struct saxlexicalhandler_iface IVBSAXLexicalHandler *vbhandler; }; +struct saxentityresolver_iface +{ + ISAXEntityResolver *handler; + IVBSAXEntityResolver *vbhandler; +}; + struct saxhandler_iface { union { struct saxcontenthandler_iface content; + struct saxentityresolver_iface entityresolver; struct saxerrorhandler_iface error; struct saxlexicalhandler_iface lexical; struct saxanyhandler_iface anyhandler; @@ -1843,6 +1851,12 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) This->column += 4+end-cur; } +static xmlParserInputPtr libxmlresolveentity(void *ctx, const xmlChar *publicid, const xmlChar *systemid) +{ + FIXME("entity resolving not implemented, %s, %s\n", publicid, systemid); + return xmlSAX2ResolveEntity(ctx, publicid, systemid); +} + /*** IVBSAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI ivbsaxlocator_QueryInterface(IVBSAXLocator* iface, REFIID riid, void **ppvObject) @@ -2377,24 +2391,6 @@ static HRESULT internal_parseStream(saxreader *This, ISequentialStream *stream, return hr; } -static HRESULT internal_getEntityResolver( - saxreader *This, - void *pEntityResolver, - BOOL vbInterface) -{ - FIXME("(%p)->(%p) stub\n", This, pEntityResolver); - return E_NOTIMPL; -} - -static HRESULT internal_putEntityResolver( - saxreader *This, - void *pEntityResolver, - BOOL vbInterface) -{ - FIXME("(%p)->(%p) stub\n", This, pEntityResolver); - return E_NOTIMPL; -} - static HRESULT internal_parse( saxreader* This, VARIANT varInput, @@ -2877,18 +2873,18 @@ static HRESULT WINAPI saxxmlreader_putProperty( static HRESULT WINAPI saxxmlreader_get_entityResolver( IVBSAXXMLReader* iface, - IVBSAXEntityResolver **pEntityResolver) + IVBSAXEntityResolver **resolver) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - return internal_getEntityResolver(This, pEntityResolver, TRUE); + return saxreader_get_handler(This, SAXEntityResolver, TRUE, (void**)resolver); } static HRESULT WINAPI saxxmlreader_put_entityResolver( IVBSAXXMLReader* iface, - IVBSAXEntityResolver *pEntityResolver) + IVBSAXEntityResolver *resolver) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - return internal_putEntityResolver(This, pEntityResolver, TRUE); + return saxreader_put_handler(This, SAXEntityResolver, resolver, TRUE); } static HRESULT WINAPI saxxmlreader_get_contentHandler( @@ -3084,18 +3080,18 @@ static HRESULT WINAPI isaxxmlreader_putProperty( static HRESULT WINAPI isaxxmlreader_getEntityResolver( ISAXXMLReader* iface, - ISAXEntityResolver **ppEntityResolver) + ISAXEntityResolver **resolver) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return internal_getEntityResolver(This, ppEntityResolver, FALSE); + return saxreader_get_handler(This, SAXEntityResolver, FALSE, (void**)resolver); } static HRESULT WINAPI isaxxmlreader_putEntityResolver( ISAXXMLReader* iface, - ISAXEntityResolver *pEntityResolver) + ISAXEntityResolver *resolver) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return internal_putEntityResolver(This, pEntityResolver, FALSE); + return saxreader_put_handler(This, SAXEntityResolver, resolver, FALSE); } static HRESULT WINAPI isaxxmlreader_getContentHandler( @@ -3264,6 +3260,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->sax.error = libxmlFatalError; reader->sax.fatalError = libxmlFatalError; reader->sax.cdataBlock = libxmlCDataBlock; + reader->sax.resolveEntity = libxmlresolveentity; *ppObj = &reader->IVBSAXXMLReader_iface; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bcf7529..02bc00c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1903,6 +1903,7 @@ static void test_saxreader(void) while (table->clsid) { struct call_entry *test_seq; + ISAXEntityResolver *resolver; BSTR str; if (!is_clsid_supported(table->clsid, reader_support_data)) @@ -2220,6 +2221,14 @@ static void test_saxreader(void) EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + resolver = (void*)0xdeadbeef; + hr = ISAXXMLReader_getEntityResolver(reader, &resolver); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resolver == NULL, "got %p\n", resolver); + + hr = ISAXXMLReader_putEntityResolver(reader, NULL); + ok(hr == S_OK || broken(hr == E_FAIL), "got 0x%08x\n", hr); + ISAXXMLReader_Release(reader); table++; }

1 0

Nikolay Sivov : msxml3: Store handler pointers so casts to particular type are avoided.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a644bad2afa3f2689a254f953857cae58c1b3597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a644bad2afa3f2689a254f953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 15 22:34:58 2012 -0500 msxml3: Store handler pointers so casts to particular type are avoided. --- dlls/msxml3/saxreader.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9ebdc0f..21c5b4f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -173,7 +173,7 @@ enum saxhandler_type SAXHandler_Last }; -struct saxhandler_iface +struct saxanyhandler_iface { IUnknown *handler; IUnknown *vbhandler; @@ -197,6 +197,16 @@ struct saxlexicalhandler_iface IVBSAXLexicalHandler *vbhandler; }; +struct saxhandler_iface +{ + union { + struct saxcontenthandler_iface content; + struct saxerrorhandler_iface error; + struct saxlexicalhandler_iface lexical; + struct saxanyhandler_iface anyhandler; + } u; +}; + typedef struct { DispatchEx dispex; @@ -215,7 +225,7 @@ typedef struct static HRESULT saxreader_put_handler(saxreader *reader, enum saxhandler_type type, void *ptr, BOOL vb) { - struct saxhandler_iface *iface = &reader->saxhandlers[type]; + struct saxanyhandler_iface *iface = &reader->saxhandlers[type].u.anyhandler; IUnknown *unk = (IUnknown*)ptr; if (unk) @@ -234,7 +244,7 @@ static HRESULT saxreader_put_handler(saxreader *reader, enum saxhandler_type typ static HRESULT saxreader_get_handler(const saxreader *reader, enum saxhandler_type type, BOOL vb, void **ret) { - const struct saxhandler_iface *iface = &reader->saxhandlers[type]; + const struct saxanyhandler_iface *iface = &reader->saxhandlers[type].u.anyhandler; if (!ret) return E_POINTER; @@ -253,17 +263,17 @@ static HRESULT saxreader_get_handler(const saxreader *reader, enum saxhandler_ty static struct saxcontenthandler_iface *saxreader_get_contenthandler(saxreader *reader) { - return (struct saxcontenthandler_iface*)&reader->saxhandlers[SAXContentHandler]; + return &reader->saxhandlers[SAXContentHandler].u.content; } static struct saxerrorhandler_iface *saxreader_get_errorhandler(saxreader *reader) { - return (struct saxerrorhandler_iface*)&reader->saxhandlers[SAXErrorHandler]; + return &reader->saxhandlers[SAXErrorHandler].u.error; } static struct saxlexicalhandler_iface *saxreader_get_lexicalhandler(saxreader *reader) { - return (struct saxlexicalhandler_iface*)&reader->saxhandlers[SAXLexicalHandler]; + return &reader->saxhandlers[SAXLexicalHandler].u.lexical; } typedef struct @@ -327,8 +337,8 @@ static inline saxlocator *impl_from_ISAXAttributes( ISAXAttributes *iface ) static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandler_type type) { - return (locator->vbInterface && locator->saxreader->saxhandlers[type].vbhandler) || - (!locator->vbInterface && locator->saxreader->saxhandlers[type].handler); + struct saxanyhandler_iface *iface = &locator->saxreader->saxhandlers[type].u.anyhandler; + return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler); } /* property names */ @@ -2734,7 +2744,7 @@ static ULONG WINAPI saxxmlreader_Release( for (i = 0; i < SAXHandler_Last; i++) { - struct saxhandler_iface *iface = &This->saxhandlers[i]; + struct saxanyhandler_iface *iface = &This->saxhandlers[i].u.anyhandler; if (iface->handler) IUnknown_Release(iface->handler);

1 0

Jacek Caban : wininet: Fixed HTTP CONNECT secure connection.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: bd42c0416a5db8c607d7dd7bf1576d68af4ca895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd42c0416a5db8c607d7dd7bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 14:39:16 2012 +0100 wininet: Fixed HTTP CONNECT secure connection. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1c24153..3eb0b8d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4743,7 +4743,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if(request->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn); + res = NETCON_secure_connect(request->netconn, request->server); } if(res != ERROR_SUCCESS) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3873855..1baaf2a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -538,7 +538,7 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 2abb676..a792a92 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -707,7 +707,6 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(!netconn) return ERROR_OUTOFMEMORY; - netconn->useSSL = useSSL; netconn->socketFD = -1; netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; @@ -903,7 +902,7 @@ fail: * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(netconn_t *connection) +DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -914,6 +913,13 @@ DWORD NETCON_secure_connect(netconn_t *connection) return ERROR_INTERNET_CANNOT_CONNECT; } + connection->useSSL = TRUE; + if(server != connection->server) { + server_release(connection->server); + server_addref(server); + connection->server = server; + } + /* connect with given TLS options */ res = netcon_secure_connect_setup(connection, get_tls_option()); if (res == ERROR_SUCCESS)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012