wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Hans Leidekker : wmiutils: Implement IWbemPath::GetServer.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 19f9420f62f8de530901742b9349b451b74d0b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f9420f62f8de530901742b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 14 10:52:05 2013 +0100 wmiutils: Implement IWbemPath::GetServer. --- dlls/wmiutils/path.c | 15 ++++++++++--- dlls/wmiutils/tests/path.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 5075bfc..abdf0a5 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -421,11 +421,18 @@ static HRESULT WINAPI path_SetServer( static HRESULT WINAPI path_GetServer( IWbemPath *iface, - ULONG *puNameBufLength, - LPWSTR pName) + ULONG *len, + LPWSTR name) { - FIXME("%p, %p, %p\n", iface, puNameBufLength, pName); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p, %p\n", iface, len, name); + + if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; + if (!path->class) return WBEM_E_NOT_AVAILABLE; + if (*len > path->len_server) strcpyW( name, path->server ); + *len = path->len_server + 1; + return S_OK; } static HRESULT WINAPI path_GetNamespaceCount( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index affd408..2d435f0 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -323,6 +323,53 @@ static void test_IWbemPath_GetClassName(void) IWbemPath_Release( path ); } +static void test_IWbemPath_GetServer(void) +{ + static const WCHAR dotW[] = {'.',0}; + IWbemPath *path; + HRESULT hr; + WCHAR buf[32]; + ULONG len; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetServer( path, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, dotW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( dotW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -330,6 +377,7 @@ START_TEST (path) test_IWbemPath_SetText(); test_IWbemPath_GetText(); test_IWbemPath_GetClassName(); + test_IWbemPath_GetServer(); CoUninitialize(); }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetClassName.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 5a12f6c088d06ae66b4e282cfa29e4faf6aa1397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a12f6c088d06ae66b4e282cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 14 10:51:24 2013 +0100 wmiutils: Implement IWbemPath::GetClassName. --- dlls/wmiutils/path.c | 15 ++++++-- dlls/wmiutils/tests/path.c | 87 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index c146671..5075bfc 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -547,11 +547,18 @@ static HRESULT WINAPI path_SetClassName( static HRESULT WINAPI path_GetClassName( IWbemPath *iface, - ULONG *puBufferLength, - LPWSTR pszName) + ULONG *len, + LPWSTR name) { - FIXME("%p,%p, %p\n", iface, puBufferLength, pszName); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p, %p\n", iface, len, name); + + if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; + if (!path->class) return WBEM_E_INVALID_OBJECT_PATH; + if (*len > path->len_class) strcpyW( name, path->class ); + *len = path->len_class + 1; + return S_OK; } static HRESULT WINAPI path_GetKeyList( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 6824d25..affd408 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -61,6 +61,20 @@ static const WCHAR path17[] = {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=','"','C',':','"',0}; +static IWbemPath *create_path(void) +{ + HRESULT hr; + IWbemPath *path; + + hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); + if (hr != S_OK) + { + win_skip( "can't create WbemDefPath instance, skipping tests\n" ); + return NULL; + } + return path; +} + static void test_IWbemPath_SetText(void) { static const struct @@ -102,13 +116,7 @@ static void test_IWbemPath_SetText(void) HRESULT hr; UINT i; - CoInitialize( NULL ); - hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); - if (hr != S_OK) - { - win_skip( "can't create WbemDefPath instance, skipping tests\n" ); - return; - } + if (!(path = create_path())) return; hr = IWbemPath_SetText( path, 0, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -135,25 +143,17 @@ static void test_IWbemPath_SetText(void) ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %u\n", i, len ); } } - IWbemPath_Release( path ); - CoUninitialize(); } static void test_IWbemPath_GetText(void) { - IWbemPath *path; WCHAR buf[128]; ULONG len, count; + IWbemPath *path; HRESULT hr; - CoInitialize( NULL ); - hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); - if (hr != S_OK) - { - win_skip( "can't create WbemDefPath instance, skipping tests\n" ); - return; - } + if (!(path = create_path())) return; hr = IWbemPath_GetText( path, 0, NULL, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -274,11 +274,62 @@ static void test_IWbemPath_GetText(void) todo_wine ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); - CoUninitialize(); +} + +static void test_IWbemPath_GetClassName(void) +{ + static const WCHAR classW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; + IWbemPath *path; + HRESULT hr; + WCHAR buf[32]; + ULONG len; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetClassName( path, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); } START_TEST (path) { + CoInitialize( NULL ); + test_IWbemPath_SetText(); test_IWbemPath_GetText(); + test_IWbemPath_GetClassName(); + + CoUninitialize(); }

1 0

Piotr Caban : msvcrt: Be less strict while parsing file open mode in fopen function.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 5515170d136dfd639b16b409434c5a182174315d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5515170d136dfd639b16b4094… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 14 10:24:18 2013 +0100 msvcrt: Be less strict while parsing file open mode in fopen function. --- dlls/msvcrt/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 60af1a7..f0d0f7d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1263,6 +1263,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st TRACE("%s\n", debugstr_w(mode)); + while(*mode == ' ') mode++; + switch(*mode++) { case 'R': case 'r': @@ -1301,6 +1303,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st break; case '+': case ' ': + case 'a': + case 'w': break; default: MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL);

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetId.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: fc8dfe60ea517d63f8ea01584b26bda1fe36f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8dfe60ea517d63f8ea01584… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 14 10:21:03 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetId. --- dlls/d3dx9_36/xfile.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 63d85b6..234e071 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -160,9 +160,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) { - FIXME("(%p)->(%p): stub\n", iface, guid); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, guid); + + if (!guid) + return E_POINTER; + + ret = IDirectXFileData_GetId(This->dxfile_data, guid); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + return S_OK; }

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetName.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: f8d908938a4d282ee3cc48fa58e2c55b0e610bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d908938a4d282ee3cc48fa5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 14 10:20:54 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetName. --- dlls/d3dx9_36/xfile.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8fa20ff..63d85b6 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -137,9 +137,24 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetEnum(ID3DXFileData *iface, ID3DXFileE static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name, SIZE_T *size) { - FIXME("(%p)->(%p, %p): stub\n", iface, name, size); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + DWORD dxfile_size; + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, name, size); + + if (!name || !size) + return E_POINTER; + + dxfile_size = *size; + + ret = IDirectXFileData_GetName(This->dxfile_data, name, &dxfile_size); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + *size = dxfile_size; + + return S_OK; }

1 0

Dmitry Timoshkov : windowscodecs: Implement CreateBitmapFromHICON.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 4ba27f79309b440b3a6d39807a79065b96679352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba27f79309b440b3a6d39807… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 12:45:24 2013 +0800 windowscodecs: Implement CreateBitmapFromHICON. --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/imgfactory.c | 138 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 4 - 3 files changed, 136 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index d031daa..ffe0925 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,6 +1,6 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 +IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = @PNGINCL@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 1d05ef5..8762c81 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -597,10 +597,142 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactory *iface, - HICON hIcon, IWICBitmap **ppIBitmap) + HICON hicon, IWICBitmap **bitmap) { - FIXME("(%p,%p,%p): stub\n", iface, hIcon, ppIBitmap); - return E_NOTIMPL; + IWICBitmapLock *lock; + ICONINFO info; + BITMAP bm; + int width, height, x, y; + UINT stride, size; + BYTE *buffer; + DWORD *bits; + BITMAPINFO bi; + HDC hdc; + BOOL has_alpha; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, hicon, bitmap); + + if (!bitmap) return E_INVALIDARG; + + if (!GetIconInfo(hicon, &info)) + return HRESULT_FROM_WIN32(GetLastError()); + + GetObjectW(info.hbmColor ? info.hbmColor : info.hbmMask, sizeof(bm), &bm); + + width = bm.bmWidth; + height = info.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + stride = width * 4; + size = stride * height; + + hr = BitmapImpl_Create(width, height, stride, size, NULL, + &GUID_WICPixelFormat32bppBGRA, WICBitmapCacheOnLoad, bitmap); + if (hr != S_OK) goto failed; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (hr != S_OK) + { + IWICBitmap_Release(*bitmap); + goto failed; + } + IWICBitmapLock_GetDataPointer(lock, &size, &buffer); + + hdc = CreateCompatibleDC(0); + + memset(&bi, 0, sizeof(bi)); + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = width; + bi.bmiHeader.biHeight = -height; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + + has_alpha = FALSE; + + if (info.hbmColor) + { + GetDIBits(hdc, info.hbmColor, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (bm.bmBitsPixel == 32) + { + /* If any pixel has a non-zero alpha, ignore hbmMask */ + bits = (DWORD *)buffer; + for (x = 0; x < width && !has_alpha; x++, bits++) + { + for (y = 0; y < height; y++) + { + if (*bits & 0xff000000) + { + has_alpha = TRUE; + break; + } + } + } + } + } + else + GetDIBits(hdc, info.hbmMask, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (!has_alpha) + { + DWORD *rgba; + + if (info.hbmMask) + { + BYTE *mask; + + mask = HeapAlloc(GetProcessHeap(), 0, size); + if (!mask) + { + IWICBitmapLock_Release(lock); + IWICBitmap_Release(*bitmap); + DeleteDC(hdc); + hr = E_OUTOFMEMORY; + goto failed; + } + + /* read alpha data from the mask */ + GetDIBits(hdc, info.hbmMask, info.hbmColor ? 0 : height, height, mask, &bi, DIB_RGB_COLORS); + + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + bits = (DWORD *)(mask + y * stride); + + for (x = 0; x < width; x++, rgba++, bits++) + { + if (!info.hbmColor) *rgba = ~*rgba; + + if (*bits) + *rgba = 0; + else + *rgba |= 0xff000000; + } + } + + HeapFree(GetProcessHeap(), 0, mask); + } + else + { + /* set constant alpha of 255 */ + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + for (x = 0; x < width; x++, rgba++) + *rgba |= 0xff000000; + } + } + + } + + IWICBitmapLock_Release(lock); + DeleteDC(hdc); + +failed: + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + return hr; } static HRESULT WINAPI ComponentFactory_CreateComponentEnumerator(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 40b8ce6..fb7183b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -529,19 +529,15 @@ static void test_CreateBitmapFromHICON(void) DeleteObject(info.hbmMask); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, &bitmap); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_CURSOR_HANDLE), "expected ERROR_INVALID_CURSOR_HANDLE, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); -todo_wine ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); DestroyIcon(icon); if (hr != S_OK) return;

1 0

Dmitry Timoshkov : wineps.drv: Don't cast away 'const' from DEVMODE provided as input.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: d7687bed6ad8abc37996706cc41c5e888a5274e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7687bed6ad8abc37996706cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 11:16:38 2013 +0800 wineps.drv: Don't cast away 'const' from DEVMODE provided as input. --- dlls/wineps.drv/driver.c | 8 ++++---- dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/psdrv.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 8ec51a2..ef255b7 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -45,7 +45,7 @@ static inline int paper_size_from_points( float size ) return size * 254 / 72; } -INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) +INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) { INPUTSLOT *slot; @@ -56,7 +56,7 @@ INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } -PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) +PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) { PAGESIZE *page; @@ -67,7 +67,7 @@ PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } -DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ) +DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ) { DUPLEX *duplex; WORD win_duplex = dm->dmPublic.dmFields & DM_DUPLEX ? dm->dmPublic.dmDuplex : 0; @@ -88,7 +88,7 @@ DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ) * Updates dm1 with some fields from dm2 * */ -void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *pi ) +void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERINFO *pi ) { /* some sanity checks here on dm2 */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2a7c90d..5439ff5 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -324,7 +324,7 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (output && *output) physDev->job.output = strdupW( output ); if(initData) - PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODE *)initData, pi); + PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)initData, pi); PSDRV_UpdateDevCaps(physDev); SelectObject( (*pdev)->hdc, PSDRV_DefaultFont ); @@ -379,7 +379,7 @@ static HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) if (lpInitData) { - PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODE *)lpInitData, physDev->pi); + PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)lpInitData, physDev->pi); PSDRV_UpdateDevCaps(physDev); } return dev->hdc; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 12ce526..ffae328 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -409,9 +409,9 @@ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); -extern PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ); -extern DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ); +extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ); /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, @@ -462,7 +462,7 @@ extern INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; extern BOOL PSDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, +extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN; extern PPD *PSDRV_ParsePPD(char *fname, HANDLE printer) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: a3c832593c35ea074969e808a1bda6d23ac6e6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c832593c35ea074969e808a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 11:16:05 2013 +0800 wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack. --- dlls/wineps.drv/init.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2085a47..2a7c90d 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -612,7 +612,6 @@ static struct list printer_list = LIST_INIT( printer_list ); */ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { - DWORD needed, res, dwPaperSize; PRINTERINFO *pi; FONTNAME *font; const AFM *afm; @@ -678,22 +677,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - /* - * This is a hack. The default paper size should be read in as part of - * the Devmode structure, but Wine doesn't currently provide a convenient - * way to configure printers. - */ - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "Paper Size", NULL, - (LPBYTE)&dwPaperSize, sizeof(DWORD), &needed); - if (res == ERROR_SUCCESS) - pi->Devmode->dmPublic.u1.s1.dmPaperSize = (SHORT) dwPaperSize; - else if (res == ERROR_FILE_NOT_FOUND) - TRACE ("No 'Paper Size' for printer '%s'\n", debugstr_w(name)); - else { - ERR ("GetPrinterDataA returned %i\n", res); - goto fail; - } - /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. WinDuplex == 0 is a special case which means that the ppd has a *DefaultDuplex: NotCapable entry. In this case we'll try not to confuse

1 0

Nikolay Sivov : comctl32/listview: Remove some dead code.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: ea57e29d083895c16825e0fe71c592c682fcc4bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea57e29d083895c16825e0fe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 12 21:33:13 2013 +0400 comctl32/listview: Remove some dead code. --- dlls/comctl32/listview.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 75aa51b..49da83c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3490,26 +3490,15 @@ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT */ static void LISTVIEW_ShiftIndices(LISTVIEW_INFO *infoPtr, INT nItem, INT direction) { - BOOL bOldChange; - - /* temporarily disable change notification while shifting items */ - bOldChange = infoPtr->bDoChangeNotify; - infoPtr->bDoChangeNotify = FALSE; - TRACE("Shifting %i, %i steps\n", nItem, direction); ranges_shift(infoPtr->selectionRanges, nItem, direction, infoPtr->nItemCount); - assert(abs(direction) == 1); - infoPtr->nSelectionMark = shift_item(infoPtr, infoPtr->nSelectionMark, nItem, direction); - - /* But we are not supposed to modify nHotItem! */ - infoPtr->bDoChangeNotify = bOldChange; + /* But we are not supposed to modify nHotItem! */ } - /** * DESCRIPTION: * Adds a block of selections.

1 0

Nikolay Sivov : comctl32/listview: Update focus index when new item data is already there.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: dbd997c3c9284749a06d8b645680c78814bb28c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd997c3c9284749a06d8b645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 12 21:29:38 2013 +0400 comctl32/listview: Update focus index when new item data is already there. --- dlls/comctl32/listview.c | 32 +++++++++++++++----- dlls/comctl32/tests/listview.c | 63 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bb6d1b2..75aa51b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4164,7 +4164,7 @@ static inline BOOL is_assignable_item(const LVITEMW *lpLVItem, LONG lStyle) /*** * DESCRIPTION: - * Helper for LISTVIEW_SetItemT *only*: sets item attributes. + * Helper for LISTVIEW_SetItemT and LISTVIEW_InsertItemT: sets item attributes. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -4256,6 +4256,15 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL return FALSE; } + /* When item is inserted we need to shift existing focus index if new item has lower index. */ + if (isNew && (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) && + /* this means we won't hit a focus change path later */ + ((uChanged & LVIF_STATE) == 0 || (!(lpLVItem->state & LVIS_FOCUSED) && (infoPtr->nFocusedItem != lpLVItem->iItem)))) + { + if (infoPtr->nFocusedItem != -1 && (lpLVItem->iItem <= infoPtr->nFocusedItem)) + infoPtr->nFocusedItem++; + } + if (!uChanged) return TRUE; *bChanged = TRUE; @@ -4288,7 +4297,14 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL { ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); } - /* if we are asked to change focus, and we manage it, do it */ + /* If we are asked to change focus, and we manage it, do it. + It's important to have all new item data stored at this point, + cause changing existing focus could result in redrawing operation, + which in turn could ask for disp data, application should see all data + for inserted item when processing LVN_GETDISPINFO. + + The way this works application will see nested item change notifications - + changed item notifications interrupted by ones from item loosing focus. */ if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) { if (lpLVItem->state & LVIS_FOCUSED) @@ -4320,7 +4336,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* if we're inserting the item, we're done */ if (isNew) return TRUE; - + /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); @@ -7680,7 +7696,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, LVITEMW item; HWND hwndSelf = infoPtr->hwndSelf; - TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); + TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++; @@ -7730,14 +7746,13 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, else nItem = min(lpLVItem->iItem, infoPtr->nItemCount); - TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); + TRACE("inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; infoPtr->nItemCount++; /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1); - LISTVIEW_ShiftFocus(infoPtr, infoPtr->nFocusedItem, nItem, 1); /* set the item attributes */ if (lpLVItem->mask & (LVIF_GROUPID|LVIF_COLUMNS)) @@ -7763,6 +7778,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, item.state &= ~LVIS_STATEIMAGEMASK; item.state |= INDEXTOSTATEIMAGEMASK(1); } + if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* make room for the position, if we are in the right mode */ @@ -7776,9 +7792,9 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, goto undo; } } - + /* send LVN_INSERTITEM notification */ - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); + memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = nItem; nmlv.lParam = lpItem->lParam; notify_listview(infoPtr, LVN_INSERTITEM, &nmlv); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cff6e92..2fb7cb5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -363,6 +363,15 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; +static const struct message parent_insert_focused_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -5434,6 +5443,58 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static void test_insertitem(void) +{ + LVITEMA item; + UINT state; + HWND hwnd; + INT ret; + + hwnd = create_listview_control(LVS_REPORT); + + /* insert item 0 focused */ + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + item.iItem = 0; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "got %d\n", ret); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* insert item 1, focus shift */ + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + item.iItem = 1; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 1, "got %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + /* insert item 2, no focus shift */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = LVIS_FOCUSED; + item.iItem = 2; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 2, "got %d\n", ret); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5502,6 +5563,7 @@ START_TEST(listview) test_LVM_SETITEMTEXT(); test_imagelists(); test_deleteitem(); + test_insertitem(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -5533,6 +5595,7 @@ START_TEST(listview) test_LVS_EX_HEADERINALLVIEWS(); test_deleteitem(); test_multiselect(); + test_insertitem(); unload_v6_module(ctx_cookie, hCtx);

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
74
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 January 2013