March 2010 - Wine-commits - list.winehq.org

Gerald Pfeifer : crypt32: Fix type of empty in encodeBase64W().
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: ca41486b8ac39a8d3ee30fdda7eef300f93b8f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca41486b8ac39a8d3ee30fdda… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Mar 25 22:55:14 2010 +0100 crypt32: Fix type of empty in encodeBase64W(). --- dlls/crypt32/base64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 2996ba3..7a23dd9 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -365,7 +365,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, static BOOL BinaryToBase64W(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) { - static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }, empty = {0}; + static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }, empty[] = {0}; BOOL ret = TRUE; LPCWSTR header = NULL, trailer = NULL, sep; DWORD charsNeeded;

1 0

Mikhail Maroukhine : comctl32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: bd6f2181656878a5122ec785612df1110c4e841b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f2181656878a5122ec7856… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 00:51:05 2010 +0600 comctl32: Fix compiler warnings with flag -Wcast-qual. --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tooltips.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 96d041e..e693d58 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -949,7 +949,7 @@ DATETIME_Notify (DATETIME_INFO *infoPtr, const NMHDR *lpnmh) DATETIME_SendSimpleNotify(infoPtr, DTN_CLOSEUP); } if ((lpnmh->hwndFrom == infoPtr->hUpdown) && (lpnmh->code == UDN_DELTAPOS)) { - LPNMUPDOWN lpnmud = (LPNMUPDOWN)lpnmh; + const NM_UPDOWN *lpnmud = (const NM_UPDOWN*)lpnmh; TRACE("Delta pos %d\n", lpnmud->iDelta); infoPtr->pendingUpdown = lpnmud->iDelta; } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index de85491..642a8aa 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -802,7 +802,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE /* header always supplies unicode notifications, all we have to do is to convert strings to ANSI */ - nmhA = *(NMHEADERA*)lpnmh; + nmhA = *(const NMHEADERA*)lpnmh; if (lpnmh->pitem) { hditema = *(HDITEMA*)lpnmh->pitem; diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 083dd07..688d3b5 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1626,11 +1626,11 @@ TOOLTIPS_SetTitleT (TOOLTIPS_INFO *infoPtr, UINT_PTR uTitleIcon, LPCWSTR pszTitl } else { - size = sizeof(WCHAR)*MultiByteToWideChar(CP_ACP, 0, (LPSTR)pszTitle, -1, NULL, 0); + size = sizeof(WCHAR)*MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pszTitle, -1, NULL, 0); infoPtr->pszTitle = Alloc(size); if (!infoPtr->pszTitle) return FALSE; - MultiByteToWideChar(CP_ACP, 0, (LPSTR)pszTitle, -1, infoPtr->pszTitle, size/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pszTitle, -1, infoPtr->pszTitle, size/sizeof(WCHAR)); } } else @@ -1729,7 +1729,7 @@ TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOO return FALSE; /* activate */ - infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoT (infoPtr, (TTTOOLINFOW*)ti); + infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoT (infoPtr, (const TTTOOLINFOW*)ti); if (infoPtr->nTrackTool != -1) { TRACE("activated!\n"); infoPtr->bTrackActive = TRUE;

1 0

Alexandre Julliard : widl: Long constants must be 32-bit on all platforms.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: a83563aa400ac0c91fe826a0ce998cd2ef7ade2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83563aa400ac0c91fe826a0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 11:42:28 2010 +0100 widl: Long constants must be 32-bit on all platforms. --- tools/widl/expr.c | 8 ++++---- tools/widl/expr.h | 2 +- tools/widl/header.c | 4 ++-- tools/widl/header.h | 2 +- tools/widl/parser.l | 10 +++++----- tools/widl/parser.y | 4 ++-- tools/widl/typegen.c | 16 ++++++++-------- tools/widl/widltypes.h | 6 +++--- tools/widl/write_msft.c | 14 +++++++------- 9 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a83563aa400ac0c91fe82…

1 0

Alexandre Julliard : msi: Reset the MsiEnumProductsW index on failure.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: 4a88562ec712c0ddff05cfeef2540cf89f8002ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a88562ec712c0ddff05cfeef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 15:34:48 2010 +0100 msi: Reset the MsiEnumProductsW index on failure. --- dlls/msi/registry.c | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index e0a50a3..903e841 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1236,17 +1236,13 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) if (index && index - last_index != 1) return ERROR_INVALID_PARAMETER; + key = 0; r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProd, &key); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &machine_count, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if( r != ERROR_SUCCESS ) - { - RegCloseKey(key); - return ERROR_NO_MORE_ITEMS; - } + if( r != ERROR_SUCCESS ) goto failed; if (machine_count && index <= machine_count) { @@ -1261,26 +1257,23 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) } RegCloseKey(key); + key = 0; r = get_user_sid(&usersid); if (r != ERROR_SUCCESS || !usersid) { ERR("Failed to retrieve user SID: %d\n", r); + last_index = 0; return r; } sprintfW(keypath, szInstaller_LocalManaged_fmt, usersid); LocalFree(usersid); r = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, &key); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &managed_count, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if( r != ERROR_SUCCESS ) - { - RegCloseKey(key); - return ERROR_NO_MORE_ITEMS; - } + if( r != ERROR_SUCCESS ) goto failed; if (managed_count && index <= machine_count + managed_count) { @@ -1295,17 +1288,13 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) } RegCloseKey(key); + key = 0; r = RegCreateKeyW(HKEY_CURRENT_USER, szUserProduct, &key); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &unmanaged_count, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if( r != ERROR_SUCCESS ) - { - RegCloseKey(key); - return ERROR_NO_MORE_ITEMS; - } + if( r != ERROR_SUCCESS ) goto failed; if (unmanaged_count && index <= machine_count + managed_count + unmanaged_count) { @@ -1318,8 +1307,9 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) return ERROR_SUCCESS; } } +failed: RegCloseKey(key); - + last_index = 0; return ERROR_NO_MORE_ITEMS; }

1 0

Louis Lenders : Quiet two noisy FIXME's.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: 226a5019e72117406a16c98a1be146b44fb522df URL: http://source.winehq.org/git/wine.git/?a=commit;h=226a5019e72117406a16c98a1… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Mar 26 10:33:21 2010 +0100 Quiet two noisy FIXME's. --- dlls/gdi32/driver.c | 5 ++++- dlls/ntdll/rtl.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 635eeb8..639e4a8 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -750,6 +750,9 @@ INT WINAPI NamedEscape( HDC hdc, LPCWSTR pDriver, INT nEscape, INT cbInput, LPCS */ ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) { - FIXME("stub\n"); + static int warn_once; + + if (!warn_once++) + FIXME("stub\n"); return 0; } diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d4a7045..301b30c 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -444,7 +444,10 @@ PVOID WINAPI RtlInitializeGenericTable(PVOID pTable, PVOID arg2, PVOID arg3, PVO */ PVOID RtlEnumerateGenericTableWithoutSplaying(PVOID pTable, PVOID *RestartKey) { - FIXME("(%p,%p) stub!\n", pTable, RestartKey); + static int warn_once; + + if (!warn_once++) + FIXME("(%p,%p) stub!\n", pTable, RestartKey); return NULL; }

1 0

Jacek Caban : mshtml: Skip script tests on too old IE.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: afc7773dab124598e17c64b8e27de1e524f518d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc7773dab124598e17c64b8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 11:54:24 2010 +0100 mshtml: Skip script tests on too old IE. --- dlls/mshtml/tests/script.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 6a0cbe3..4ac7ba6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1050,12 +1050,21 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(FAILED(hres)) { + win_skip("Could not get IHTMLDocument5, probably too old IE\n"); + IHTMLDocument2_Release(doc); + return NULL; + } + + IHTMLDocument5_Release(doc5); return doc; }

1 0

Henri Verbeet : wined3d: Add support for partial updates of compressed surfaces to IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: eb064db0839052165eee0202b3df7ae1f65c344f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb064db0839052165eee0202b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 22:51:26 2010 +0100 wined3d: Add support for partial updates of compressed surfaces to IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 922b20a..897681d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5262,21 +5262,45 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ENTER_GL(); /* TODO: Cube and volume support */ - if(rowoffset != 0){ - /* not a whole row so we have to do it a line at a time */ - int j; + if (rowoffset) /* Not a whole row so we have to do it a line at a time. */ + { + if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)); + UINT row_length = (srcWidth / src_format_desc->block_width) * src_format_desc->block_byte_count; + UINT row_count = srcHeight / src_format_desc->block_height; + UINT src_pitch = IWineD3DSurface_GetPitch(pSourceSurface); + UINT y = destTop; + UINT row; - /* hopefully using pointer addition will be quicker than using a point + j * rowoffset */ - const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; + data += (pSourceRect->top / src_format_desc->block_height) * src_pitch; + data += (pSourceRect->left / src_format_desc->block_width) * src_format_desc->block_byte_count; - for (j = destTop; j < (srcHeight + destTop); ++j) - { - glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, j, - srcWidth, 1, dst_format_desc->glFormat, dst_format_desc->glType,data); - data += rowoffset; + for (row = 0; row < row_count; ++row) + { + GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, + destLeft, y, srcWidth, src_format_desc->block_height, + dst_format_desc->glInternal, row_length, data)); + y += src_format_desc->block_height; + data += src_pitch; + } + checkGLcall("glCompressedTexSubImage2DARB"); } + else + { + const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; + unsigned int j; - } else { /* Full width, so just write out the whole texture */ + for (j = destTop; j < (srcHeight + destTop); ++j) + { + glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, j, + srcWidth, 1, dst_format_desc->glFormat, dst_format_desc->glType,data); + data += rowoffset; + } + } + } + else /* Full width, so just write out the whole texture. */ + { const unsigned char* data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED)

1 0

Michael Stefaniuc : comctl32/tests: Use the SendMessage instead of ListView_Scroll.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: 0c2ec54535a951a5ad58a20e359452f8fc907ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2ec54535a951a5ad58a20e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 26 00:22:22 2010 +0100 comctl32/tests: Use the SendMessage instead of ListView_Scroll. --- dlls/comctl32/tests/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index aa3db80..59c3dc1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2135,7 +2135,7 @@ todo_wine expect(100, rect.left); expect(250, rect.right); - ListView_Scroll(hwnd, 10, 0); + SendMessage(hwnd, LVM_SCROLL, 10, 0); rect.left = LVIR_BOUNDS; rect.top = 1; @@ -2145,7 +2145,7 @@ todo_wine expect(90, rect.left); expect(240, rect.right); - ListView_Scroll(hwnd, -10, 0); + SendMessage(hwnd, LVM_SCROLL, -10, 0); DestroyWindow(hwnd);

1 0

Nikolay Sivov : shlwapi: Fix prototype for SHGetShellKey and extend trace.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: b6f92ceaed4d1a1561d624bf79c5493c5973f5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f92ceaed4d1a1561d624bf7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 26 03:21:08 2010 +0300 shlwapi: Fix prototype for SHGetShellKey and extend trace. --- dlls/shlwapi/ordinal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index f378ecf..93bf243 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4310,10 +4310,10 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) /*********************************************************************** * SHGetShellKey (SHLWAPI.@) */ -DWORD WINAPI SHGetShellKey(DWORD a, DWORD b, DWORD c) +HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) { - FIXME("(%x, %x, %x): stub\n", a, b, c); - return 0x50; + FIXME("(0x%08x, %s, %d): stub\n", flags, debugstr_w(sub_key), create); + return (HKEY)0x50; } /***********************************************************************

1 0

Nikolay Sivov : shlwapi: Added IUnknown_ProfferService implementation with tests.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: 43a92c6610625cf94c4f20675fb1c7d6d409d526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a92c6610625cf94c4f20675… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 26 03:21:36 2010 +0300 shlwapi: Added IUnknown_ProfferService implementation with tests. --- dlls/shlwapi/ordinal.c | 45 ++++++++- dlls/shlwapi/tests/ordinal.c | 210 ++++++++++++++++++++++++++++++++++++++---- include/shobjidl.idl | 15 +++ 3 files changed, 244 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43a92c6610625cf94c4f2…

1 0