wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Nikolay Sivov : comctl32: Never release state image list.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 91fbef88bf1801f1a3a62d8648ce689a4c402600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fbef88bf1801f1a3a62d864… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 19:27:17 2012 +0300 comctl32: Never release state image list. --- dlls/comctl32/tests/treeview.c | 27 +++++++++++++++++++++++++-- dlls/comctl32/treeview.c | 14 -------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c99d480..8c0ec93 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1607,9 +1607,9 @@ static void test_htreeitem_layout(void) static void test_TVS_CHECKBOXES(void) { - HIMAGELIST himl; + HIMAGELIST himl, himl2; + HWND hTree, hTree2; TVITEMA item; - HWND hTree; DWORD ret; hTree = create_treeview_control(0); @@ -1639,6 +1639,10 @@ static void test_TVS_CHECKBOXES(void) himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); ok(himl != NULL, "got %p\n", himl); + himl2 = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl2 != NULL, "got %p\n", himl2); + ok(himl2 == himl, "got %p, expected %p\n", himl2, himl); + item.hItem = hRoot; item.mask = TVIF_STATE; item.state = 0; @@ -1655,6 +1659,25 @@ static void test_TVS_CHECKBOXES(void) expect(TRUE, ret); ok(item.state == INDEXTOSTATEIMAGEMASK(1), "got 0x%x\n", item.state); + /* create another control and check its checkbox list */ + hTree2 = create_treeview_control(0); + fill_tree(hTree2); + + /* set some index for a child */ + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(4); + item.stateMask = TVIS_STATEIMAGEMASK; + ret = SendMessageA(hTree2, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + /* enabling check boxes set all items to 1 state image index */ + SetWindowLongA(hTree2, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_CHECKBOXES); + himl2 = (HIMAGELIST)SendMessageA(hTree2, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl2 != NULL, "got %p\n", himl2); + ok(himl != himl2, "got %p, expected %p\n", himl2, himl); + + DestroyWindow(hTree2); DestroyWindow(hTree); /* the same, but initially created with TVS_CHECKBOXES */ diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c5f3bb3..3f4fdc6 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -66,14 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); -enum StateListType -{ - OriginInternal, - OriginUser -}; - /* internal structures */ - typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ { HTREEITEM parent; /* handle to parent or 0 if at root */ @@ -162,7 +155,6 @@ typedef struct tagTREEVIEW_INFO HIMAGELIST himlState; int stateImageHeight; int stateImageWidth; - enum StateListType statehimlType; HDPA items; DWORD lastKeyPressTimestamp; @@ -1793,11 +1785,8 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, UINT type, HIMAGELIST himlNew) infoPtr->himlState = himlNew; if (himlNew) - { ImageList_GetIconSize(himlNew, &infoPtr->stateImageWidth, &infoPtr->stateImageHeight); - infoPtr->statehimlType = OriginUser; - } else { infoPtr->stateImageWidth = 0; @@ -4970,7 +4959,6 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) int nIndex; infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - infoPtr->statehimlType = OriginInternal; hdcScreen = GetDC(0); @@ -5134,8 +5122,6 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); - if (infoPtr->statehimlType == OriginInternal) - ImageList_Destroy(infoPtr->himlState); /* Deassociate treeview from the window before doing anything drastic. */ SetWindowLongPtrW(infoPtr->hwnd, 0, 0);

1 0

Christian Costa : d3dx9_36: Remove TGA from TODO since it is supported.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 0a23797f1be167b6f92713ecfa49584da0bd555c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a23797f1be167b6f92713ecf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 30 01:17:23 2012 +0100 d3dx9_36: Remove TGA from TODO since it is supported. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fea7f1e..c3796ee 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -64,7 +64,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (!warn_once++) FIXME("(%p, %d, %p): partially implemented\n", data, datasize, info); - /* TODO: Add support for (or at least detect) TGA, DDS, PPM and DIB */ + /* TODO: Add support for (or at least detect) DDS, PPM and DIB */ if (!data || !datasize) return D3DERR_INVALIDCALL;

1 0

Frédéric Delanoy : msi: Avoid dead code in parse_prop (Coverity).
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: ca4fdc57ed6db9c3c56531c81b00f438dc782c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4fdc57ed6db9c3c56531c81… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 29 23:25:40 2012 +0100 msi: Avoid dead code in parse_prop (Coverity). --- dlls/msi/action.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 665ca63..663a917 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -233,8 +233,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; default: state = state_token; - if (!count) in_quotes = 0; - else in_quotes = 1; + in_quotes = 1; len++; break; }

1 0

Frédéric Delanoy : ws2_32/tests: Remove dead code in test_completion_port (Coverity).
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 09213db643cd77b328d40fff04d9ac160f1d69a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09213db643cd77b328d40fff0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 29 22:37:38 2012 +0100 ws2_32/tests: Remove dead code in test_completion_port (Coverity). --- dlls/ws2_32/tests/sock.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e111f8..2de23c9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5599,9 +5599,6 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - - if (dest != INVALID_SOCKET) - closesocket(dest); if (src != INVALID_SOCKET) closesocket(src); if (connector != INVALID_SOCKET)

1 0

Nikolay Sivov : urlmon: Recognize <head> start tag as text/html MIME type.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: f2dfe86ac442839ed93d71c1d96b36aa1d0c25b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2dfe86ac442839ed93d71c1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 23:33:04 2012 +0300 urlmon: Recognize <head> start tag as text/html MIME type. --- dlls/urlmon/tests/misc.c | 10 +++++++++- dlls/urlmon/urlmon_main.c | 20 +++++++++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ea634c1..bbb657f 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -563,6 +563,10 @@ static BYTE data83[] = {'.','s','n','d'}; static BYTE data84[] = {'.','s','n','d',0,'<','h','t','m','l','>',1,1}; static BYTE data85[] = {'.','S','N','D',0}; static BYTE data86[] = {0x49,0x49,0x2a,0xff}; +static BYTE data87[] = {' ','<','h','e','a','d'}; +static BYTE data88[] = {' ','<','h','e','a','d','>'}; +static BYTE data89[] = {'\t','\r','<','h','e','a','d','>'}; +static BYTE data90[] = {'<','H','e','A','d','>'}; static const struct { BYTE *data; @@ -654,7 +658,11 @@ static const struct { {data83, sizeof(data83), mimeTextPlain}, {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, {data85, sizeof(data85), mimeTextPlain}, - {data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain} + {data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain}, + {data87, sizeof(data87), mimeTextPlain}, + {data88, sizeof(data88), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data89, sizeof(data89), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data90, sizeof(data90), mimeTextHtml, mimeTextPlain /* IE8 */} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index edd6930..a3d1c10 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -566,13 +566,19 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) if(size < 5) return FALSE; - for(i=0; i < size-5; i++) { - if(b[i] == '<' - && (b[i+1] == 'h' || b[i+1] == 'H') - && (b[i+2] == 't' || b[i+2] == 'T') - && (b[i+3] == 'm' || b[i+3] == 'M') - && (b[i+4] == 'l' || b[i+4] == 'L')) - return TRUE; + for(i = 0; i < size-5; i++) { + if((b[i] == '<' + && (b[i+1] == 'h' || b[i+1] == 'H') + && (b[i+2] == 't' || b[i+2] == 'T') + && (b[i+3] == 'm' || b[i+3] == 'M') + && (b[i+4] == 'l' || b[i+4] == 'L')) || + ((size - i >= 6) + && b[i] == '<' + && (b[i+1] == 'h' || b[i+1] == 'H') + && (b[i+2] == 'e' || b[i+2] == 'E') + && (b[i+3] == 'a' || b[i+3] == 'A') + && (b[i+4] == 'd' || b[i+4] == 'D') + && b[i+5] == '>')) return TRUE; } return FALSE;

1 0

Dmitry Timoshkov : riched20: Fix some GDI object leaks.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: e2264859c8f8837b808e2ef9ce1dc0fe6b571e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2264859c8f8837b808e2ef9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jan 28 20:27:03 2012 +0800 riched20: Fix some GDI object leaks. --- dlls/riched20/richole.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8e90204..9c74cfe 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1669,6 +1669,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); } + DeleteDC(hMemDC); if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF:

1 0

Thomas Faber : comctl32: Fix MSVC build in monthcal.c.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 05253f900fa62a48c848b99f80c89523404806fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=05253f900fa62a48c848b99f8… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jan 27 23:56:10 2012 +0100 comctl32: Fix MSVC build in monthcal.c. --- dlls/comctl32/monthcal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 83adf60..e148a62 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -160,8 +160,8 @@ static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; -static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; +static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; +static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; /* Prev/Next buttons */ enum nav_direction

1 0

Alexandre Julliard : Wine release 1.4-rc1
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: website Branch: master Commit: bb585096cf9067cd812cb840270ff142de13225a URL: http://source.winehq.org/git/website.git/?a=commit;h=bb585096cf9067cd812cb8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 20:58:13 2012 +0100 Wine release 1.4-rc1 --- news/en/2012012701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2012012701.xml b/news/en/2012012701.xml new file mode 100644 index 0000000..24e39b2 --- /dev/null +++ b/news/en/2012012701.xml @@ -0,0 +1,18 @@ +<news> +<date>January 27, 2012</date> +<title>Wine 1.4-rc1 Released</title> +<body> + The Wine development release 1.4-rc1 is now available. + This is the first release candidate for the upcoming Wine 1.4. It marks the beginning of the code freeze period. Please give this release a good testing to help us make 1.4 as good as possible. + <a href="{$root}/announce/1.4-rc1">What's new</a> in this release: +<ul> + <li>Improved crash dialog with support for saving the backtrace.</li> + <li>Support for the Back button in built-in Internet Explorer.</li> + <li>Keyboard accelerators can now be translated through po files.</li> + <li>A number of installer fixes.</li> + <li>Many translation updates and tweaks.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.4-rc1 : Alexandre Julliard : Release 1.4-rc1
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: refs/tags/wine-1.4-rc1 Tag: ccebc894c5f23fa5bef79a6f20204a9991fbc4be URL: http://source.winehq.org/git/wine.git/?a=tag;h=ccebc894c5f23fa5bef79a6f2020… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 20:47:47 2012 +0100 Release 1.4-rc1

1 0

Alexandre Julliard : Release 1.4-rc1.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: f0cfa7cf46d7c832fb84555529d1a1b7c49c46c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0cfa7cf46d7c832fb8455552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 20:47:46 2012 +0100 Release 1.4-rc1. --- ANNOUNCE | 1194 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 670 insertions(+), 544 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0cfa7cf46d7c832fb845…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
98
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 2012