wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Pierre Schweitzer : setupapi: Implement SetupOpenLog(), SetupCloseLog().
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 799dfa6ada18ee9bf748d5c55e1a4118396b05ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=799dfa6ada18ee9bf748d5c55… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Mar 25 21:12:35 2015 +0100 setupapi: Implement SetupOpenLog(), SetupCloseLog(). --- dlls/setupapi/misc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupcab.c | 1 + dlls/setupapi/stubs.c | 17 ----------- 3 files changed, 80 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 6bdb404..f294821 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -42,6 +42,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* arbitrary limit not related to what native actually uses */ #define OEM_INDEX_LIMIT 999 +/* Handles and critical sections for the SetupLog API */ +static HANDLE setupact = INVALID_HANDLE_VALUE; +static HANDLE setuperr = INVALID_HANDLE_VALUE; +static CRITICAL_SECTION setupapi_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &setupapi_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": setupapi_cs") } +}; +static CRITICAL_SECTION setupapi_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + /************************************************************************** * MyFree [SETUPAPI.@] * @@ -1600,3 +1612,70 @@ BOOL WINAPI SetupSetNonInteractiveMode( BOOL flag ) non_interactive_mode = flag; return ret; } + +/*********************************************************************** + * SetupCloseLog(SETUPAPI.@) + */ +void WINAPI SetupCloseLog(void) +{ + EnterCriticalSection(&setupapi_cs); + + CloseHandle(setupact); + setupact = INVALID_HANDLE_VALUE; + + CloseHandle(setuperr); + setuperr = INVALID_HANDLE_VALUE; + + LeaveCriticalSection(&setupapi_cs); +} + +/*********************************************************************** + * SetupOpenLog(SETUPAPI.@) + */ +BOOL WINAPI SetupOpenLog(BOOL reserved) +{ + WCHAR path[MAX_PATH]; + + static const WCHAR setupactlog[] = {'\\','s','e','t','u','p','a','c','t','.','l','o','g',0}; + static const WCHAR setuperrlog[] = {'\\','s','e','t','u','p','e','r','r','.','l','o','g',0}; + + EnterCriticalSection(&setupapi_cs); + + if (setupact != INVALID_HANDLE_VALUE && setuperr != INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&setupapi_cs); + return TRUE; + } + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, setupactlog); + + setupact = CreateFileW(path, FILE_GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (setupact == INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&setupapi_cs); + return FALSE; + } + + SetFilePointer(setupact, 0, NULL, FILE_END); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, setuperrlog); + + setuperr = CreateFileW(path, FILE_GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (setuperr == INVALID_HANDLE_VALUE) + { + CloseHandle(setupact); + setupact = INVALID_HANDLE_VALUE; + LeaveCriticalSection(&setupapi_cs); + return FALSE; + } + + SetFilePointer(setuperr, 0, NULL, FILE_END); + + LeaveCriticalSection(&setupapi_cs); + + return TRUE; +} diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 21336d7..54c0256 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -694,6 +694,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: if (lpvReserved) break; + SetupCloseLog(); if (CABINET_hInstance) FreeLibrary(CABINET_hInstance); break; } diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 673bbbf..66bd5d4 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -189,14 +189,6 @@ BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) } /*********************************************************************** - * SetupCloseLog(SETUPAPI.@) - */ -void WINAPI SetupCloseLog(void) -{ - FIXME("() stub\n"); -} - -/*********************************************************************** * SetupLogErrorW(SETUPAPI.@) */ BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) @@ -206,15 +198,6 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) } /*********************************************************************** - * SetupOpenLog(SETUPAPI.@) - */ -BOOL WINAPI SetupOpenLog(BOOL Reserved) -{ - FIXME("(%d) stub\n", Reserved); - return TRUE; -} - -/*********************************************************************** * SetupPromptReboot(SETUPAPI.@) */ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only )

1 0

Piotr Caban : msvcp90/tests: Use NAN and INFINITY definitions from port.h in Ctraits::_Isnan tests.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: d2751ebcd56f368bae71b6b824fb62b9768a7131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2751ebcd56f368bae71b6b82… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 26 11:32:05 2015 +0100 msvcp90/tests: Use NAN and INFINITY definitions from port.h in Ctraits::_Isnan tests. --- dlls/msvcp90/tests/misc.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index a4e07d7..d4e1f5a 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -27,6 +27,27 @@ #include <winbase.h> #include "wine/test.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline float __port_ind(void) +{ + static const unsigned __ind_bytes = 0xffc00000; + return *(const float *)&__ind_bytes; +} +#define IND __port_ind() + typedef double LDOUBLE; /* long double is just a double */ typedef struct { @@ -707,31 +728,34 @@ static void test_Ctraits_math_functions(void) ret = p_std_Ctraits_float__Isnan(0.0); ok(ret == FALSE, "ret = %d\n", ret); - ret = p_std_Ctraits_float__Isnan(0.0 / 0.0); - ok(ret == TRUE, "ret = %d\n", ret); - - ret = p_std_Ctraits_float__Isnan(1.0 / 0.0); + ret = p_std_Ctraits_float__Isnan(INFINITY); ok(ret == FALSE, "ret = %d\n", ret); - ret = p_std_Ctraits_float__Isnan(-1.0 / 0.0); + ret = p_std_Ctraits_float__Isnan(-INFINITY); ok(ret == FALSE, "ret = %d\n", ret); - ret = p_std_Ctraits_float__Isnan(log(-1.0)); + ret = p_std_Ctraits_float__Isnan(IND); ok(ret == TRUE, "ret = %d\n", ret); - ret = p_std_Ctraits_float__Isnan(sqrt(-1.0)); + ret = p_std_Ctraits_float__Isnan(NAN); ok(ret == TRUE, "ret = %d\n", ret); - ret = p_std_Ctraits_double__Isnan(3.14159 / 0.0); + ret = p_std_Ctraits_double__Isnan(INFINITY); ok(ret == FALSE, "ret = %d\n", ret); - ret = p_std_Ctraits_double__Isnan(log(-3.14159)); + ret = p_std_Ctraits_double__Isnan(IND); ok(ret == TRUE, "ret = %d\n", ret); - ret = p_std_Ctraits_long_double__Isnan(3.14159 / 0.0); + ret = p_std_Ctraits_double__Isnan(NAN); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_long_double__Isnan(INFINITY); ok(ret == FALSE, "ret = %d\n", ret); - ret = p_std_Ctraits_long_double__Isnan(sqrt(-3.14159)); + ret = p_std_Ctraits_long_double__Isnan(IND); + ok(ret == TRUE, "ret = %d\n", ret); + + ret = p_std_Ctraits_long_double__Isnan(NAN); ok(ret == TRUE, "ret = %d\n", ret); }

1 0

Nikolay Sivov : dwrite: Pass sideways run flag to shaping methods.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 93a21a8b57cd67d021ee2a73655f152c5e9010cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a21a8b57cd67d021ee2a736… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 13:23:43 2015 +0300 dwrite: Pass sideways run flag to shaping methods. --- dlls/dwrite/layout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7a43566..054aae7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -500,7 +500,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) while (1) { hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, run->descr.string, run->descr.stringLength, - run->run.fontFace, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, + run->run.fontFace, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL /* FIXME */, NULL, NULL, 0, max_count, run->clustermap, text_props, run->glyphs, glyph_props, &run->run.glyphCount); if (hr == E_NOT_SUFFICIENT_BUFFER) { @@ -540,12 +540,12 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, text_props, run->descr.stringLength, run->run.glyphIndices, glyph_props, run->run.glyphCount, run->run.fontFace, run->run.fontEmSize, layout->pixels_per_dip, &layout->transform, layout->use_gdi_natural, - FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL, NULL, 0, + run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL, NULL, 0, run->advances, run->offsets); else hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, text_props, run->descr.stringLength, run->run.glyphIndices, glyph_props, run->run.glyphCount, run->run.fontFace, - run->run.fontEmSize, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, + run->run.fontEmSize, run->run.isSideways, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL, NULL, 0, run->advances, run->offsets); heap_free(text_props);

1 0

Nikolay Sivov : po: Corrected Russian translation.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: f1b7e367eaea294f60e4ea82d27d152994cd577c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b7e367eaea294f60e4ea82d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 12:36:29 2015 +0300 po: Corrected Russian translation. --- po/ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ru.po b/po/ru.po index 9d312e9..14d8b4f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11513,7 +11513,7 @@ msgstr "Ошибка: неправильные параметры командн #: reg.rc:37 msgid "Error: Unable to access remote machine\n" -msgstr "Ошибка: нет удалось получить доступ к удалённому компьютеру\n" +msgstr "Ошибка: не удалось получить доступ к удалённому компьютеру\n" #: reg.rc:38 msgid ""

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetAntialiasMode().
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: cef9434cb2d30c23c29fe5238ad54e0ce7257cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef9434cb2d30c23c29fe5238… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:20 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetAntialiasMode(). --- dlls/d2d1/render_target.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index dd74a58..97d5607 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -841,9 +841,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1Render static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasMode(ID2D1RenderTarget *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p.\n", iface); - return D2D1_ANTIALIAS_MODE_PER_PRIMITIVE; + return render_target->antialias_mode; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetAntialiasMode().
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: b231013f03b54a0fc6e4cd7b56218d4d47857c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b231013f03b54a0fc6e4cd7b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:19 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetAntialiasMode(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e416197..e82d23c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -64,6 +64,7 @@ struct d2d_d3d_render_target ID3D10PixelShader *rect_solid_ps; ID3D10PixelShader *rect_bitmap_ps; + D2D1_ANTIALIAS_MODE antialias_mode; IDWriteRenderingParams *text_rendering_params; D2D1_SIZE_U pixel_size; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 80f9fea..dd74a58 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -832,7 +832,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarg static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, D2D1_ANTIALIAS_MODE antialias_mode) { - FIXME("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); + + render_target->antialias_mode = antialias_mode; } static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasMode(ID2D1RenderTarget *iface)

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTextRenderingParams().
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 845103c7ddb65a9e0baa24be8b12840835bc213e URL: http://source.winehq.org/git/wine.git/?a=commit;h=845103c7ddb65a9e0baa24be8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:18 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetTextRenderingParams(). --- dlls/d2d1/render_target.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 8eccc25..80f9fea 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -872,9 +872,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1 static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface, IDWriteRenderingParams **text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); - *text_rendering_params = NULL; + if ((*text_rendering_params = render_target->text_rendering_params)) + IDWriteRenderingParams_AddRef(*text_rendering_params); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2)

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTextRenderingParams().
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 060d2230fc5e3fcfe4fd061fd494021dcd304543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060d2230fc5e3fcfe4fd061fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:17 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetTextRenderingParams(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 18f26f0..e416197 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -64,6 +64,8 @@ struct d2d_d3d_render_target ID3D10PixelShader *rect_solid_ps; ID3D10PixelShader *rect_bitmap_ps; + IDWriteRenderingParams *text_rendering_params; + D2D1_SIZE_U pixel_size; D2D1_MATRIX_3X2_F transform; struct d2d_clip_stack clip_stack; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 15914ed..8eccc25 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -225,6 +225,8 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * if (!refcount) { d2d_clip_stack_cleanup(&render_target->clip_stack); + if (render_target->text_rendering_params) + IDWriteRenderingParams_Release(render_target->text_rendering_params); ID3D10PixelShader_Release(render_target->rect_bitmap_ps); ID3D10PixelShader_Release(render_target->rect_solid_ps); ID3D10BlendState_Release(render_target->bs); @@ -856,7 +858,15 @@ static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextA static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface, IDWriteRenderingParams *text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); + + if (text_rendering_params) + IDWriteRenderingParams_AddRef(text_rendering_params); + if (render_target->text_rendering_params) + IDWriteRenderingParams_Release(render_target->text_rendering_params); + render_target->text_rendering_params = text_rendering_params; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetFactory().
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 237a0ada00a0888c1068b532485ff5bc58df9980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237a0ada00a0888c1068b5324… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:16 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetFactory(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bbceb7f..18f26f0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -50,6 +50,7 @@ struct d2d_d3d_render_target IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; + ID2D1Factory *factory; ID3D10Device *device; ID3D10RenderTargetView *view; ID3D10StateBlock *stateblock; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 83b4dab..15914ed 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -235,6 +235,7 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * render_target->stateblock->lpVtbl->Release(render_target->stateblock); ID3D10RenderTargetView_Release(render_target->view); ID3D10Device_Release(render_target->device); + ID2D1Factory_Release(render_target->factory); HeapFree(GetProcessHeap(), 0, render_target); } @@ -243,9 +244,12 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + *factory = render_target->factory; + ID2D1Factory_AddRef(*factory); } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderTarget *iface, @@ -1361,10 +1365,13 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; + render_target->factory = factory; + ID2D1Factory_AddRef(render_target->factory); if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { WARN("Failed to get device interface, hr %#x.\n", hr); + ID2D1Factory_Release(render_target->factory); return hr; } @@ -1521,5 +1528,6 @@ err: ID3D10RenderTargetView_Release(render_target->view); if (render_target->device) ID3D10Device_Release(render_target->device); + ID2D1Factory_Release(render_target->factory); return hr; }

1 0

Zheng Chen : msvcrt: Fix _copysign bugs for NAN/INF.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 829e89318409d09701ba1d244e165685eb6dc830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829e89318409d09701ba1d244… Author: Zheng Chen <ChanChengCC(a)gmail.com> Date: Tue Mar 24 09:51:12 2015 +0000 msvcrt: Fix _copysign bugs for NAN/INF. --- dlls/msvcrt/math.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 73f01aa..0cd69da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -46,8 +46,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #endif #endif +/* FIXME: Does not work with -NAN and -0. */ #ifndef signbit -#define signbit(x) 0 +#define signbit(x) ((x) < 0) #endif typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); @@ -88,10 +89,9 @@ float CDECL MSVCRT__chgsignf( float num ) */ float CDECL MSVCRT__copysignf( float num, float sign ) { - /* FIXME: Behaviour for Nan/Inf? */ - if (sign < 0.0) - return num < 0.0 ? num : -num; - return num < 0.0 ? -num : num; + if (signbit(sign)) + return signbit(num) ? num : -num; + return signbit(num) ? -num : num; } /********************************************************************* @@ -1227,10 +1227,9 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask */ double CDECL MSVCRT__copysign(double num, double sign) { - /* FIXME: Behaviour for Nan/Inf? */ - if (sign < 0.0) - return num < 0.0 ? num : -num; - return num < 0.0 ? -num : num; + if (signbit(sign)) + return signbit(num) ? num : -num; + return signbit(num) ? -num : num; } /*********************************************************************

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
78
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 2015