September 2011 - Wine-commits

André Hentschel : gdi32/tests: Add a test about non-uniform ramps.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 0644fd499f35d3c41e819bc2f08079426a7eb34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0644fd499f35d3c41e819bc2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 18 19:06:56 2011 +0200 gdi32/tests: Add a test about non-uniform ramps. --- dlls/gdi32/tests/dc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index efa7d53..9e2b3eb 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -761,6 +761,12 @@ static void test_gamma(void) ret = SetDeviceGammaRamp(hdc, &ramp); ok(!ret, "SetDeviceGammaRamp succeeded\n"); + /* try a ramp which is not uniform */ + ramp[0][0] = 0; + for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; + ret = SetDeviceGammaRamp(hdc, &ramp); + todo_wine ok(ret, "SetDeviceGammaRamp failed\n"); + /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); ok(ret, "SetDeviceGammaRamp failed\n");

1 0

André Hentschel : winex11: Multiply the error tolerance by the table caused error magnification.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 321224d2f680f2b78bf2f3e53d977a51d82d136a URL: http://source.winehq.org/git/wine.git/?a=commit;h=321224d2f680f2b78bf2f3e53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 18 19:07:33 2011 +0200 winex11: Multiply the error tolerance by the table caused error magnification. --- dlls/gdi32/tests/dc.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9e2b3eb..9420f78 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -765,7 +765,7 @@ static void test_gamma(void) ramp[0][0] = 0; for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; ret = SetDeviceGammaRamp(hdc, &ramp); - todo_wine ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp failed\n"); /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 2d8a4eb..1f13737 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -335,7 +335,7 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) return FALSE; } /* check that the gamma is reasonably uniform across the ramp */ - if (g_max - g_min > 0.1) { + if (g_max - g_min > 12.8) { ERR("ramp not uniform (max=%f, min=%f, avg=%f), rejected\n", g_max, g_min, g_avg); return FALSE; }

1 0

Francois Gouget : shdocvw: Make get_ieframe_instance() static.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 4c7e83f9d933b53308587b470ad2edfbe9b2538f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e83f9d933b53308587b470… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:36:45 2011 +0200 shdocvw: Make get_ieframe_instance() static. --- dlls/shdocvw/shdocvw.h | 1 - dlls/shdocvw/shdocvw_main.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 792c9bd..e741482 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -52,7 +52,6 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r extern HINSTANCE shdocvw_hinstance DECLSPEC_HIDDEN; -HINSTANCE get_ieframe_instance(void) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 2bfe3c9..88fe5ed 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -45,7 +45,7 @@ HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; -HINSTANCE get_ieframe_instance(void) +static HINSTANCE get_ieframe_instance(void) { static const WCHAR ieframe_dllW[] = {'i','e','f','r','a','m','e','.','d','l','l',0};

1 0

Francois Gouget : jscript/tests: Some tests require that the user interface be in English.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 405c3ef483f9661a2983c0c1bad76012c342f7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=405c3ef483f9661a2983c0c1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:38:18 2011 +0200 jscript/tests: Some tests require that the user interface be in English. --- dlls/jscript/tests/run.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fbbff96..3ad9600 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,6 +108,29 @@ static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -1145,8 +1168,8 @@ static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ok(excep.wCode == 0, "IActiveScriptError_GetExceptionInfo -- excep.wCode: expected 0, got 0x%08x\n", excep.wCode); ok(excep.wReserved == 0, "IActiveScriptError_GetExceptionInfo -- excep.wReserved: expected 0, got %d\n", excep.wReserved); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) - skip("Non-english locale (test with hardcoded strings)\n"); + if (!is_lang_english()) + skip("Non-english UI (test with hardcoded strings)\n"); else { ok(excep.bstrSource != NULL && !lstrcmpW(excep.bstrSource, script_source), "IActiveScriptError_GetExceptionInfo -- excep.bstrSource is not valid: expected %s, got %s\n",

1 0

Francois Gouget : kernel32/tests: Skip some tests if not allowed to modify the image file execution options.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 752bb66b654e69a87c56b52a352104eea265f790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752bb66b654e69a87c56b52a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:40:52 2011 +0200 kernel32/tests: Skip some tests if not allowed to modify the image file execution options. --- dlls/kernel32/tests/heap.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 26bc58f..634e14d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -724,6 +724,11 @@ static void test_debug_heap( const char *argv0, DWORD flags ) if (!strcmp( keyname + strlen(keyname) - 3, ".so" )) keyname[strlen(keyname) - 3] = 0; err = RegCreateKeyA( HKEY_LOCAL_MACHINE, keyname, &hkey ); + if (err == ERROR_ACCESS_DENIED) + { + skip("Not authorized to change the image file execution options\n"); + return; + } ok( !err, "failed to create '%s' error %u\n", keyname, err ); if (err) return;

1 0

Francois Gouget : ntdll/tests: Skip some tests if not allowed to modify image file execution options.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 344ef82b68411ac3115e5e1dcc2596fecfd9a5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344ef82b68411ac3115e5e1dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:41:27 2011 +0200 ntdll/tests: Skip some tests if not allowed to modify image file execution options. --- dlls/ntdll/tests/reg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 8f44a1d..5ca14eb 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1198,6 +1198,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, classes64W ); status = pNtCreateKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify the Classes key\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, classes32W );

1 0

Francois Gouget : quartz/tests: Skip some tests if not allowed to register filters.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: e5e2304427c2ea7dab662fdb39a109cac1060969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e2304427c2ea7dab662fdb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:42:15 2011 +0200 quartz/tests: Skip some tests if not allowed to register filters. --- dlls/quartz/tests/filtergraph.c | 59 +++++++------ dlls/quartz/tests/filtermapper.c | 177 ++++++++++++++++++++----------------- 2 files changed, 128 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5e2304427c2ea7dab662…

1 0

Francois Gouget : dinput: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ca8c1103af3ef4520893c69b9cb5e24bb853bfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8c1103af3ef4520893c69b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:44:01 2011 +0200 dinput: Fix printing NULL strings. --- dlls/dinput/dinput_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 028d901..373b990 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -883,7 +883,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( int i, j; - FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n"); X(DIEDBSFL_ATTACHEDONLY)

1 0

Francois Gouget : msi: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ff98afc450a1a881ab951a29662c8f1313dcc425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff98afc450a1a881ab951a296… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:49:55 2011 +0200 msi: Fix printing NULL strings. --- dlls/msi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d281098..de9c0ce 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -489,7 +489,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, awstring str; UINT r; - TRACE("%s %p %p\n", szFolder, debugstr_a(szPathBuf), pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(szFolder), debugstr_a(szPathBuf), pcchPathBuf); str.unicode = FALSE; str.str.a = szPathBuf;

1 0

Francois Gouget : d3dxof: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: cb6a8125a9b2acbc4085714a1f7c6bade2621125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6a8125a9b2acbc4085714a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:50:11 2011 +0200 d3dxof: Fix printing NULL strings. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b8f0f00..8678396 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -575,7 +575,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS { IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - TRACE("(%p/%p)->(%s,%p,%p)\n", This, iface, szMember, pcbSize, ppvData); + TRACE("(%p/%p)->(%s,%p,%p)\n", This, iface, debugstr_a(szMember), pcbSize, ppvData); if (!pcbSize || !ppvData) return DXFILEERR_BADVALUE;

1 0