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 2010
----- 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
2 participants
898 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Make sure all texture levels are allocated in surface_prepare_texture().
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 9308c5499fa1f13ca5fff58f22a95ba60aa54726 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9308c5499fa1f13ca5fff58f2…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:55:58 2010 +0200 wined3d: Make sure all texture levels are allocated in surface_prepare_texture(). This fixes a regression introduced by commit af7dfcd378739127c50aa95ce40b13eb3d1950cf. --- dlls/wined3d/surface.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0818ce9..7d6d175 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1563,7 +1563,8 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) } /* Context activation is done by the caller. */ -void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) +static void surface_prepare_texture_internal(IWineD3DSurfaceImpl *surface, + const struct wined3d_gl_info *gl_info, BOOL srgb) { DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; CONVERT_TYPES convert; @@ -1580,6 +1581,31 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ surface->Flags |= alloc_flag; } +/* Context activation is done by the caller. */ +void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) +{ + IWineD3DBaseTextureImpl *texture; + + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&texture))) + { + UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; + UINT i; + + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + + for (i = 0; i < sub_count; ++i) + { + IWineD3DSurfaceImpl *s = (IWineD3DSurfaceImpl *)texture->baseTexture.sub_resources[i]; + surface_prepare_texture_internal(s, gl_info, srgb); + } + + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); + } + + surface_prepare_texture_internal(surface, gl_info, srgb); +} + static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *device = This->resource.device;
1
0
0
0
Henri Verbeet : wined3d: Store texture sub-resources in IWineD3DBaseTextureClass.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 958b5237077086454a7cbc19ec9942d42f00a238 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=958b5237077086454a7cbc19e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:55:57 2010 +0200 wined3d: Store texture sub-resources in IWineD3DBaseTextureClass. --- dlls/wined3d/basetexture.c | 52 +++++--- dlls/wined3d/cubetexture.c | 266 +++++++++++++++++++++++----------------- dlls/wined3d/state.c | 10 +- dlls/wined3d/texture.c | 110 ++++++++++------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/volumetexture.c | 141 +++++++++++++--------- dlls/wined3d/wined3d_private.h | 18 +-- 7 files changed, 347 insertions(+), 254 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=958b5237077086454a7cb…
1
0
0
0
Alexandre Julliard : winex11: Use a format with 8 bits of alpha for the AlphaBlend mask.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 11c7a67ac317130ecd980a5880fb1a2974570f33 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=11c7a67ac317130ecd980a588…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 20:48:30 2010 +0200 winex11: Use a format with 8 bits of alpha for the AlphaBlend mask. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 83f8048..0d4ef60 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1581,11 +1581,11 @@ static Picture get_mask_pict( int alpha ) if (!pixmap) { - const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_MONO ); + const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_A8R8G8B8 ); XRenderPictureAttributes pa; wine_tsx11_lock(); - pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); + pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 32 ); pa.repeat = RepeatNormal; pict = pXRenderCreatePicture( gdi_display, pixmap, fmt->pict_format, CPRepeat, &pa ); wine_tsx11_unlock();
1
0
0
0
Alexandre Julliard : winex11: Add some tracing to AlphaBlend.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: f0460e3cfde240c0bd775725edad57a05f2ac938 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f0460e3cfde240c0bd775725e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 20:48:17 2010 +0200 winex11: Add some tracing to AlphaBlend. --- dlls/winex11.drv/bitblt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 94620df..653e418 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1691,6 +1691,12 @@ BOOL CDECL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN if (!BITBLT_GetVisRectangles( physDevDst, physDevSrc, &dst, &src )) return TRUE; + TRACE( "format %x alpha %u rectdst=%d,%d %dx%d orgdst=%d,%d visdst=%s rectsrc=%d,%d %dx%d orgsrc=%d,%d vissrc=%s\n", + blendfn.AlphaFormat, blendfn.SourceConstantAlpha, dst.x, dst.y, dst.width, dst.height, + physDevDst->dc_rect.left, physDevDst->dc_rect.top, wine_dbgstr_rect( &dst.visrect ), + src.x, src.y, src.width, src.height, + physDevSrc->dc_rect.left, physDevSrc->dc_rect.top, wine_dbgstr_rect( &src.visrect ) ); + if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || src.width > physDevSrc->drawable_rect.right - physDevSrc->drawable_rect.left - src.x || src.height > physDevSrc->drawable_rect.bottom - physDevSrc->drawable_rect.top - src.y)
1
0
0
0
Jacek Caban : mshtml: Use NS_CStringContainerInit2 in nsACString_Init.
by Alexandre Julliard
22 Apr '10
22 Apr '10
Module: wine Branch: master Commit: 033bb8a2f9bd57000e64d5566f1b52a1cdf3f730 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=033bb8a2f9bd57000e64d5566…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 17:48:39 2010 +0200 mshtml: Use NS_CStringContainerInit2 in nsACString_Init. --- dlls/mshtml/nsembed.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ddf3c3a..3df5c04 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -56,7 +56,6 @@ static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32); static nsresult (*NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32); -static nsresult (*NS_CStringContainerInit)(nsCStringContainer*); static nsresult (*NS_StringContainerFinish)(nsStringContainer*); static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); @@ -182,9 +181,8 @@ static BOOL load_xpcom(const PRUnichar *gre_path) NS_DLSYM(NS_InitXPCOM2); NS_DLSYM(NS_ShutdownXPCOM); NS_DLSYM(NS_GetComponentRegistrar); - NS_DLSYM(NS_CStringContainerInit2); NS_DLSYM(NS_StringContainerInit2); - NS_DLSYM(NS_CStringContainerInit); + NS_DLSYM(NS_CStringContainerInit2); NS_DLSYM(NS_StringContainerFinish); NS_DLSYM(NS_CStringContainerFinish); NS_DLSYM(NS_StringSetData); @@ -522,11 +520,9 @@ void nsfree(void *mem) nsIMemory_Free(nsmem, mem); } -static void nsACString_Init(nsACString *str, const char *data) +static BOOL nsACString_Init(nsACString *str, const char *data) { - NS_CStringContainerInit(str); - if(data) - nsACString_SetData(str, data); + return NS_SUCCEEDED(NS_CStringContainerInit2(str, data, PR_UINT32_MAX, 0)); } /*
1
0
0
0
Jacek Caban : mshtml: Use URI with stripped "wine:" part in NewURI call.
by Alexandre Julliard
22 Apr '10
22 Apr '10
Module: wine Branch: master Commit: 64271d5207bf095efb430fcfdba582b80b53a08d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=64271d5207bf095efb430fcfd…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 17:48:12 2010 +0200 mshtml: Use URI with stripped "wine:" part in NewURI call. --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 21 +++++++++++++-------- dlls/mshtml/nsio.c | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3db8d79..c88b3e5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -727,8 +727,10 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); void *nsalloc(size_t) __WINE_ALLOC_SIZE(1); void nsfree(void*); +void nsACString_InitDepend(nsACString*,const char*); void nsACString_SetData(nsACString*,const char*); PRUint32 nsACString_GetData(const nsACString*,const char**); +void nsACString_Finish(nsACString*); BOOL nsAString_Init(nsAString*,const PRUnichar*); void nsAString_InitDepend(nsAString*,const PRUnichar*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8a59007..ddf3c3a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -48,19 +48,14 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define PR_UINT32_MAX 0xffffffff -struct nsCStringContainer { - void *v; - void *d1; - PRUint32 d2; - PRUint32 d3; -}; - #define NS_STRING_CONTAINER_INIT_DEPEND 0x0002 +#define NS_CSTRING_CONTAINER_INIT_DEPEND 0x0002 static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32); +static nsresult (*NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32); static nsresult (*NS_CStringContainerInit)(nsCStringContainer*); static nsresult (*NS_StringContainerFinish)(nsStringContainer*); static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); @@ -187,6 +182,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path) NS_DLSYM(NS_InitXPCOM2); NS_DLSYM(NS_ShutdownXPCOM); NS_DLSYM(NS_GetComponentRegistrar); + NS_DLSYM(NS_CStringContainerInit2); NS_DLSYM(NS_StringContainerInit2); NS_DLSYM(NS_CStringContainerInit); NS_DLSYM(NS_StringContainerFinish); @@ -533,6 +529,15 @@ static void nsACString_Init(nsACString *str, const char *data) nsACString_SetData(str, data); } +/* + * Initializes nsACString with data owned by caller. + * Caller must ensure that data is valid during lifetime of string object. + */ +void nsACString_InitDepend(nsACString *str, const char *data) +{ + NS_CStringContainerInit2(str, data, PR_UINT32_MAX, NS_CSTRING_CONTAINER_INIT_DEPEND); +} + void nsACString_SetData(nsACString *str, const char *data) { NS_CStringSetData(str, data, PR_UINT32_MAX); @@ -543,7 +548,7 @@ PRUint32 nsACString_GetData(const nsACString *str, const char **data) return NS_CStringGetData(str, data, NULL); } -static void nsACString_Finish(nsACString *str) +void nsACString_Finish(nsACString *str) { NS_CStringContainerFinish(str); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0c8e457..c9bb54a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2453,6 +2453,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * HTMLWindow *window = NULL; nsIURI *uri = NULL; LPCWSTR base_wine_url = NULL; + nsACString spec_str; nsresult nsres; nsACString_GetData(aSpec, &spec); @@ -2485,7 +2486,9 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } + nsACString_InitDepend(&spec_str, spec); nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); + nsACString_Finish(&spec_str); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres);
1
0
0
0
André Hentschel : imm32: Add tests for ImmAssociateContextEx.
by Alexandre Julliard
22 Apr '10
22 Apr '10
Module: wine Branch: master Commit: 699ef11d488c3128d091bfa4309a1e9abca4ca23 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=699ef11d488c3128d091bfa43…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 22 17:40:15 2010 +0200 imm32: Add tests for ImmAssociateContextEx. --- dlls/imm32/tests/imm32.c | 56 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index ccbbc06..2d25e53 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -26,6 +26,8 @@ #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) +static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); + /* * msgspy - record and analyse message traces sent to a certain window */ @@ -133,9 +135,13 @@ static void msg_spy_cleanup(void) { static const char wndcls[] = "winetest_imm32_wndcls"; static HWND hwnd; -static int init(void) { +static BOOL init(void) { WNDCLASSEX wc; HIMC imc; + HMODULE hmod; + + hmod = GetModuleHandleA("imm32.dll"); + pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -151,19 +157,19 @@ static int init(void) { wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); if (!RegisterClassExA(&wc)) - return 0; + return FALSE; hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandle(0), NULL); if (!hwnd) - return 0; + return FALSE; imc = ImmGetContext(hwnd); if (!imc) { win_skip("IME support not implemented\n"); - return 0; + return FALSE; } ImmReleaseContext(hwnd, imc); @@ -172,7 +178,7 @@ static int init(void) { msg_spy_init(hwnd); - return 1; + return TRUE; } static void cleanup(void) { @@ -307,6 +313,45 @@ static void test_ImmIME(void) ImmReleaseContext(hwnd,imc); } +static void test_ImmAssociateContextEx(void) +{ + HIMC imc; + BOOL rc; + + if (!pImmAssociateContextEx) return; + + imc = ImmGetContext(hwnd); + if (imc) + { + HIMC retimc, newimc; + + newimc = ImmCreateContext(); + ok(newimc != imc, "handles should not be the same\n"); + rc = pImmAssociateContextEx(NULL, NULL, 0); + ok(!rc, "ImmAssociateContextEx succeeded\n"); + rc = pImmAssociateContextEx(hwnd, NULL, 0); + todo_wine ok(rc, "ImmAssociateContextEx failed\n"); + rc = pImmAssociateContextEx(NULL, imc, 0); + ok(!rc, "ImmAssociateContextEx succeeded\n"); + + rc = pImmAssociateContextEx(hwnd, imc, 0); + todo_wine ok(rc, "ImmAssociateContextEx failed\n"); + retimc = ImmGetContext(hwnd); + ok(retimc == imc, "handles should be the same\n"); + ImmReleaseContext(hwnd,retimc); + + rc = pImmAssociateContextEx(hwnd, newimc, 0); + todo_wine ok(rc, "ImmAssociateContextEx failed\n"); + retimc = ImmGetContext(hwnd); + todo_wine ok(retimc == newimc, "handles should be the same\n"); + ImmReleaseContext(hwnd,retimc); + + rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); + ok(rc, "ImmAssociateContextEx failed\n"); + } + ImmReleaseContext(hwnd,imc); +} + START_TEST(imm32) { if (init()) { @@ -314,6 +359,7 @@ START_TEST(imm32) { test_ImmGetCompositionString(); test_ImmSetCompositionString(); test_ImmIME(); + test_ImmAssociateContextEx(); } cleanup(); }
1
0
0
0
Hans Leidekker : winhttp/tests: Avoid test failures caused by broken DNS server configurations.
by Alexandre Julliard
22 Apr '10
22 Apr '10
Module: wine Branch: master Commit: 15daa84b2812203d39516ee56955d6c187f28f12 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=15daa84b2812203d39516ee56…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 22 16:36:18 2010 +0200 winhttp/tests: Avoid test failures caused by broken DNS server configurations. Reported by Stefan Dösinger. --- dlls/winhttp/tests/winhttp.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 140379d..bf2db07 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1629,8 +1629,10 @@ static void test_Timeouts (void) static void test_resolve_timeout(void) { - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - static const WCHAR srevaewedoc[] = {'s','r','e','v','a','e','w','e','d','o','c','.','m','o','c',0}; + static const WCHAR codeweavers[] = + {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; + static const WCHAR nxdomain[] = + {'n','x','d','o','m','a','i','n','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; HINTERNET ses, con, req; DWORD timeout; @@ -1643,7 +1645,7 @@ static void test_resolve_timeout(void) ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - con = WinHttpConnect(ses, srevaewedoc, 0, 0); + con = WinHttpConnect(ses, nxdomain, 0, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0);
1
0
0
0
Hans Leidekker : winhttp/tests: Use the right handle type.
by Alexandre Julliard
22 Apr '10
22 Apr '10
Module: wine Branch: master Commit: 6842c7d8a85fb3306fe5c70963c8faabb93ab5ee URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6842c7d8a85fb3306fe5c7096…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 22 16:35:56 2010 +0200 winhttp/tests: Use the right handle type. --- dlls/winhttp/tests/winhttp.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 250f317..140379d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -227,7 +227,7 @@ static void test_empty_headers_param(void) { static const WCHAR winehq[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR empty[] = {0}; - HANDLE ses, con, req; + HINTERNET ses, con, req; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -761,7 +761,7 @@ static void test_secure_connection(void) { static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; - HANDLE ses, con, req; + HINTERNET ses, con, req; DWORD size, status, policy, bitness; BOOL ret; CERT_CONTEXT *cert; @@ -836,7 +836,7 @@ static void test_request_parameter_defaults(void) static const WCHAR empty[] = {0}; static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; + HINTERNET ses, con, req; DWORD size, status, error; WCHAR *version; BOOL ret; @@ -1632,7 +1632,7 @@ static void test_resolve_timeout(void) static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR srevaewedoc[] = {'s','r','e','v','a','e','w','e','d','o','c','.','m','o','c',0}; - HANDLE ses, con, req; + HINTERNET ses, con, req; DWORD timeout; BOOL ret; @@ -1922,7 +1922,7 @@ static void test_credentials(void) static WCHAR passW[] = {'p','a','s','s',0}; static WCHAR proxy_userW[] = {'p','r','o','x','y','u','s','e','r',0}; static WCHAR proxy_passW[] = {'p','r','o','x','y','p','a','s','s',0}; - HANDLE ses, con, req; + HINTERNET ses, con, req; DWORD size, error; WCHAR buffer[32]; BOOL ret;
1
0
0
0
Hans Leidekker : winhttp: Add tests for basic authentication.
by Alexandre Julliard
22 Apr '10
22 Apr '10
Module: wine Branch: master Commit: cd79874cee3bed886d6e17635819e6e3cf402c66 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cd79874cee3bed886d6e17635…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 22 16:35:28 2010 +0200 winhttp: Add tests for basic authentication. --- dlls/winhttp/tests/Makefile.in | 2 +- dlls/winhttp/tests/winhttp.c | 268 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 267 insertions(+), 3 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd79874cee3bed886d6e1…
1
0
0
0
← Newer
1
...
14
15
16
17
18
19
20
...
90
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
Results per page:
10
25
50
100
200