winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
937 discussions
Start a n
N
ew thread
André Hentschel : uxtheme/tests: Mark XP SP1 behaviour as broken.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: 85c989be49ba646242b88c47358d049cbe8c6d68 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=85c989be49ba646242b88c473…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 1 18:50:30 2011 +0200 uxtheme/tests: Mark XP SP1 behaviour as broken. --- dlls/uxtheme/tests/system.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b730246..a63b6c4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -507,7 +507,7 @@ static void test_GetCurrentThemeName(void) SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); if (bThemeActive) - ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); + ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -523,7 +523,9 @@ static void test_GetCurrentThemeName(void) hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -537,7 +539,9 @@ static void test_GetCurrentThemeName(void) currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef,
1
0
0
0
Jacek Caban : mshtml: Properly handle upload streams containing headers.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: 589c213890f2ae749359ab5d7016d9c579ea1445 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=589c213890f2ae749359ab5d7…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 5 15:23:25 2011 +0200 mshtml: Properly handle upload streams containing headers. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 125 +++++++++++++++++++++++++++++------------ dlls/mshtml/nsio.c | 5 +- 3 files changed, 94 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a449b18..44b6b1d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -500,6 +500,7 @@ typedef struct { nsWineURI *uri; nsIInputStream *post_data_stream; + BOOL post_data_contains_headers; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; nsISupports *owner; @@ -687,7 +688,7 @@ HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**); HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD); -HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD,BOOL*); +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*); HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index db624d8..446b57b 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -684,33 +684,6 @@ static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) return S_OK; } -static HRESULT read_post_data_stream(nsIInputStream *stream, HGLOBAL *post_data, - ULONG *post_data_len) -{ - PRUint32 data_len = 0, available = 0; - char *data; - nsresult nsres; - - nsres = nsIInputStream_Available(stream, &available); - if(NS_FAILED(nsres)) - return E_FAIL; - - data = GlobalAlloc(0, available+1); - if(!data) - return E_OUTOFMEMORY; - - nsres = nsIInputStream_Read(stream, data, available, &data_len); - if(NS_FAILED(nsres)) { - GlobalFree(data); - return E_FAIL; - } - - data[data_len] = 0; - *post_data = data; - *post_data_len = data_len; - return S_OK; -} - HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -899,6 +872,90 @@ struct nsChannelBSC { nsProtocolStream *nsstream; }; +static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) +{ + PRUint32 data_len = 0, available = 0; + char *data, *post_data; + nsresult nsres; + HRESULT hres = S_OK; + + if(!nschannel->post_data_stream) + return S_OK; + + nsres = nsIInputStream_Available(nschannel->post_data_stream, &available); + if(NS_FAILED(nsres)) + return E_FAIL; + + post_data = data = GlobalAlloc(0, available+1); + if(!data) + return E_OUTOFMEMORY; + + nsres = nsIInputStream_Read(nschannel->post_data_stream, data, available, &data_len); + if(NS_FAILED(nsres)) { + GlobalFree(data); + return E_FAIL; + } + + data[data_len++] = 0; + + if(nschannel->post_data_contains_headers) { + if(data[0] == '\r' && data[1] == '\n') { + post_data = data+2; + data_len -= 2; + }else { + WCHAR *headers; + DWORD size; + + post_data = strstr(data, "\r\n\r\n"); + if(post_data) + post_data += 4; + else + post_data = data+data_len; + + data_len -= post_data-data; + + size = MultiByteToWideChar(CP_ACP, 0, data, post_data-data, NULL, 0); + headers = heap_alloc((size+1)*sizeof(WCHAR)); + if(headers) { + MultiByteToWideChar(CP_ACP, 0, data, post_data-data, headers, size); + headers[size] = 0; + hres = parse_headers(headers , &nschannel->request_headers); + if(SUCCEEDED(hres)) + This->bsc.headers = headers; + else + heap_free(headers); + }else { + hres = E_OUTOFMEMORY; + } + } + } + + if(FAILED(hres)) { + GlobalFree(data); + return hres; + } + + if(!data_len) { + GlobalFree(data); + post_data = NULL; + }else if(post_data != data) { + char *new_data; + + new_data = GlobalAlloc(0, data_len); + if(new_data) + memcpy(new_data, post_data, data_len); + GlobalFree(data); + if(!new_data) + return E_OUTOFMEMORY; + post_data = new_data; + } + + This->bsc.post_data = post_data; + This->bsc.post_data_len = data_len; + TRACE("post_data = %s\n", debugstr_a(This->bsc.post_data)); + return S_OK; +} + static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; @@ -1068,12 +1125,9 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) HRESULT hres; if(This->nschannel && This->nschannel->post_data_stream) { - hres = read_post_data_stream(This->nschannel->post_data_stream, - &This->bsc.post_data, &This->bsc.post_data_len); + hres = read_post_data_stream(This, This->nschannel); if(FAILED(hres)) return hres; - - TRACE("post_data = %s\n", debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); } return S_OK; @@ -1512,8 +1566,7 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis } } -HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, - nsIInputStream *post_data_stream, DWORD hlnf, BOOL *cancel) +HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschannel, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; nsChannelBSC *callback; @@ -1542,10 +1595,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, return hres; } - if(post_data_stream) { - read_post_data_stream(post_data_stream, &callback->bsc.post_data, &callback->bsc.post_data_len); - TRACE("post_data = %s\n", debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); - } + if(nschannel) + read_post_data_stream(callback, nschannel); hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b2dab98..b25aae0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -149,7 +149,7 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) return FALSE; - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf, &cancel); + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, &cancel); return FAILED(hres) || cancel; } @@ -1304,6 +1304,8 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength); + This->post_data_contains_headers = TRUE; + if(aContentType) { nsACString_GetData(aContentType, &content_type); if(*content_type) { @@ -1316,6 +1318,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, set_http_header(&This->request_headers, content_typeW, sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); heap_free(ct); + This->post_data_contains_headers = FALSE; } }
1
0
0
0
Huw Davies : gdi32: Add support for 32 bpp BI_BITFIELDS.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: ba3d34875a844ec09648499fba226241ad34f1f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba3d34875a844ec09648499fb…
Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 13:26:08 2011 +0100 gdi32: Add support for 32 bpp BI_BITFIELDS. --- dlls/gdi32/dibdrv/dc.c | 28 ++++++++++++++++++++++++---- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 30 ++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a230fbf..473bf82 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -36,11 +36,34 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) return 0; } +static void calc_shift_and_len(DWORD mask, int *shift, int *len) +{ + int s, l; + + s = 0; + while ((mask & 1) == 0) + { + mask >>= 1; + s++; + } + l = 0; + while ((mask & 1) == 1) + { + mask >>= 1; + l++; + } + *shift = s; + *len = l; +} + static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) { dib->red_mask = bit_fields[0]; dib->green_mask = bit_fields[1]; dib->blue_mask = bit_fields[2]; + calc_shift_and_len(dib->red_mask, &dib->red_shift, &dib->red_len); + calc_shift_and_len(dib->green_mask, &dib->green_shift, &dib->green_len); + calc_shift_and_len(dib->blue_mask, &dib->blue_shift, &dib->blue_len); } static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) @@ -71,10 +94,7 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) dib->funcs = &funcs_8888; else - { - TRACE("32 bpp bitmasks not supported, will forward to graphics driver.\n"); - return FALSE; - } + dib->funcs = &funcs_32; break; default: diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index da41f21..9ed7661 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -29,4 +29,5 @@ typedef struct primitive_funcs } primitive_funcs; extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 8bbfc4d..92559d2 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -26,6 +26,31 @@ static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); } +static inline DWORD put_field(DWORD field, int shift, int len) +{ + shift = shift - (8 - len); + if (len <= 8) + field &= (((1 << len) - 1) << (8 - len)); + if (shift < 0) + field >>= -shift; + else + field <<= shift; + return field; +} + +static DWORD colorref_to_pixel_masks(const dib_info *dib, COLORREF colour) +{ + DWORD r,g,b; + + r = GetRValue(colour); + g = GetGValue(colour); + b = GetBValue(colour); + + return put_field(r, dib->red_shift, dib->red_len) | + put_field(g, dib->green_shift, dib->green_len) | + put_field(b, dib->blue_shift, dib->blue_len); +} + static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) { return 0; @@ -36,6 +61,11 @@ const primitive_funcs funcs_8888 = colorref_to_pixel_888 }; +const primitive_funcs funcs_32 = +{ + colorref_to_pixel_masks +}; + const primitive_funcs funcs_null = { colorref_to_pixel_null diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8aa23bd..5f27106 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -86,6 +86,8 @@ typedef struct void *bits; /* points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; + int red_shift, green_shift, blue_shift; + int red_len, green_len, blue_len; const struct primitive_funcs *funcs; } dib_info;
1
0
0
0
Huw Davies : gdi32: Add a dib primitive function table.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: 0c5e7a6d4dcf07855742bb339a17e7f7ee0a196c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0c5e7a6d4dcf07855742bb339…
Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 13:23:20 2011 +0100 gdi32: Add a dib primitive function table. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/dibdrv/dc.c | 20 +++++++++++++++++++ dlls/gdi32/dibdrv/dibdrv.h | 8 +++++++ dlls/gdi32/dibdrv/primitives.c | 42 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + 5 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 13b1a72..9753ef4 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ dc.c \ dib.c \ dibdrv/dc.c \ + dibdrv/primitives.c \ driver.c \ enhmetafile.c \ enhmfdrv/bitblt.c \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index d105f60..a230fbf 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -36,6 +36,13 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) return 0; } +static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) +{ + dib->red_mask = bit_fields[0]; + dib->green_mask = bit_fields[1]; + dib->blue_mask = bit_fields[2]; +} + static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) { dib->bit_count = bi->biBitCount; @@ -55,8 +62,21 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit dib->stride = -dib->stride; } + dib->funcs = &funcs_null; + switch(dib->bit_count) { + case 32: + init_bit_fields(dib, bit_fields); + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) + dib->funcs = &funcs_8888; + else + { + TRACE("32 bpp bitmasks not supported, will forward to graphics driver.\n"); + return FALSE; + } + break; + default: TRACE("bpp %d not supported, will forward to graphics driver.\n", dib->bit_count); return FALSE; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 9dca50f..da41f21 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -22,3 +22,11 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { return (dibdrv_physdev *)dev; } + +typedef struct primitive_funcs +{ + DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); +} primitive_funcs; + +extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c new file mode 100644 index 0000000..8bbfc4d --- /dev/null +++ b/dlls/gdi32/dibdrv/primitives.c @@ -0,0 +1,42 @@ +/* + * DIB driver primitives. + * + * Copyright 2011 Huw Davies + * + * 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 "gdi_private.h" +#include "dibdrv.h" + +static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) +{ + return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); +} + +static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) +{ + return 0; +} + +const primitive_funcs funcs_8888 = +{ + colorref_to_pixel_888 +}; + +const primitive_funcs funcs_null = +{ + colorref_to_pixel_null +}; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5849d88..8aa23bd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -86,6 +86,8 @@ typedef struct void *bits; /* points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; + + const struct primitive_funcs *funcs; } dib_info; typedef struct dibdrv_physdev
1
0
0
0
Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: ea8b32cecf49900e7c1b42d2d0acbe80a5ff3347 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ea8b32cecf49900e7c1b42d2d…
Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Apr 5 11:12:04 2011 +0900 po: Update Korean translation. --- po/ko.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index def4671..d239c05 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2006,13 +2006,12 @@ msgid "Default MidiOut Device" msgstr "기본 미디출력 장치" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "기본 설정" +msgstr "지역 설정" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%uMB 사용됨, %uMB 가능함" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options"
1
0
0
0
Hans Leidekker : wine.inf: Add shell handler for .msp files.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: 4222e33989d4d59e64bc6c92f45dccdb36cd01bc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4222e33989d4d59e64bc6c92f…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 12:04:11 2011 +0200 wine.inf: Add shell handler for .msp files. --- tools/wine.inf.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cb130e6..d4a457b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -159,6 +159,7 @@ HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" +HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,chm.file,,2,"Compiled HTML Help File" @@ -197,6 +198,9 @@ HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f ""%1""" HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x ""%1""" +HKCR,Msi.Patch,,2,"Windows Installer Patch" +HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" +HKCR,Msi.Patch\shell\Open\command,,2,"msiexec /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1"
1
0
0
0
Hans Leidekker : msi: Honor msidbFeatureAttributesFollowParent.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: d447ae63b3194fdab39c319496dd1f24a1a629e1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d447ae63b3194fdab39c31949…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 14:05:00 2011 +0200 msi: Honor msidbFeatureAttributesFollowParent. --- dlls/msi/action.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 366d897..3244b6d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2232,18 +2232,23 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - - /* disable child features of unselected parent features */ + /* disable child features of unselected parent or follow parent */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { FeatureList *fl; - if (is_feature_selected( feature, level )) continue; - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) { - fl->feature->Action = INSTALLSTATE_UNKNOWN; - fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + if (!is_feature_selected( feature, level )) + { + fl->feature->Action = INSTALLSTATE_UNKNOWN; + fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + } + else if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) + { + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } } } } @@ -2267,6 +2272,21 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + FeatureList *fl; + + if (!is_feature_selected( feature, level )) continue; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) + { + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } + } + } } /* now we want to set component state based based on feature state */
1
0
0
0
Hans Leidekker : msi: Fix parsing of an empty property followed by a non-empty property.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: ce0b3a030baae1b6d49e66718d0f71ef76789fe8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ce0b3a030baae1b6d49e66718…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 12:03:36 2011 +0200 msi: Fix parsing of an empty property followed by a non-empty property. --- dlls/msi/action.c | 5 ++++- dlls/msi/tests/install.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 79d12d6..366d897 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -231,6 +231,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) if (!count) goto done; in_quotes = 1; ignore = 1; + len++; break; case '"': state = state_quote; @@ -258,6 +259,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) state = state_whitespace; if (!count) goto done; in_quotes = 1; + len++; break; default: if (!count) in_quotes = 0; @@ -276,8 +278,9 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; case ' ': state = state_whitespace; - if (!count) goto done; + if (!count || (count > 1 && !len)) goto done; in_quotes = 1; + len++; break; default: state = state_token; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1f5ab9c..d54f923 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6346,6 +6346,10 @@ static void test_command_line_parsing(void) r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "Q=\"\" P=\"one\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + DeleteFile(msifile); RemoveDirectory("msitest"); }
1
0
0
0
Alexandre Julliard : winex11: Update the cursor on the clipping window while it's mapped.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: ecf217bbe4617cec454e055fa6b163bc9cc64563 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ecf217bbe4617cec454e055fa…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:20:14 2011 +0200 winex11: Update the cursor on the clipping window while it's mapped. --- dlls/winex11.drv/event.c | 17 ++++++++++++++++- dlls/winex11.drv/mouse.c | 10 +++++++--- dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6e4225c..ba5cdff 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -91,6 +91,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); +static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); static void X11DRV_ReparentNotify( HWND hwnd, XEvent *event ); static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); @@ -124,7 +125,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* VisibilityNotify */ /* CreateNotify */ { DestroyNotify, X11DRV_DestroyNotify }, - /* UnmapNotify */ + { UnmapNotify, X11DRV_UnmapNotify }, { MapNotify, X11DRV_MapNotify }, /* MapRequest */ { ReparentNotify, X11DRV_ReparentNotify }, @@ -801,6 +802,11 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; + if (event->xany.window == clip_window) + { + clipping_cursor = 1; + return; + } if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped || data->embedded) return; @@ -812,6 +818,15 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) } +/********************************************************************** + * X11DRV_UnmapNotify + */ +static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) +{ + if (event->xany.window == clip_window) clipping_cursor = 0; +} + + /*********************************************************************** * is_net_wm_state_maximized */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 63773ce..e7e8d62 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -884,7 +884,8 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) GetTickCount() - last_cursor_change > 100) { last_cursor_change = GetTickCount(); - if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (clipping_cursor) set_window_cursor( clip_window, handle ); + else if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } @@ -958,12 +959,14 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (!XGrabPointer( display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + clipping_cursor = 1; + wine_tsx11_unlock(); + + if (clipping_cursor) { - wine_tsx11_unlock(); clip_rect = *clip; return TRUE; } - wine_tsx11_unlock(); } } @@ -972,6 +975,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) wine_tsx11_lock(); XUnmapWindow( display, clip_window ); wine_tsx11_unlock(); + clipping_cursor = 0; return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 21c8352..e35547a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -70,6 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* cursor clipping window */ Window clip_window = 0; +int clipping_cursor = 0; /* X context to associate a hwnd to an X window */ XContext winContext = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 26375fd..986d03a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -586,6 +586,7 @@ static inline size_t get_property_size( int format, unsigned long count ) extern Visual *visual; extern Window root_window; extern Window clip_window; +extern int clipping_cursor; extern unsigned int screen_width; extern unsigned int screen_height; extern unsigned int screen_bpp;
1
0
0
0
Alexandre Julliard : winex11: Always forward SetCursor to the driver, and limit the frequency of updates on the driver side.
by Alexandre Julliard
05 Apr '11
05 Apr '11
Module: wine Branch: master Commit: 886ae4c3484bcf2cda549d8be39e2f901e0394fc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=886ae4c3484bcf2cda549d8be…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:06:59 2011 +0200 winex11: Always forward SetCursor to the driver, and limit the frequency of updates on the driver side. --- dlls/user32/cursoricon.c | 4 +--- dlls/winex11.drv/mouse.c | 26 +++++++++++++++++--------- dlls/winex11.drv/window.c | 6 +++++- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 476aa51..ba06e96 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1651,9 +1651,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu SERVER_END_REQ; if (!ret) return 0; - - /* Change the cursor shape only if it is visible */ - if (show_count >= 0 && hOldCursor != hCursor) USER_Driver->pSetCursor( hCursor ); + USER_Driver->pSetCursor( show_count >= 0 ? hCursor : 0 ); if (!(obj = get_icon_ptr( hOldCursor ))) return 0; release_icon_ptr( hOldCursor, obj ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fe9f716..63773ce 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -93,7 +93,8 @@ static const UINT button_up_flags[NB_BUTTONS] = }; static HWND cursor_window; -static DWORD last_time_modified; +static HCURSOR last_cursor; +static DWORD last_cursor_change; static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -157,7 +158,7 @@ static Cursor get_empty_cursor(void) /*********************************************************************** * set_window_cursor */ -void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ) +void set_window_cursor( Window window, HCURSOR handle ) { Cursor cursor, prev; @@ -184,10 +185,9 @@ void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ) } } - XDefineCursor( gdi_display, data->whole_window, cursor ); + XDefineCursor( gdi_display, window, cursor ); /* make the change take effect immediately */ XFlush( gdi_display ); - data->cursor = handle; wine_tsx11_unlock(); } @@ -206,7 +206,11 @@ void sync_window_cursor( struct x11drv_win_data *data ) } SERVER_END_REQ; - if (data->cursor != cursor) set_window_cursor( data, cursor ); + if (data->cursor != cursor) + { + data->cursor = cursor; + set_window_cursor( data->whole_window, cursor ); + } } /*********************************************************************** @@ -247,12 +251,11 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y MapWindowPoints( hwnd, 0, &pt, 1 ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || - GetTickCount() - last_time_modified > 100) + GetTickCount() - last_cursor_change > 100) { - cursor_window = hwnd; sync_window_cursor( data ); + last_cursor_change = GetTickCount(); } - last_time_modified = GetTickCount(); if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); @@ -877,7 +880,12 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) */ void CDECL X11DRV_SetCursor( HCURSOR handle ) { - if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || + GetTickCount() - last_cursor_change > 100) + { + last_cursor_change = GetTickCount(); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + } } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1fcadb5..21c8352 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2699,7 +2699,11 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; case WM_X11DRV_SET_CURSOR: - if ((data = X11DRV_get_win_data( hwnd ))) set_window_cursor( data, (HCURSOR)lp ); + if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) + { + data->cursor = (HCURSOR)lp; + set_window_cursor( data->whole_window, data->cursor ); + } return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0a1e3d9..26375fd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -820,7 +820,7 @@ extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); -extern void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ); +extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( struct x11drv_win_data *data ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display );
1
0
0
0
← Newer
1
...
79
80
81
82
83
84
85
...
94
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
Results per page:
10
25
50
100
200