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

Henri Verbeet : wined3d: Introduce basetexture_get_sub_resource() to simplify retrieving texture sub-resources.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 339f7ef1002e8532d285d746151e5f77cd44f813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339f7ef1002e8532d285d7461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:55:59 2010 +0200 wined3d: Introduce basetexture_get_sub_resource() to simplify retrieving texture sub-resources. --- dlls/wined3d/basetexture.c | 17 ++++++ dlls/wined3d/cubetexture.c | 70 +++++++++--------------- dlls/wined3d/texture.c | 118 +++++++++++++++++++++++----------------- dlls/wined3d/volumetexture.c | 50 ++++++++++------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 142 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=339f7ef1002e8532d285d…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_direct().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 99994f885c517faa430186efcaf7bd9c90237b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99994f885c517faa430186efc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:56:00 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_direct(). --- dlls/wined3d/surface.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d6d175..50dbe7b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2988,13 +2988,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS /* Does a direct frame buffer -> texture copy. Stretching is done * with single pixel copy calls */ -static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, +static void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *dst_surface, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, const RECT *dst_rect_in, WINED3DTEXTUREFILTERTYPE Filter) { - IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DDeviceImpl *device = dst_surface->resource.device; float xrel, yrel; UINT row; - IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; @@ -3009,14 +3008,14 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D upsidedown = TRUE; } - context = context_acquire(device, Src, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *) This, SRGB_RGB); + context = context_acquire(device, src_surface, CTXUSAGE_BLIT); + surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); ENTER_GL(); /* Bind the target texture */ - glBindTexture(This->texture_target, This->texture_name); + glBindTexture(dst_surface->texture_target, dst_surface->texture_name); checkGLcall("glBindTexture"); - if (surface_is_offscreen(Src)) + if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; @@ -3024,7 +3023,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } else { - glReadBuffer(surface_get_gl_buffer(Src)); + glReadBuffer(surface_get_gl_buffer(src_surface)); } checkGLcall("glReadBuffer"); @@ -3051,12 +3050,12 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D { /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do */ - glCopyTexSubImage2D(This->texture_target, This->texture_level, + glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, - src_rect->left, Src->currentDesc.Height - src_rect->bottom, + src_rect->left, src_surface->currentDesc.Height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); } else { - UINT yoffset = Src->currentDesc.Height - src_rect->top + dst_rect.top - 1; + UINT yoffset = src_surface->currentDesc.Height - src_rect->top + dst_rect.top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time @@ -3071,13 +3070,16 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D */ UINT col; - for(col = dst_rect.left; col < dst_rect.right; col++) { - glCopyTexSubImage2D(This->texture_target, This->texture_level, + for (col = dst_rect.left; col < dst_rect.right; ++col) + { + glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left + col /* x offset */, row /* y offset */, src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } - } else { - glCopyTexSubImage2D(This->texture_target, This->texture_level, + } + else + { + glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left /* x offset */, row /* y offset */, src_rect->left, yoffset - (int) (row * yrel), dst_rect.right - dst_rect.left, 1); } @@ -3091,7 +3093,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* The texture is now most up to date - If the surface is a render target and has a drawable, this * path is never entered */ - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)dst_surface, SFLAG_INTEXTURE, TRUE); } /* Uses the hardware to stretch and flip the image */ @@ -3584,7 +3586,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const || dst_rect.bottom - dst_rect.top > Src->currentDesc.Height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n"); - fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter); + fb_copy_to_texture_direct(This, Src, &src_rect, &dst_rect, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); fb_copy_to_texture_hwstretch(This, SrcSurface, &src_rect, &dst_rect, Filter);

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_hwstretch ().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: bea50a39de21624b327b9af24348ae7fbef6090c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea50a39de21624b327b9af24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 22 18:56:01 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to fb_copy_to_texture_hwstretch(). --- dlls/wined3d/surface.c | 107 ++++++++++++++++++++++++++---------------------- 1 files changed, 58 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bea50a39de21624b327b9…

1 0

Jacek Caban : shldisp.idl: Added IAsyncOperation declaration.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 0800158e0181623609a58b1c84a880137d273b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0800158e0181623609a58b1c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 21:30:14 2010 +0200 shldisp.idl: Added IAsyncOperation declaration. --- include/shldisp.idl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 4e2d2fe..07c3059 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -118,3 +118,29 @@ coclass ShellFolderViewOC [default] interface IFolderViewOC; [default, source] dispinterface DShellFolderViewEvents; } + +/***************************************************************************** + * IAsyncOperation interface + */ +[ + uuid(3d8b0590-f691-11d2-8ea9-006097df5bd4), + object, +] + +interface IAsyncOperation : IUnknown +{ + typedef [unique] IAsyncOperation *LPASYNCOPERATION; + + HRESULT SetAsyncMode([in] BOOL fDoOpAsync); + + HRESULT GetAsyncMode([out] BOOL *pfIsOpAsync); + + HRESULT StartOperation([in, unique, optional] IBindCtx *pbcReserved); + + HRESULT InOperation([out] BOOL *pfInAsyncOp); + + HRESULT EndOperation( + [in] HRESULT hResult, + [in, unique] IBindCtx *pbcReserved, + [in] DWORD dwEffects); +}

1 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

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

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

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

Piotr Caban : msvcrt/tests: Added sscanf_s tests.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: ca3cb9e2f5c6e6a8134b88f400ba6ae0f43767d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3cb9e2f5c6e6a8134b88f40… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 17:56:24 2010 +0200 msvcrt/tests: Added sscanf_s tests. --- dlls/msvcrt/tests/scanf.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 0ec89ff..e9cb987 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -198,7 +198,49 @@ static void test_sscanf( void ) ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far); } +static void test_sscanf_s(void) +{ + int (__cdecl *psscanf_s)(const char*,const char*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + int i, ret; + char buf[100]; + + psscanf_s = (void*)GetProcAddress(hmod, "sscanf_s"); + if(!psscanf_s) { + win_skip("sscanf_s not available\n"); + return; + } + + ret = psscanf_s("123", "%d", &i); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(i == 123, "i = %d\n", i); + + ret = psscanf_s("123", "%s", buf, 100); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(!strcmp("123", buf), "buf = %s\n", buf); + + ret = psscanf_s("123", "%s", buf, 3); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(buf[0]=='\0', "buf = %s\n", buf); + + buf[0] = 'a'; + ret = psscanf_s("123", "%3c", buf, 2); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(buf[0]=='\0', "buf = %s\n", buf); + + i = 1; + ret = psscanf_s("123 123", "%s %d", buf, 2, &i); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(i==1, "i = %d\n", i); + + i = 1; + ret = psscanf_s("123 123", "%d %s", &i, buf, 2); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(i==123, "i = %d\n", i); +} + START_TEST(scanf) { test_sscanf(); + test_sscanf_s(); }

1 0

Alexandre Julliard : winex11: Flush the gdi display after processing the last event.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 5e60175c7a83e157eda60b03e4358e7ebc42638b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e60175c7a83e157eda60b03e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 16:33:35 2010 +0200 winex11: Flush the gdi display after processing the last event. --- dlls/winex11.drv/event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 63fb5c1..7d84b63 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -379,8 +379,8 @@ static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XP break; } } - XFlush( gdi_display ); if (prev_event.type) call_event_handler( display, &prev_event ); + XFlush( gdi_display ); wine_tsx11_unlock(); if (count) TRACE( "processed %d events\n", count ); return count;

1 0