wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Vincent Povirk : gdiplus: Fix a handle leak in GdipDrawString.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: d0e6aa0204a5cd6c7d2f4696019f6f87897cf478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e6aa0204a5cd6c7d2f46960… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 8 16:59:19 2011 -0600 gdiplus: Fix a handle leak in GdipDrawString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 43513c8..e9412c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4411,7 +4411,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw); - DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); + DeleteObject(SelectObject(graphics->hdc, gdifont)); if (!format || format->align == StringAlignmentNear) {

1 0

Nikolay Sivov : msvcrt: Add _get_output_format() and return default value.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0512829a27b6401610545ed15ab6cbc83097070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0512829a27b6401610545ed15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:41:07 2011 +0300 msvcrt: Add _get_output_format() and return default value. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/headers.c | 1 + dlls/msvcrt/tests/printf.c | 17 +++++++++++++++++ include/msvcrt/stdio.h | 4 ++++ 9 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d732d69..1570fd4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -684,7 +684,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1631fdb..65f9510 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -528,7 +528,7 @@ @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8148caf..badfe65 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -518,7 +518,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d37fc72..b32fdb9 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -253,3 +253,12 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); MSVCRT_free(secondarr); } + +/********************************************************************* + * _get_output_format (MSVCRT.@) + * + */ +unsigned int CDECL _get_output_format(void) +{ + return 0; +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1c7120f..311437a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -769,6 +769,9 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT__WRITE_ABORT_MSG 1 #define MSVCRT__CALL_REPORTFAULT 2 +/* _get_output_format return code */ +#define MSVCRT__TWO_DIGIT_EXPONENT 0x1 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f75c0d9..5d07736 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -473,7 +473,7 @@ @ cdecl _get_osfhandle(long) @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver -# stub _get_output_format +@ cdecl _get_output_format() # stub _get_pgmptr @ cdecl _get_sbh_threshold() # stub _get_wenviron diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 25e2277..7c102b4 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -457,6 +457,7 @@ static void test_defines(void) CHECK_DEF(_UNDERFLOW); CHECK_DEF(_WRITE_ABORT_MSG); CHECK_DEF(_CALL_REPORTFAULT); + CHECK_DEF(_TWO_DIGIT_EXPONENT); } #endif /* __WINE_USE_MSVCRT */ diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ddf4801..22ad1f6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -43,6 +43,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); +static unsigned int (__cdecl *p__get_output_format)(void); static void init( void ) { @@ -53,6 +54,7 @@ static void init( void ) p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); + p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); } static void test_sprintf( void ) @@ -1013,6 +1015,20 @@ static void test_vsnwprintf_s(void) ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); } +static void test__get_output_format(void) +{ + unsigned int ret; + + if (!p__get_output_format) + { + win_skip("_get_output_format not available\n"); + return; + } + + ret = p__get_output_format(); + ok(ret == 0, "got %d\n", ret); +} + START_TEST(printf) { init(); @@ -1026,4 +1042,5 @@ START_TEST(printf) test_vscprintf(); test_vscwprintf(); test_vsnwprintf_s(); + test__get_output_format(); } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index fa5290f..c167110 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -94,6 +94,9 @@ FILE* __cdecl __iob_func(void); #define stdout (_iob+STDOUT_FILENO) #define stderr (_iob+STDERR_FILENO) +/* return value for _get_output_format */ +#define _TWO_DIGIT_EXPONENT 0x1 + #ifndef _STDIO_DEFINED #define _STDIO_DEFINED int __cdecl _fcloseall(void); @@ -173,6 +176,7 @@ int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); +unsigned int __cdecl _get_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Nikolay Sivov : msxml3: Put together similar tests using tabled test data.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 6194d3014508b0d01ff321f1c50ec4430a511607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6194d3014508b0d01ff321f1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:09:03 2011 +0300 msxml3: Put together similar tests using tabled test data. --- dlls/msxml3/tests/domdoc.c | 486 ++++++++++++++++++++------------------------ 1 files changed, 225 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6194d3014508b0d01ff32…

1 0

Henri Verbeet : d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: ab8a9f27f925e47cb39959ad4a3e84c7752d26f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8a9f27f925e47cb39959ad4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:08 2011 +0100 d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE. --- dlls/d3d9/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1dd6895..e008b31 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, /* This method is only allowed with surfaces that are render targets, or * offscreen plain surfaces in D3DPOOL_DEFAULT. */ - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) - && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE)) + if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT) { wined3d_mutex_unlock(); WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n");

1 0

Henri Verbeet : wined3d: Store all the resource desc information in struct wined3d_resource.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: ac9c592ca9c0bac6479f9a8beef4030815b738c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9c592ca9c0bac6479f9a8be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:07 2011 +0100 wined3d: Store all the resource desc information in struct wined3d_resource. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/basetexture.c | 5 +- dlls/wined3d/buffer.c | 5 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 44 ++++++------ dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/resource.c | 17 +++-- dlls/wined3d/state.c | 6 +- dlls/wined3d/surface.c | 140 +++++++++++++++++++------------------ dlls/wined3d/surface_base.c | 136 +++++++++++++++++++----------------- dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 16 ++-- dlls/wined3d/swapchain_gdi.c | 4 +- dlls/wined3d/volume.c | 34 ++++----- dlls/wined3d/wined3d_private.h | 40 ++++------- 15 files changed, 235 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9c592ca9c0bac6479f9…

1 0

Henri Verbeet : wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 63b72d789daec35d10bb8b0aba6a47eb5efcaba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b72d789daec35d10bb8b0ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:06 2011 +0100 wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volumetexture.c | 5 ++--- include/wine/wined3d.idl | 16 ++++------------ 11 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6c70afb..298988d 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -260,7 +260,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, level, &wined3d_desc); + hr = IWineD3DCubeTexture_GetSubResourceDesc(This->wineD3DCubeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c358ed0..c7bc4bd 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -257,7 +257,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, level, &wined3d_desc); + hr = IWineD3DTexture_GetSubResourceDesc(This->wineD3DTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 3e2ee58..6b4ce3a 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -234,7 +234,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); + hr = IWineD3DVolumeTexture_GetSubResourceDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 583efb1..eacc61e 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -276,7 +276,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(IDirect3DCubeTextur TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, level, &wined3d_desc); + hr = IWineD3DCubeTexture_GetSubResourceDesc(This->wineD3DCubeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c7696a3..e94a172 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -272,7 +272,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(IDirect3DTexture9 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, level, &wined3d_desc); + hr = IWineD3DTexture_GetSubResourceDesc(This->wineD3DTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index b1b43a9..c976e87 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -298,7 +298,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); + hr = IWineD3DVolumeTexture_GetSubResourceDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9632947..b55994d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2506,7 +2506,7 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, if(hr == WINED3D_OK && tex) { - hr = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + hr = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(hr)) { ddfmt.dwSize = sizeof(ddfmt); @@ -2815,7 +2815,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, if(hr == WINED3D_OK && tex) { memset(&desc, 0, sizeof(desc)); - hr = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + hr = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(hr)) { ddfmt.dwSize = sizeof(ddfmt); @@ -4588,7 +4588,7 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, if(result == WINED3D_OK && tex) { memset(&desc, 0, sizeof(desc)); - result = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + result = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(result)) { ddfmt.dwSize = sizeof(ddfmt); diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 5df720c..d4e5d21 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -326,7 +326,7 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) return FALSE; } -static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture *iface, +static HRESULT WINAPI IWineD3DCubeTextureImpl_GetSubResourceDesc(IWineD3DCubeTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -450,8 +450,8 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, IWineD3DCubeTextureImpl_IsCondNP2, + IWineD3DCubeTextureImpl_GetSubResourceDesc, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_GetLevelDesc, IWineD3DCubeTextureImpl_GetCubeMapSurface, IWineD3DCubeTextureImpl_Map, IWineD3DCubeTextureImpl_Unmap, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1af3412..7a78ad8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -351,7 +351,7 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { return This->cond_np2; } -static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, +static HRESULT WINAPI IWineD3DTextureImpl_GetSubResourceDesc(IWineD3DTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -468,8 +468,8 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, IWineD3DTextureImpl_IsCondNP2, + IWineD3DTextureImpl_GetSubResourceDesc, /* IWineD3DTexture */ - IWineD3DTextureImpl_GetLevelDesc, IWineD3DTextureImpl_GetSurfaceLevel, IWineD3DTextureImpl_Map, IWineD3DTextureImpl_Unmap, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9c6b57d..78ded41 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -263,7 +263,7 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if return FALSE; } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTexture *iface, +static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetSubResourceDesc(IWineD3DVolumeTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -380,10 +380,9 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetAutoGenFilterType, IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, - /* not in d3d */ IWineD3DVolumeTextureImpl_IsCondNP2, + IWineD3DVolumeTextureImpl_GetSubResourceDesc, /* volume texture */ - IWineD3DVolumeTextureImpl_GetLevelDesc, IWineD3DVolumeTextureImpl_GetVolumeLevel, IWineD3DVolumeTextureImpl_Map, IWineD3DVolumeTextureImpl_Unmap, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 36addd6..8acc0bb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2362,6 +2362,10 @@ interface IWineD3DBaseTexture : IWineD3DResource ); BOOL IsCondNP2( ); + HRESULT GetSubResourceDesc( + [in] UINT sub_resource_idx, + [out] struct wined3d_resource_desc *desc + ); } [ @@ -2371,10 +2375,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetSurfaceLevel( [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface @@ -2400,10 +2400,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetCubeMapSurface( [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface @@ -2430,10 +2426,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetVolumeLevel( [in] UINT sub_resource_idx, [out] IWineD3DVolume **volume

1 0

Henri Verbeet : wined3d: Merge the various resource desc structures.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 756fdb7c5affaef02d058c388e15fe1ce183ee38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756fdb7c5affaef02d058c388… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:05 2011 +0100 wined3d: Merge the various resource desc structures. --- dlls/d3d8/buffer.c | 16 +++++++------- dlls/d3d8/cubetexture.c | 24 ++++++++++---------- dlls/d3d8/device.c | 19 ++++++++-------- dlls/d3d8/surface.c | 25 +++++++++++---------- dlls/d3d8/texture.c | 27 +++++++++++------------ dlls/d3d8/volume.c | 24 ++++++++++---------- dlls/d3d8/volumetexture.c | 27 ++++++++++++----------- dlls/d3d9/buffer.c | 16 +++++++------- dlls/d3d9/cubetexture.c | 26 ++++++++++++---------- dlls/d3d9/device.c | 17 +++++--------- dlls/d3d9/surface.c | 25 +++++++++++---------- dlls/d3d9/texture.c | 27 ++++++++++++----------- dlls/d3d9/volume.c | 23 ++++++++++--------- dlls/d3d9/volumetexture.c | 25 +++++++++++---------- dlls/ddraw/ddraw.c | 28 +++++------------------- dlls/ddraw/device.c | 12 +++++----- dlls/ddraw/surface.c | 2 +- dlls/ddraw/vertexbuffer.c | 12 +++++----- dlls/wined3d/buffer.c | 16 +++++++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface_base.c | 3 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 20 +++++++++-------- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 45 +++++++++++---------------------------- 27 files changed, 223 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756fdb7c5affaef02d058…

1 0

Jacek Caban : mshtml: Don' t assume that HTMLWindow_Create sets ret val before succeeding.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 1913ff3a42d2f26460cd39ac749435abfe9e3d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1913ff3a42d2f26460cd39ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 18:45:45 2011 +0100 mshtml: Don't assume that HTMLWindow_Create sets ret val before succeeding. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0d42d4f..6842b23 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2019,7 +2019,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc) return E_OUTOFMEMORY; - if(window == doc_obj->basedoc.window) + if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; nsIDOMHTMLDocument_AddRef(nsdoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a4fa1be..99d03b3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2247,7 +2247,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_init(&window->script_hosts); window->task_magic = get_task_target_magic(); - *ret = window; update_window_doc(window); list_init(&window->children); @@ -2260,6 +2259,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_add_tail(&parent->children, &window->sibling_entry); } + *ret = window; return S_OK; }

1 0

Juan Lang : kernel32: Add some parameter checking to FileTimeToDosDateTime.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 2ca58402e71b29aa06b4ef94b70ade8124ddd883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca58402e71b29aa06b4ef94b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 15:55:35 2011 -0800 kernel32: Add some parameter checking to FileTimeToDosDateTime. --- dlls/kernel32/tests/time.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 11 ++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 36dcbdf..b0d8a46 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -600,6 +600,43 @@ static void test_TzSpecificLocalTimeToSystemTime(void) } } +static void test_FileTimeToDosDateTime(void) +{ + FILETIME ft = { 0 }; + WORD fatdate, fattime; + BOOL ret; + + if (0) + { + /* Crashes */ + FileTimeToDosDateTime(NULL, NULL, NULL); + } + /* Parameter checking */ + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, NULL, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, &fatdate, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, NULL, &fattime); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, &fatdate, &fattime); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandle("kernel32"); @@ -612,4 +649,5 @@ START_TEST(time) test_FileTimeToSystemTime(); test_FileTimeToLocalFileTime(); test_TzSpecificLocalTimeToSystemTime(); + test_FileTimeToDosDateTime(); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 2b7bd6c..5dff796 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1000,9 +1000,18 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, time_t unixtime; struct tm* tm; + if (!fatdate || !fattime) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } li.u.LowPart = ft->dwLowDateTime; li.u.HighPart = ft->dwHighDateTime; - RtlTimeToSecondsSince1970( &li, &t ); + if (!RtlTimeToSecondsSince1970( &li, &t )) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } unixtime = t; tm = gmtime( &unixtime ); if (fattime)

1 0

Juan Lang : wininet: Implement FindNextUrlCacheEntryW.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: c4d628cb023b856629cda61f6bbb353bd6200ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d628cb023b856629cda61f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 11:22:43 2011 -0800 wininet: Implement FindNextUrlCacheEntryW. --- dlls/wininet/urlcache.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 100a103..431288f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3304,19 +3304,15 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, return pEntryHandle; } -/*********************************************************************** - * FindNextUrlCacheEntryA (WININET.@) - */ -BOOL WINAPI FindNextUrlCacheEntryA( +static BOOL FindNextUrlCacheEntryInternal( HANDLE hEnumHandle, LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, - LPDWORD lpdwNextCacheEntryInfoBufferSize) + LPDWORD lpdwNextCacheEntryInfoBufferSize, + BOOL unicode) { URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; URLCACHECONTAINER * pContainer; - TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -3354,8 +3350,10 @@ BOOL WINAPI FindNextUrlCacheEntryA( continue; pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); error = URLCache_CopyEntry( pContainer, @@ -3363,14 +3361,15 @@ BOOL WINAPI FindNextUrlCacheEntryA( lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize, pUrlEntry, - FALSE /* not UNICODE */); + unicode); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + TRACE("Local File Name: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */ @@ -3388,6 +3387,20 @@ BOOL WINAPI FindNextUrlCacheEntryA( } /*********************************************************************** + * FindNextUrlCacheEntryA (WININET.@) + */ +BOOL WINAPI FindNextUrlCacheEntryA( + HANDLE hEnumHandle, + LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, + LPDWORD lpdwNextCacheEntryInfoBufferSize) +{ + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, FALSE /* not UNICODE */); +} + +/*********************************************************************** * FindNextUrlCacheEntryW (WININET.@) */ BOOL WINAPI FindNextUrlCacheEntryW( @@ -3396,9 +3409,11 @@ BOOL WINAPI FindNextUrlCacheEntryW( LPDWORD lpdwNextCacheEntryInfoBufferSize ) { - FIXME("(%p, %p, %p) stub\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, + (LPINTERNET_CACHE_ENTRY_INFOA)lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, TRUE /* UNICODE */); } /***********************************************************************

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
85
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 March 2011