April 2009 - Wine-commits - list.winehq.org

Huw Davies : ole32/tests: win64 sets the lsb of the final DWORD in the ole private data header.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: d18875f3065568e19a24b897861e712bd5ac162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18875f3065568e19a24b8978… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 10:34:04 2009 +0100 ole32/tests: win64 sets the lsb of the final DWORD in the ole private data header. --- dlls/ole32/tests/clipboard.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index fd4a4e0..207411a 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -714,7 +714,12 @@ static void test_cf_dataobject(IDataObject *data) ok(priv->res2 == 1, "got %08x\n", priv->res2); ok(priv->count == count, "got %08x expected %08x\n", priv->count, count); ok(priv->res3[0] == 0, "got %08x\n", priv->res3[0]); - ok(priv->res3[1] == 0, "got %08x\n", priv->res3[1]); + + /* win64 sets the lsb */ + if(sizeof(fmt_ptr->fmt.ptd) == 8) + todo_wine ok(priv->res3[1] == 1, "got %08x\n", priv->res3[1]); + else + ok(priv->res3[1] == 0, "got %08x\n", priv->res3[1]); GlobalUnlock(h); IEnumFORMATETC_Release(enum_fmt);

1 0

Huw Davies : ole32/tests: win9x and winme don' t enumerate duplicated cfFormats.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 1556d831c8e0f3cd42ddb7f89965912296f6e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1556d831c8e0f3cd42ddb7f89… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 10:47:28 2009 +0100 ole32/tests: win9x and winme don't enumerate duplicated cfFormats. --- dlls/ole32/tests/clipboard.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 207411a..4cbd88b 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -584,7 +584,9 @@ static void test_enum_fmtetc(IDataObject *src) if(src) { hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); - ok(hr == S_FALSE, "%d: got %08x\n", count, hr); + ok(hr == S_FALSE || + broken(hr == S_OK && count == 5), /* win9x and winme don't enumerate duplicated cf's */ + "%d: got %08x\n", count, hr); IEnumFORMATETC_Release(src_enum); }

1 0

Huw Davies : ole32/tests: Add some tests to exercise the enumerator.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 6928615d5c3c786de591ff04d33a32f98e1b9381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6928615d5c3c786de591ff04d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 11:45:36 2009 +0100 ole32/tests: Add some tests to exercise the enumerator. --- dlls/ole32/tests/clipboard.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 4cbd88b..1b406d9 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -593,6 +593,34 @@ static void test_enum_fmtetc(IDataObject *src) hr = IEnumFORMATETC_Reset(enum_fmt); ok(hr == S_OK, "got %08x\n", hr); + if(src) /* Exercise the enumerator a bit */ + { + IEnumFORMATETC *clone; + FORMATETC third_fmt; + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &third_fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &third_fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &third_fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IEnumFORMATETC_Reset(enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + hr = IEnumFORMATETC_Skip(enum_fmt, 2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IEnumFORMATETC_Clone(enum_fmt, &clone); + ok(hr == S_OK, "got %08x\n", hr); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == third_fmt.cfFormat, "formats don't match\n"); + hr = IEnumFORMATETC_Next(clone, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == third_fmt.cfFormat, "formats don't match\n"); + IEnumFORMATETC_Release(clone); + } + IEnumFORMATETC_Release(enum_fmt); IDataObject_Release(data); }

1 0

Alexandre Julliard : jscript: Avoid size_t in printf width specifier.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: eae1898aae96dc646cf8895411769b0d2f48af18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae1898aae96dc646cf889541… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 15:25:35 2009 +0200 jscript: Avoid size_t in printf width specifier. --- dlls/jscript/regexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 8ae2152..e79fee4 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -2386,7 +2386,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, const char *opname = reop_names[op]; TRACE("\n%06d: %*s%s\n", pc - gData->regexp->program, - gData->stateStackTop * 2, "", opname); + (int)gData->stateStackTop * 2, "", opname); switch (op) { case REOP_EMPTY: @@ -2625,7 +2625,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) for (;;) { const char *opname = reop_names[op]; TRACE("\n%06d: %*s%s\n", pc - gData->regexp->program, - gData->stateStackTop * 2, "", opname); + (int)gData->stateStackTop * 2, "", opname); if (REOP_IS_SIMPLE(op)) { result = SimpleMatch(gData, x, op, &pc, TRUE);

1 0

Nikolay Sivov : comctl32/listview: Additional tests for LVM_GETSUBITEMRECT.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 09d6a6c8c991e8fb9452f73f9b681a8b8a0088a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d6a6c8c991e8fb9452f73f9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 22 13:05:56 2009 -0400 comctl32/listview: Additional tests for LVM_GETSUBITEMRECT. --- dlls/comctl32/tests/listview.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6f205fd..fba7a01 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -847,6 +847,7 @@ static void test_create(void) LONG_PTR ret; LONG r; LVCOLUMNA col; + RECT rect; WNDCLASSEX cls; cls.cbSize = sizeof(WNDCLASSEX); ok(GetClassInfoEx(GetModuleHandle(NULL), "SysListView32", &cls), "GetClassInfoEx failed\n"); @@ -976,6 +977,31 @@ static void test_create(void) ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + + /* requesting header info with LVM_GETSUBITEMRECT doesn't create it */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = -10; + r = SendMessage(hList, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); +todo_wine + ok(r != 0, "Expected not-null LRESULT\n"); + + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + + expect(0, rect.left); +todo_wine { + expect(0, rect.right); + expect(0, rect.top); + expect(0, rect.bottom); +} + DestroyWindow(hList); } static void test_redraw(void) @@ -1529,6 +1555,21 @@ todo_wine{ } DestroyWindow(hwnd); + + /* try it for non LVS_REPORT style */ + hwnd = CreateWindow("SysListView32", "Test", LVS_ICON, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = -10; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + ok(r == 0, "Expected not-null LRESULT\n"); + /* rect is unchanged */ + expect(0, rect.left); + expect(-10, rect.right); + expect(1, rect.top); + expect(-10, rect.bottom); + DestroyWindow(hwnd); } /* comparison callback for test_sorting */

1 0

Nikolay Sivov : comctl32/listview: Partial fix for LVM_GETSUBITEMRECT for item == -1.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 457c983ee397ed7f836d4dc389e0b015251145fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=457c983ee397ed7f836d4dc38… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 22 13:51:02 2009 -0400 comctl32/listview: Partial fix for LVM_GETSUBITEMRECT for item == -1. --- dlls/comctl32/listview.c | 18 ++++++++++++++++++ dlls/comctl32/tests/listview.c | 13 ++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e6fa8ec..c6a06c7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5984,6 +5984,24 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR if ((infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) 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; + } + + if (infoPtr->hwndHeader) + return Header_GetItemRect(infoPtr->hwndHeader, lprc->top, lprc); + else + { + memset(lprc, 0, sizeof(RECT)); + return TRUE; + } + } + if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fba7a01..61dca76 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -988,7 +988,6 @@ static void test_create(void) rect.top = 1; rect.right = rect.bottom = -10; r = SendMessage(hList, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); -todo_wine ok(r != 0, "Expected not-null LRESULT\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); @@ -996,11 +995,10 @@ todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); expect(0, rect.left); -todo_wine { expect(0, rect.right); expect(0, rect.top); expect(0, rect.bottom); -} + DestroyWindow(hList); } @@ -1537,22 +1535,23 @@ static void test_subitem_rect(void) rect.top = 1; rect.right = rect.bottom = 0; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); -todo_wine{ + ok(r != 0, "Expected not-null LRESULT\n"); expect(100, rect.left); expect(250, rect.right); +todo_wine expect(3, rect.top); -} + rect.left = LVIR_BOUNDS; rect.top = 2; rect.right = rect.bottom = 0; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); -todo_wine{ + ok(r != 0, "Expected not-null LRESULT\n"); expect(250, rect.left); expect(450, rect.right); +todo_wine expect(3, rect.top); -} DestroyWindow(hwnd);

1 0

Alexandre Julliard : configure: Remove checks for headers that are no longer used.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: aeb7655cc196b72bf2eaadc67e6c70df0bd997b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb7655cc196b72bf2eaadc67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 14:41:49 2009 +0200 configure: Remove checks for headers that are no longer used. --- configure | 4 ---- configure.ac | 2 -- include/config.h.in | 6 ------ 3 files changed, 0 insertions(+), 12 deletions(-) diff --git a/configure b/configure index fbe40c0..2ba34ac 100755 --- a/configure +++ b/configure @@ -6060,8 +6060,6 @@ done - - for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -6149,7 +6147,6 @@ for ac_header in \ sys/ipc.h \ sys/limits.h \ sys/link.h \ - sys/lwp.h \ sys/mman.h \ sys/modem.h \ sys/msg.h \ @@ -6159,7 +6156,6 @@ for ac_header in \ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ - sys/reg.h \ sys/resource.h \ sys/scsiio.h \ sys/shm.h \ diff --git a/configure.ac b/configure.ac index 331ffdc..0d92131 100644 --- a/configure.ac +++ b/configure.ac @@ -325,7 +325,6 @@ AC_CHECK_HEADERS(\ sys/ipc.h \ sys/limits.h \ sys/link.h \ - sys/lwp.h \ sys/mman.h \ sys/modem.h \ sys/msg.h \ @@ -335,7 +334,6 @@ AC_CHECK_HEADERS(\ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ - sys/reg.h \ sys/resource.h \ sys/scsiio.h \ sys/shm.h \ diff --git a/include/config.h.in b/include/config.h.in index 9e93513..12ce108 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -837,9 +837,6 @@ /* Define to 1 if you have the <sys/link.h> header file. */ #undef HAVE_SYS_LINK_H -/* Define to 1 if you have the <sys/lwp.h> header file. */ -#undef HAVE_SYS_LWP_H - /* Define to 1 if you have the <sys/mman.h> header file. */ #undef HAVE_SYS_MMAN_H @@ -870,9 +867,6 @@ /* Define to 1 if you have the <sys/ptrace.h> header file. */ #undef HAVE_SYS_PTRACE_H -/* Define to 1 if you have the <sys/reg.h> header file. */ -#undef HAVE_SYS_REG_H - /* Define to 1 if you have the <sys/resource.h> header file. */ #undef HAVE_SYS_RESOURCE_H

1 0

André Hentschel : winemaker: Fix whitespace handling for libs.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: b09d6d08191f76b85dbfd46eae302e203e786719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09d6d08191f76b85dbfd46ea… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 21 20:32:34 2009 +0200 winemaker: Fix whitespace handling for libs. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1bf25d3..1d8ae92 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -727,7 +727,7 @@ sub source_scan_project_file($$$) #print "\n$prj_target_libs bevor\n"; $prj_target_libs=~s/\\/\//g; $prj_target_libs=~s/\.lib//g; - $prj_target_libs=~s/\s/ -l/g; + $prj_target_libs=~s/\s+/ -l/g; #print "\n$prj_target_libs after\n"; shift (@prj_target_options); foreach ( @prj_target_options ) {

1 0

André Hentschel : winemaker: Fix wrong place for case-check.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 868547c93294ca23971cd2c78aec0daabcb06376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868547c93294ca23971cd2c78… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 21 20:32:41 2009 +0200 winemaker: Fix wrong place for case-check. --- tools/winemaker | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1d8ae92..7795237 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -854,9 +854,6 @@ sub source_scan_project_file($$$) for my $vc_filter (@{$vc_files->{'Filter'}}) { for my $vc_file (@{$vc_filter->{'File'}}) { $sfilet=$vc_file->{'RelativePath'}; - if (($opt_lower == $OPT_LOWER_ALL and $sfilet =~ /[A-Z]/) or ($opt_lower == $OPT_LOWER_UPPERCASE and $sfilet !~ /[a-z]/)) { - $sfilet=lc $sfilet; #to lowercase if necessary - } $sfilet=~s/\\\\/\\/g; #remove double backslash $sfilet=~s/^\.\\//; #remove starting 'this directory' $sfilet=~s/\\/\//g; #make slashes out of backslashes

1 0

André Hentschel : winemaker: Parse include dirs from vcproj file.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 7a0f61191a8c4a1598632aba9a307e773add82b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0f61191a8c4a1598632aba9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 21 20:32:52 2009 +0200 winemaker: Parse include dirs from vcproj file. --- tools/winemaker | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 7795237..43efecc 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -900,6 +900,11 @@ sub source_scan_project_file($$$) $vc_tool->{'PreprocessorDefinitions'}=~s/;/ -D/g; $prj_target_cflags.="-D".$vc_tool->{'PreprocessorDefinitions'}." "; } + if (defined $vc_tool->{'AdditionalIncludeDirectories'}) { + $vc_tool->{'AdditionalIncludeDirectories'}=~s/\\/\//g; + $vc_tool->{'AdditionalIncludeDirectories'}=~s/;/ -I/g; + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$vc_tool->{'AdditionalIncludeDirectories'}; + } } last; }

1 0