March 2015 - Wine-Commits - list.winehq.org

Francois Gouget : windowscodecs: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 0d80651e95b8f6a5a20adfe5aaec15f1167d9a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d80651e95b8f6a5a20adfe5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:53 2015 +0100 windowscodecs: Remove unneeded NONAMELESSXXX directives. --- dlls/windowscodecs/proxy.c | 1 - dlls/windowscodecs/regsvr.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 38f076f..10d34e3 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -23,7 +23,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 91df294..28469c7 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h> #include <string.h>

1 0

Pierre Schweitzer : setupapi/tests: Add tests for the SetupOpenLog(), SetupLogErrorA(), SetupCloseLog() functions.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: a1edebefdf47cab4effa0324c0d4ea2218b031c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1edebefdf47cab4effa0324c… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Mar 25 21:25:40 2015 +0100 setupapi/tests: Add tests for the SetupOpenLog(), SetupLogErrorA(), SetupCloseLog() functions. --- dlls/setupapi/tests/misc.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index cfe888b..7423738 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -776,6 +776,39 @@ static void test_defaultcallback(void) SetupTermDefaultQueueCallback(ctxt); } +static void test_SetupLogError(void) +{ + BOOL ret; + DWORD error; + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA("Test without opening\r\n", LogSevInformation); + error = GetLastError(); + ok(!ret, "SetupLogError succeeded\n"); + ok(error == ERROR_FILE_INVALID, "got wrong error: %d\n", error); + + ret = SetupOpenLog(FALSE); + ok(ret, "SetupOpenLog failed\n"); + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA("Test with wrong log severity\r\n", LogSevMaximum); + error = GetLastError(); + ok(!ret, "SetupLogError succeeded\n"); + ok(error == 0xdeadbeef, "got wrong error: %d\n", error); + ret = SetupLogErrorA("Test without EOL", LogSevInformation); + ok(ret, "SetupLogError failed\n"); + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA(NULL, LogSevInformation); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER /* Win Vista+ */), + "SetupLogError failed: %08x\n", GetLastError()); + + ret = SetupOpenLog(FALSE); + ok(ret, "SetupOpenLog failed\n"); + + SetupCloseLog(); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -807,4 +840,6 @@ START_TEST(misc) win_skip("SetupUninstallOEMInfA is not available\n"); test_defaultcallback(); + + test_SetupLogError(); }

1 0

Piotr Caban : msvcp90/tests: Use NAN and INFINITY definitions from port.h in Ctraits::_Isnan tests.
by Alexandre Julliard March 26, 2015

March 26, 2015

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 March 26, 2015

March 26, 2015

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

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetAntialiasMode().
by Alexandre Julliard March 26, 2015

March 26, 2015

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

Francois Gouget : oleaut32: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: deb988e52aad39e4c065a2fdfb47afd31a370d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb988e52aad39e4c065a2fdf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:13 2015 +0100 oleaut32: Mark internal symbols with hidden visibility. --- dlls/oleaut32/variant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index e5d9a56..9436cb3 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -114,7 +114,7 @@ typedef struct tagVARIANT_NUMBER_CHARS WCHAR cCurrencyDigitSeparator; } VARIANT_NUMBER_CHARS; -unsigned int get_type_size(ULONG*, VARTYPE); +unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *,

1 0

Francois Gouget : mshtml: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 45f5e5d74686364eb3cf6e9d0dd79102a6d95ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f5e5d74686364eb3cf6e9d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:04 2015 +0100 mshtml: Mark internal symbols with hidden visibility. --- dlls/mshtml/mshtml_private.h | 16 ++++++++-------- dlls/mshtml/pluginhost.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6d39a72..22b8397 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -268,12 +268,12 @@ typedef struct { DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); -nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*); -nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*); -void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt); -void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*); -void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*); -void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); +nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; +nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; +void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; +void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; +void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; +void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; @@ -699,9 +699,9 @@ typedef struct { IHTMLElement3_tid, \ IHTMLElement4_tid -extern cp_static_data_t HTMLElementEvents2_data; +extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} -extern const cpc_entry_t HTMLElement_cpc[]; +extern const cpc_entry_t HTMLElement_cpc[] DECLSPEC_HIDDEN; typedef struct { HTMLElement element; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 46a1535..0460c3c 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -72,5 +72,5 @@ HRESULT create_ip_frame(IOleInPlaceFrame**) DECLSPEC_HIDDEN; HRESULT get_plugin_disp(HTMLPluginContainer*,IDispatch**) DECLSPEC_HIDDEN; HRESULT get_plugin_dispid(HTMLPluginContainer*,WCHAR*,DISPID*) DECLSPEC_HIDDEN; HRESULT invoke_plugin_prop(HTMLPluginContainer*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*) DECLSPEC_HIDDEN; -void notif_container_change(HTMLPluginContainer*,DISPID); +void notif_container_change(HTMLPluginContainer*,DISPID) DECLSPEC_HIDDEN; void bind_activex_event(HTMLDocumentNode*,HTMLPluginContainer*,WCHAR*,IDispatch*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : urlmon: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 16960a425f9a40e62a9e02477bbe77ede217b77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16960a425f9a40e62a9e02477… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:22 2015 +0100 urlmon: Remove unneeded NONAMELESSXXX directives. Also put them in the files that need them. --- dlls/urlmon/binding.c | 2 ++ dlls/urlmon/http.c | 2 ++ dlls/urlmon/tests/sec_mgr.c | 1 - dlls/urlmon/urlmon_main.c | 2 ++ dlls/urlmon/urlmon_main.h | 2 -- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 306e9b3..9b78582 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "winreg.h" #include "shlwapi.h" diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 16e5fad..b0c7d2a 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "wininet.h" diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e41f0b6..4092842 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -20,7 +20,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION /* needed for IInternetZoneManagerEx2 */ #define _WIN32_IE 0x0700 diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 1204a62..c4f1cec 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "urlmon_main.h" #include "winreg.h" diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 12be0ed..fd13279 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -23,8 +23,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Pierre Schweitzer : setupapi: Implement SetupOpenLog(), SetupCloseLog().
by Alexandre Julliard March 26, 2015

March 26, 2015

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

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetAntialiasMode().
by Alexandre Julliard March 26, 2015

March 26, 2015

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