January 2013 - Wine-Commits

Detlef Riekenberg : conhost.exe: Add stub program.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: b6663f8a5216fb5f3f9a945e53f4f934c1428a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6663f8a5216fb5f3f9a945e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 2 16:36:00 2013 +0100 conhost.exe: Add stub program. --- configure | 1 + configure.ac | 1 + programs/conhost/Makefile.in | 8 ++++++++ programs/conhost/conhost.c | 33 +++++++++++++++++++++++++++++++++ programs/conhost/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e529bf3..e52c4f0 100755 --- a/configure +++ b/configure @@ -15962,6 +15962,7 @@ wine_fn_config_program cacls enable_cacls install wine_fn_config_program clock enable_clock install,po wine_fn_config_program cmd enable_cmd install,po wine_fn_config_test programs/cmd/tests cmd.exe_test +wine_fn_config_program conhost enable_conhost install wine_fn_config_program control enable_control install wine_fn_config_program cscript enable_cscript install wine_fn_config_program dxdiag enable_dxdiag install,po diff --git a/configure.ac b/configure.ac index 05f03b5..c06e108 100644 --- a/configure.ac +++ b/configure.ac @@ -3137,6 +3137,7 @@ WINE_CONFIG_PROGRAM(cacls,,[install]) WINE_CONFIG_PROGRAM(clock,,[install,po]) WINE_CONFIG_PROGRAM(cmd,,[install,po]) WINE_CONFIG_TEST(programs/cmd/tests) +WINE_CONFIG_PROGRAM(conhost,,[install]) WINE_CONFIG_PROGRAM(control,,[install]) WINE_CONFIG_PROGRAM(cscript,,[install]) WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in new file mode 100644 index 0000000..21c0838 --- /dev/null +++ b/programs/conhost/Makefile.in @@ -0,0 +1,8 @@ +MODULE = conhost.exe +APPMODE = -mconsole -municode + +C_SRCS = conhost.c + +RC_SRCS = version.rc + +(a)MAKE_PROG_RULES@ diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c new file mode 100644 index 0000000..3ef40ba --- /dev/null +++ b/programs/conhost/conhost.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(conhost); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/conhost/version.rc b/programs/conhost/version.rc new file mode 100644 index 0000000..2ad2611 --- /dev/null +++ b/programs/conhost/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine conhost" +#define WINE_FILENAME_STR "conhost.exe" +#define WINE_FILEVERSION 6,1,7601,22045 +#define WINE_FILEVERSION_STR "6.1.7601.22045" +#define WINE_PRODUCTVERSION 6,1,7601,22045 +#define WINE_PRODUCTVERSION_STR "6.1.7601.22045" + +#include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : api-ms-win-security-base-l1-1-0: Add dll.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 892f1181c373441328f21876dad8ef653be86695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892f1181c373441328f21876d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 2 16:35:59 2013 +0100 api-ms-win-security-base-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-security-base-l1-1-0/Makefile.in | 5 + .../api-ms-win-security-base-l1-1-0.spec | 97 ++++++++++++++++++++ dlls/api-ms-win-security-base-l1-1-0/version.rc | 26 +++++ tools/make_specfiles | 1 + 6 files changed, 131 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=892f1181c373441328f21…

1 0

Detlef Riekenberg : ntoskrnl.exe: Update version resource.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 8f022fd4c7b86c300192186b4ffbecbd0d2581a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f022fd4c7b86c300192186b4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 2 16:35:58 2013 +0100 ntoskrnl.exe: Update version resource. --- dlls/ntoskrnl.exe/ntoskrnl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.rc b/dlls/ntoskrnl.exe/ntoskrnl.rc index 767196c..2faa1a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.rc +++ b/dlls/ntoskrnl.exe/ntoskrnl.rc @@ -19,9 +19,9 @@ #define WINE_FILENAME_STR "ntoskrnl.exe" /* Version as of Win 7 SP1 */ -#define WINE_FILEVERSION 6,1,7601,17592 -#define WINE_FILEVERSION_STR "6.1.7601.17592" -#define WINE_PRODUCTVERSION 6,1,7601,17592 -#define WINE_PRODUCTVERSION_STR "6.1.7601.17592" +#define WINE_FILEVERSION 6,1,7601,21863 +#define WINE_FILEVERSION_STR "6.1.7601.21863" +#define WINE_PRODUCTVERSION 6,1,7601,21863 +#define WINE_PRODUCTVERSION_STR "6.1.7601.21863" #include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : api-ms-win-downlevel-user32-l1-1-0: Add version resource.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 2844f62cd71639fc1f202d3ff817bbddd5c1ea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2844f62cd71639fc1f202d3ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 2 16:35:57 2013 +0100 api-ms-win-downlevel-user32-l1-1-0: Add version resource. --- .../api-ms-win-downlevel-user32-l1-1-0/Makefile.in | 2 + dlls/api-ms-win-downlevel-user32-l1-1-0/version.rc | 26 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in index eca911a..86ec441 100644 --- a/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in @@ -1,3 +1,5 @@ MODULE = api-ms-win-downlevel-user32-l1-1-0.dll +RC_SRCS = version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/version.rc b/dlls/api-ms-win-downlevel-user32-l1-1-0/version.rc new file mode 100644 index 0000000..c3d8865 --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine user32 downlevel apiset" +#define WINE_FILENAME_STR "api-ms-win-downlevel-user32-l1-1-0.dll" +#define WINE_FILEVERSION 6,2,9200,16426 +#define WINE_FILEVERSION_STR "6.2.9200.16426" +#define WINE_PRODUCTVERSION 6,2,9200,16426 +#define WINE_PRODUCTVERSION_STR "6.2.9200.16426" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : wmiutils/tests: Add more tests.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 2390ef9232330cfa9fafeee1c894ad1eb4bad793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2390ef9232330cfa9fafeee1c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 3 14:36:36 2013 +0100 wmiutils/tests: Add more tests. --- dlls/wmiutils/tests/path.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 4d59129..6824d25 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -55,6 +55,11 @@ static const WCHAR path14[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR path15[] = {'r','o','o','t','\\','c','i','m','v','2',0}; +static const WCHAR path16[] = + {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; +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 void test_IWbemPath_SetText(void) { @@ -238,6 +243,36 @@ static void test_IWbemPath_GetText(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !count, "got %u\n", count ); + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path6 ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + + len = 0; + hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + + len = sizeof(buf)/sizeof(buf[0]); + memset( buf, 0x55, sizeof(buf) ); + hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, path16 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf)/sizeof(buf[0]); + memset( buf, 0x55, sizeof(buf) ); + hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( !lstrcmpW( buf, path17 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + todo_wine ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); + IWbemPath_Release( path ); CoUninitialize(); }

1 0

Hans Leidekker : wmiutils: Don' t prepend a backslash if WBEMPATH_GET_NAMESPACE_ONLY is specified.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 1a16bf44593a55fe8161863696967e2451f7fd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a16bf44593a55fe816186369… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 3 14:36:07 2013 +0100 wmiutils: Don't prepend a backslash if WBEMPATH_GET_NAMESPACE_ONLY is specified. --- dlls/wmiutils/path.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 57783e9..c146671 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -210,7 +210,7 @@ static HRESULT WINAPI path_SetText( return S_OK; } -static WCHAR *build_namespace( struct path *path, int *len ) +static WCHAR *build_namespace( struct path *path, int *len, BOOL leading_slash ) { WCHAR *ret, *p; int i; @@ -218,13 +218,13 @@ static WCHAR *build_namespace( struct path *path, int *len ) *len = 0; for (i = 0; i < path->num_namespaces; i++) { - if (i > 0) *len += 1; + if (i > 0 || leading_slash) *len += 1; *len += path->len_namespaces[i]; } if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; for (i = 0; i < path->num_namespaces; i++) { - if (i > 0) *p++ = '\\'; + if (i > 0 || leading_slash) *p++ = '\\'; memcpy( p, path->namespaces[i], path->len_namespaces[i] * sizeof(WCHAR) ); p += path->len_namespaces[i]; } @@ -238,7 +238,7 @@ static WCHAR *build_server( struct path *path, int *len ) *len = 0; if (path->len_server) *len += 2 + path->len_server; - else *len += 4; + else *len += 3; if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; if (path->len_server) { @@ -247,7 +247,7 @@ static WCHAR *build_server( struct path *path, int *len ) } else { - p[0] = p[1] = p[3] = '\\'; + p[0] = p[1] = '\\'; p[2] = '.'; } return ret; @@ -260,7 +260,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) case 0: { int len_namespace; - WCHAR *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *ret, *namespace = build_namespace( path, &len_namespace, FALSE ); if (!namespace) return NULL; @@ -293,7 +293,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) case WBEMPATH_GET_SERVER_TOO: { int len_namespace, len_server; - WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace, TRUE ); WCHAR *server = build_server( path, &len_server ); if (!namespace || !server) @@ -326,7 +326,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) case WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY: { int len_namespace, len_server; - WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace, TRUE ); WCHAR *server = build_server( path, &len_server ); if (!namespace || !server) @@ -350,7 +350,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) return ret; } case WBEMPATH_GET_NAMESPACE_ONLY: - return build_namespace( path, len ); + return build_namespace( path, len, FALSE ); case WBEMPATH_GET_ORIGINAL: if (!path->len_text)

1 0

Nikolay Sivov : comctl32/listview: Improve LVM_GETSUBITEMRECT implementation for out-of-bounds item indices.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 67c57b216c734a7133088bb097f436bc0e0ca743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c57b216c734a7133088bb09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 3 15:29:39 2013 +0400 comctl32/listview: Improve LVM_GETSUBITEMRECT implementation for out-of-bounds item indices. --- dlls/comctl32/listview.c | 79 +++++++++++++++++++--------------------- dlls/comctl32/tests/listview.c | 46 ++++++++++++++++++++++- 2 files changed, 82 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cf7cc6d..977bb18 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2012 Nikolay Sivov + * Copyright 2009-2013 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -6536,7 +6536,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, HDPA hdpaSubItems; INT isubitem; - TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); + TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount) return FALSE; @@ -7027,65 +7027,61 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT * * NOTE: for subItem = 0, we should return the bounds of the _entire_ item, * not only those of the first column. - * Fortunately, LISTVIEW_GetItemMetrics does the right thing. * * RETURN: * TRUE: success * FALSE: failure */ -static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc) +static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRECT lprc) { - POINT Position, Origin; - LVITEMW lvItem; - INT nColumn; + RECT rect = { 0, 0, 0, 0 }; + POINT origin; + INT y; if (!lprc) return FALSE; - nColumn = lprc->top; - - TRACE("(nItem=%d, nSubItem=%d, type=%d)\n", nItem, lprc->top, lprc->left); - /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ + TRACE("(item=%d, subitem=%d, type=%d)\n", item, lprc->top, lprc->left); + /* Subitem of '0' means item itself, and this works for all control view modes */ if (lprc->top == 0) - return LISTVIEW_GetItemRect(infoPtr, nItem, lprc); + return LISTVIEW_GetItemRect(infoPtr, item, lprc); if (infoPtr->uView != LV_VIEW_DETAILS) return FALSE; - /* special case for header items */ - if (nItem == -1) - { - if (lprc->left != LVIR_BOUNDS) - { - FIXME("Only LVIR_BOUNDS is implemented for header, got %d\n", lprc->left); - return FALSE; - } + LISTVIEW_GetOrigin(infoPtr, &origin); + /* this works for any item index, no matter if it exists or not */ + y = item * infoPtr->nItemHeight + origin.y; - if (infoPtr->hwndHeader) - return SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)lprc); - else - { - memset(lprc, 0, sizeof(RECT)); - return TRUE; - } + if (infoPtr->hwndHeader && SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)&rect)) + { + rect.top = 0; + rect.bottom = infoPtr->nItemHeight; + } + else + { + /* Native implementation is broken for this case and garbage is left for left and right fields, + we zero them to get predictable output */ + lprc->left = lprc->right = lprc->top = 0; + lprc->bottom = infoPtr->nItemHeight; + OffsetRect(lprc, origin.x, y); + TRACE("return rect %s\n", wine_dbgstr_rect(lprc)); + return TRUE; } - if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; - LISTVIEW_GetOrigin(infoPtr, &Origin); - - if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; - - lvItem.mask = 0; - lvItem.iItem = nItem; - lvItem.iSubItem = nColumn; - - switch(lprc->left) + switch (lprc->left) { case LVIR_ICON: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL, NULL); - break; + { + /* it doesn't matter if main item actually has an icon, if imagelist is set icon width is returned */ + if (infoPtr->himlSmall) + rect.right = rect.left + infoPtr->iconSize.cx; + else + rect.right = rect.left; + rect.bottom = rect.top + infoPtr->iconSize.cy; + break; + } case LVIR_LABEL: case LVIR_BOUNDS: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL, NULL); break; default: @@ -7093,7 +7089,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return FALSE; } - OffsetRect(lprc, Origin.x, Position.y); + OffsetRect(&rect, origin.x, y); + *lprc = rect; TRACE("return rect %s\n", wine_dbgstr_rect(lprc)); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0dfddef..0620afe 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -247,6 +247,18 @@ static const struct message getitemposition_seq2[] = { { 0 } }; +static const struct message getsubitemrect_seq[] = { + { LVM_GETSUBITEMRECT, sent|id|wparam, -1, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { LVM_GETSUBITEMRECT, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { LVM_GETSUBITEMRECT, sent|id|wparam, -10, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { LVM_GETSUBITEMRECT, sent|id|wparam, 20, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + static const struct message editbox_create_pos[] = { /* sequence sent after LVN_BEGINLABELEDIT */ /* next two are 4.7x specific */ @@ -1602,6 +1614,8 @@ static void test_create(void) rect.top = 1; rect.right = rect.bottom = -10; r = SendMessage(hList, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + /* right value contains garbage, probably because header columns are not set up */ + expect(0, rect.bottom); expect(1, r); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); @@ -2473,6 +2487,36 @@ todo_wine SendMessage(hwnd, LVM_SCROLL, -10, 0); + /* test header interaction */ + subclass_header(hwnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + expect(1, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + expect(1, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -10, (LPARAM)&rect); + expect(1, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 20, (LPARAM)&rect); + expect(1, r); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getsubitemrect_seq, "LVM_GETSUBITEMRECT negative index", FALSE); + DestroyWindow(hwnd); /* test subitem rects after re-arranging columns */ @@ -2514,13 +2558,11 @@ todo_wine rect2.top = 1; rect2.right = rect2.bottom = -1; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 2, (LPARAM)&rect2); -todo_wine { expect(TRUE, r); expect(rect.right, rect2.right); expect(rect.left, rect2.left); expect(rect.bottom, rect2.top); ok(rect2.bottom > rect2.top, "expected not zero height\n"); -} arr[0] = 1; arr[1] = 0; arr[2] = 2; r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 3, (LPARAM)arr);

1 0

Hans Leidekker : wmiutils: Fix buffer size query in IWbemPath::GetText.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: f776b64fa6c1999cb797520792125f8d43c1d3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f776b64fa6c1999cb79752079… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 3 14:35:30 2013 +0100 wmiutils: Fix buffer size query in IWbemPath::GetText. --- dlls/wmiutils/path.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index a26ade1..57783e9 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -237,10 +237,10 @@ static WCHAR *build_server( struct path *path, int *len ) WCHAR *ret, *p; *len = 0; - if (path->server) *len += 2 + path->len_server; + if (path->len_server) *len += 2 + path->len_server; else *len += 4; if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; - if (path->server) + if (path->len_server) { p[0] = p[1] = '\\'; strcpyW( p + 2, path->server ); @@ -265,14 +265,14 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) if (!namespace) return NULL; *len = len_namespace; - if (path->class) *len += 1 + path->len_class; + if (path->len_class) *len += 1 + path->len_class; if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) { heap_free( namespace ); return NULL; } strcpyW( ret, namespace ); - if (path->class) + if (path->len_class) { ret[len_namespace] = ':'; strcpyW( ret + len_namespace + 1, path->class ); @@ -282,7 +282,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) } case WBEMPATH_GET_RELATIVE_ONLY: - if (!path->class) + if (!path->len_class) { *len = 0; return NULL; @@ -303,7 +303,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) return NULL; } *len = len_namespace + len_server; - if (path->class) *len += 1 + path->len_class; + if (path->len_class) *len += 1 + path->len_class; if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) { heap_free( namespace ); @@ -314,7 +314,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) p += len_server; strcpyW( p, namespace ); p += len_namespace; - if (path->class) + if (path->len_class) { *p = ':'; strcpyW( p + 1, path->class ); @@ -353,7 +353,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) return build_namespace( path, len ); case WBEMPATH_GET_ORIGINAL: - if (!path->text) + if (!path->len_text) { *len = 0; return NULL; @@ -379,7 +379,7 @@ static HRESULT WINAPI path_GetText( TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); - if (!puBufferLength || !pszText) return WBEM_E_INVALID_PARAMETER; + if (!puBufferLength) return WBEM_E_INVALID_PARAMETER; str = build_path( path, lFlags, &len ); @@ -388,12 +388,16 @@ static HRESULT WINAPI path_GetText( *puBufferLength = len + 1; return S_OK; } - if (pszText) + if (!pszText) { - if (str) strcpyW( pszText, str ); - else pszText[0] = 0; + heap_free( str ); + return WBEM_E_INVALID_PARAMETER; } + if (str) strcpyW( pszText, str ); + else pszText[0] = 0; *puBufferLength = len + 1; + + TRACE("<-- %s\n", debugstr_w(pszText)); heap_free( str ); return S_OK; }

1 0

Henri Verbeet : wined3d: Get rid of some useless braces in draw_primitive() .
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 3046a2cbef530119fc5816e4ef868222d2783575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3046a2cbef530119fc5816e4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 3 11:56:26 2013 +0100 wined3d: Get rid of some useless braces in draw_primitive(). --- dlls/wined3d/drawprim.c | 157 +++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 81 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index da780ff..67f84a5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -580,9 +580,13 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) { const struct wined3d_state *state = &device->stateBlock->state; + const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; + struct wined3d_stream_info si_emulated; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + BOOL emulation = FALSE; + UINT idx_size = 0; unsigned int i; if (!index_count) return; @@ -666,106 +670,97 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co FIXME("Point sprite coordinate origin switching not supported.\n"); } - { - GLenum glPrimType = state->gl_primitive_type; - INT base_vertex_index = state->base_vertex_index; - BOOL emulation = FALSE; - const struct wined3d_stream_info *stream_info = &device->strided_streams; - struct wined3d_stream_info stridedlcl; - UINT idx_size = 0; - - if (device->instance_count) - instance_count = device->instance_count; + stream_info = &device->strided_streams; + if (device->instance_count) + instance_count = device->instance_count; - if (indexed) + if (indexed) + { + if (!state->user_stream) { - if (!state->user_stream) + struct wined3d_buffer *index_buffer = state->index_buffer; + if (!index_buffer->buffer_object || !stream_info->all_vbo) + idx_data = index_buffer->resource.allocatedMemory; + else { - struct wined3d_buffer *index_buffer = state->index_buffer; - if (!index_buffer->buffer_object || !stream_info->all_vbo) - idx_data = index_buffer->resource.allocatedMemory; - else - { - ib_query = index_buffer->query; - idx_data = NULL; - } + ib_query = index_buffer->query; + idx_data = NULL; } + } + + if (state->index_format == WINED3DFMT_R16_UINT) + idx_size = 2; + else + idx_size = 4; + } - if (state->index_format == WINED3DFMT_R16_UINT) - idx_size = 2; + if (!use_vs(state)) + { + if (!stream_info->position_transformed && context->num_untracked_materials + && state->render_states[WINED3D_RS_LIGHTING]) + { + static BOOL warned; + + if (!warned++) + FIXME("Using software emulation because not all material properties could be tracked.\n"); else - idx_size = 4; + WARN("Using software emulation because not all material properties could be tracked.\n"); + emulation = TRUE; } - - if (!use_vs(state)) + else if (context->fog_coord && state->render_states[WINED3D_RS_FOGENABLE]) { - if (!stream_info->position_transformed && context->num_untracked_materials - && state->render_states[WINED3D_RS_LIGHTING]) - { - static BOOL warned; - if (!warned) { - FIXME("Using software emulation because not all material properties could be tracked\n"); - warned = TRUE; - } else { - TRACE("Using software emulation because not all material properties could be tracked\n"); - } - emulation = TRUE; - } - else if (context->fog_coord && state->render_states[WINED3D_RS_FOGENABLE]) - { - /* Either write a pipeline replacement shader or convert the specular alpha from unsigned byte - * to a float in the vertex buffer - */ - static BOOL warned; - if (!warned) { - FIXME("Using software emulation because manual fog coordinates are provided\n"); - warned = TRUE; - } else { - TRACE("Using software emulation because manual fog coordinates are provided\n"); - } - emulation = TRUE; - } + static BOOL warned; - if(emulation) { - stream_info = &stridedlcl; - memcpy(&stridedlcl, &device->strided_streams, sizeof(stridedlcl)); - remove_vbos(gl_info, state, &stridedlcl); - } + /* Either write a pipeline replacement shader or convert the + * specular alpha from unsigned byte to a float in the vertex + * buffer. */ + if (!warned++) + FIXME("Using software emulation because manual fog coordinates are provided.\n"); + else + WARN("Using software emulation because manual fog coordinates are provided.\n"); + emulation = TRUE; } - if (device->useDrawStridedSlow || emulation) + if (emulation) { - /* Immediate mode drawing */ - if (use_vs(state)) - { - static BOOL warned; - if (!warned) { - FIXME("Using immediate mode with vertex shaders for half float emulation\n"); - warned = TRUE; - } else { - TRACE("Using immediate mode with vertex shaders for half float emulation\n"); - } - drawStridedSlowVs(gl_info, state, stream_info, index_count, - glPrimType, idx_data, idx_size, start_idx); - } - else - { - drawStridedSlow(device, context, stream_info, index_count, - glPrimType, idx_data, idx_size, start_idx); - } + si_emulated = device->strided_streams; + remove_vbos(gl_info, state, &si_emulated); + stream_info = &si_emulated; } - else if (!gl_info->supported[ARB_INSTANCED_ARRAYS] && instance_count) + } + + if (device->useDrawStridedSlow || emulation) + { + /* Immediate mode drawing. */ + if (use_vs(state)) { - /* Instancing emulation with mixing immediate mode and arrays */ - drawStridedInstanced(gl_info, state, stream_info, index_count, glPrimType, - idx_data, idx_size, start_idx, base_vertex_index, instance_count); + static BOOL warned; + + if (!warned++) + FIXME("Using immediate mode with vertex shaders for half float emulation.\n"); + else + WARN("Using immediate mode with vertex shaders for half float emulation.\n"); + + drawStridedSlowVs(gl_info, state, stream_info, index_count, + state->gl_primitive_type, idx_data, idx_size, start_idx); } else { - drawStridedFast(gl_info, glPrimType, index_count, idx_size, idx_data, - start_idx, base_vertex_index, start_instance, instance_count); + drawStridedSlow(device, context, stream_info, index_count, + state->gl_primitive_type, idx_data, idx_size, start_idx); } } + else if (!gl_info->supported[ARB_INSTANCED_ARRAYS] && instance_count) + { + /* Instancing emulation by mixing immediate mode and arrays. */ + drawStridedInstanced(gl_info, state, stream_info, index_count, state->gl_primitive_type, + idx_data, idx_size, start_idx, state->base_vertex_index, instance_count); + } + else + { + drawStridedFast(gl_info, state->gl_primitive_type, index_count, idx_size, idx_data, + start_idx, state->base_vertex_index, start_instance, instance_count); + } if (ib_query) wined3d_event_query_issue(ib_query, device);

1 0

Henri Verbeet : wined3d: Recognize any "X.Org" GL vendor as Mesa.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 85d12b320c24720c3af172e3d784222ca58f26d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d12b320c24720c3af172e3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 3 11:56:25 2013 +0100 wined3d: Recognize any "X.Org" GL vendor as Mesa. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ecebfa4..d541f4d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1411,9 +1411,9 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in return GL_VENDOR_INTEL; if (strstr(gl_vendor_string, "Mesa") + || strstr(gl_vendor_string, "X.Org") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "DRI R300 Project") - || strstr(gl_vendor_string, "X.Org R300 Project") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.") || strstr(gl_renderer, "Mesa")

1 0