wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Nikolay Sivov : hlink: Remove useless initializers.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 3e3027761c3de5654ea015dbc9bbaf90ac3f6cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3027761c3de5654ea015dbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 21:53:14 2013 +0400 hlink: Remove useless initializers. --- dlls/hlink/browse_ctx.c | 2 +- dlls/hlink/extserv.c | 2 +- dlls/hlink/hlink_main.c | 15 ++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 4e91398..0995493 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -116,7 +116,7 @@ static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, DWORD dwRegister) { - HRESULT r = S_OK; + HRESULT r; IRunningObjectTable *ROT; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 670bac2..3a97fa9 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -235,7 +235,7 @@ static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) { - int len = 0; + int len; heap_free(This->headers); This->headers = NULL; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1890fd5..5adbe9d 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -75,7 +75,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r = S_OK; + HRESULT r; TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, @@ -107,7 +107,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r = S_OK; + HRESULT r; WCHAR *hash, *tgt; const WCHAR *loc; @@ -176,15 +176,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) { - HRESULT r = S_OK; - TRACE("%p %s %p\n", piunkOuter, debugstr_guid(riid), ppvObj); - - r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); - - TRACE("returning %i\n",r); - - return r; + return CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); } /*********************************************************************** @@ -213,7 +206,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID) { - HRESULT r = S_OK; + HRESULT r; TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);

1 0

Nikolay Sivov : hlink: Implement HlinkUpdateStackItem().
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: c5a73badaddd5a09acaf3b71e695221de8f38d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a73badaddd5a09acaf3b71e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 11:03:35 2013 +0400 hlink: Implement HlinkUpdateStackItem(). --- dlls/hlink/hlink_main.c | 19 +++++++-- dlls/hlink/tests/hlink.c | 96 ++++++++++++++++++++++++++++++++++++++++++++- include/hlink.idl | 1 + 3 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 3bf9d27..1890fd5 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -366,12 +366,21 @@ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTra /*********************************************************************** * HlinkUpdateStackItem (HLINK.@) */ -HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, - ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc, + ULONG hlid, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) { - FIXME("(%p %p %u %p %s %s)\n", pihlframe, pihlbc, uHLID, pimkTrgt, debugstr_w(pwzLocation), - debugstr_w(pwzFriendlyName)); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p %p 0x%x %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + + if (!frame && !bc) return E_INVALIDARG; + + if (frame) + hr = IHlinkFrame_UpdateHlink(frame, hlid, target, location, friendly_name); + else + hr = IHlinkBrowseContext_UpdateHlink(bc, hlid, target, location, friendly_name); + + return hr; } /*********************************************************************** diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 544cc4a..91f7c4a 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -68,12 +68,15 @@ DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); DEFINE_EXPECT(HBC_GetObject); +DEFINE_EXPECT(HBC_UpdateHlink); DEFINE_EXPECT(HT_SetBrowseContext); DEFINE_EXPECT(HT_GetBrowseContext); DEFINE_EXPECT(HT_Navigate); DEFINE_EXPECT(HT_GetFriendlyName); +DEFINE_EXPECT(HLF_UpdateHlink); + DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); static const char *debugstr_guid(REFIID riid) @@ -885,10 +888,10 @@ static HRESULT WINAPI HlinkBrowseContext_OnNavigateHlink(IHlinkBrowseContext *if } static HRESULT WINAPI HlinkBrowseContext_UpdateHlink(IHlinkBrowseContext *iface, ULONG uHLID, - IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) + IMoniker *pimkTarget, LPCWSTR location, LPCWSTR friendly_name) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(HBC_UpdateHlink); + return S_OK; } static HRESULT WINAPI HlinkBrowseContext_EnumNavigationStack(IHlinkBrowseContext *iface, @@ -2194,6 +2197,92 @@ static void test_Hlink_Navigate(void) _bctx = NULL; } +static HRESULT WINAPI hlinkframe_QueryInterface(IHlinkFrame *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IHlinkFrame)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI hlinkframe_AddRef(IHlinkFrame *iface) +{ + return 2; +} + +static ULONG WINAPI hlinkframe_Release(IHlinkFrame *iface) +{ + return 1; +} + +static HRESULT WINAPI hlinkframe_SetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext *bc) +{ + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_GetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext **bc) +{ + *bc = NULL; + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *bsc, IHlink *navigate) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name, + DWORD reserved) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) +{ + CHECK_EXPECT(HLF_UpdateHlink); + return S_OK; +} + +static IHlinkFrameVtbl hlinkframevtbl = { + hlinkframe_QueryInterface, + hlinkframe_AddRef, + hlinkframe_Release, + hlinkframe_SetBrowseContext, + hlinkframe_GetBrowseContext, + hlinkframe_Navigate, + hlinkframe_OnNavigate, + hlinkframe_UpdateHlink +}; + +static IHlinkFrame testframe = { &hlinkframevtbl }; + +static void test_HlinkUpdateStackItem(void) +{ + static const WCHAR location[] = {'l','o','c','a','t','i','o','n',0}; + HRESULT hr; + + hr = HlinkUpdateStackItem(NULL, NULL, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + SET_EXPECT(HBC_UpdateHlink); + hr = HlinkUpdateStackItem(NULL, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HBC_UpdateHlink); + + SET_EXPECT(HLF_UpdateHlink); + hr = HlinkUpdateStackItem(&testframe, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HLF_UpdateHlink); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2213,6 +2302,7 @@ START_TEST(hlink) test_HlinkClone(); test_StdHlink(); test_Hlink_Navigate(); + test_HlinkUpdateStackItem(); CoUninitialize(); } diff --git a/include/hlink.idl b/include/hlink.idl index af3f8f5..e735987 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -37,6 +37,7 @@ cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);") cpp_quote("HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER,DWORD,LPBC,ULONG,FORMATETC*,IBindStatusCallback*,LPMONIKER);") +cpp_quote("HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame*, IHlinkBrowseContext*, ULONG, IMoniker*, LPCWSTR, LPCWSTR);") typedef enum _HLSR_NOREDEF10 { HLSR_HOME,

1 0

Nikolay Sivov : xmllite: Partially implement value normalization for CDATA sections.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 2bdaffd879439a04827a8ffae6496d76fefcbfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdaffd879439a04827a8ffae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 24 00:04:12 2013 +0400 xmllite: Partially implement value normalization for CDATA sections. --- dlls/xmllite/reader.c | 6 ++++++ dlls/xmllite/tests/reader.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e8f97f0..3d0b4a8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1835,6 +1835,12 @@ static HRESULT reader_parse_cdata(xmlreader *reader) } else { + /* Value normalization is not fully implemented, rules are: + + - single '\r' -> '\n'; + - sequence '\r\n' -> '\n', in this case value length changes; + */ + if (*ptr == '\r') *ptr = '\n'; reader_skipn(reader, 1); ptr++; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 520ce71..fad3d41 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -771,6 +771,7 @@ struct test_entry { const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ + int todo : 1; }; static struct test_entry comment_tests[] = { @@ -1317,6 +1318,9 @@ static void test_readvaluechunk(void) static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } }; @@ -1383,9 +1387,20 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + if (test->todo) + { + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + } + else + { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } free_str(str_exp); }

1 0

Nikolay Sivov : msxml3: Embed user/password in uri used to create a moniker .
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 448e939ebe3faeec2f837b1c44a14c58e8ba93c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448e939ebe3faeec2f837b1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 12:44:44 2013 +0400 msxml3: Embed user/password in uri used to create a moniker. --- dlls/msxml3/httprequest.c | 61 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c67177b..681ccab 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -619,8 +619,27 @@ static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, HWND *hwnd, LPWSTR *username, LPWSTR *password) { BindStatusCallback *This = impl_from_IAuthenticate(iface); - FIXME("(%p)->(%p %p %p)\n", This, hwnd, username, password); - return E_NOTIMPL; + httprequest *request = This->request; + + TRACE("(%p)->(%p %p %p)\n", This, hwnd, username, password); + + if (request->user && *request->user) + { + if (hwnd) *hwnd = NULL; + *username = CoTaskMemAlloc(SysStringByteLen(request->user)+sizeof(WCHAR)); + *password = CoTaskMemAlloc(SysStringByteLen(request->password)+sizeof(WCHAR)); + if (!*username || !*password) + { + CoTaskMemFree(*username); + CoTaskMemFree(*password); + return E_OUTOFMEMORY; + } + + memcpy(*username, request->user, SysStringByteLen(request->user)+sizeof(WCHAR)); + memcpy(*password, request->password, SysStringByteLen(request->password)+sizeof(WCHAR)); + } + + return S_OK; } static const IAuthenticateVtbl AuthenticateVtbl = { @@ -882,12 +901,6 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, return hr; } - This->uri = uri; - - VariantInit(&is_async); - hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); - This->async = hr == S_OK && V_BOOL(&is_async); - VariantInit(&str); hr = VariantChangeType(&str, &user, 0, VT_BSTR); if (hr == S_OK) @@ -898,6 +911,38 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, if (hr == S_OK) This->password = V_BSTR(&str); + /* add authentication info */ + if (This->user && *This->user) + { + IUriBuilder *builder; + + hr = CreateIUriBuilder(uri, 0, 0, &builder); + if (hr == S_OK) + { + IUri *full_uri; + + IUriBuilder_SetUserName(builder, This->user); + IUriBuilder_SetPassword(builder, This->password); + hr = IUriBuilder_CreateUri(builder, -1, 0, 0, &full_uri); + if (hr == S_OK) + { + IUri_Release(uri); + uri = full_uri; + } + else + WARN("failed to create modified uri, 0x%08x\n", hr); + IUriBuilder_Release(builder); + } + else + WARN("IUriBuilder creation failed, 0x%08x\n", hr); + } + + This->uri = uri; + + VariantInit(&is_async); + hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); + This->async = hr == S_OK && V_BOOL(&is_async); + httprequest_setreadystate(This, READYSTATE_LOADING); return S_OK;

1 0

Daniel Jelinski : wined3d: Add NVidia GeForce 315M.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: d8a86da66eae4245b529ac042d76179fdf221b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a86da66eae4245b529ac042… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 17 16:57:49 2013 +0100 wined3d: Add NVidia GeForce 315M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4093f7a..60a4b2d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1097,6 +1097,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1559,6 +1560,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 325M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ {"GT 320M", CARD_NVIDIA_GEFORCE_GT320M}, /* Geforce 300 - midend mobile */ {"320M", CARD_NVIDIA_GEFORCE_320M}, /* Geforce 300 - midend mobile */ + {"315M", CARD_NVIDIA_GEFORCE_315M}, /* Geforce 300 - midend mobile */ {"GTX 295", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 285", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b81e018..e9a593d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1392,6 +1392,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_315M = 0x0a7a, CARD_NVIDIA_GEFORCE_320M = 0x08a3, CARD_NVIDIA_GEFORCE_GT320M = 0x0a2d, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35,

1 0

Ken Thomases : winemac: Implement GetDeviceGammaRamp() and SetDeviceGammaRamp().
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: e633f79f610516e78f7958b2946cb96bac327fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e633f79f610516e78f7958b29… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:41:07 2013 -0500 winemac: Implement GetDeviceGammaRamp() and SetDeviceGammaRamp(). --- dlls/winemac.drv/display.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/gdi.c | 4 +- dlls/winemac.drv/macdrv.h | 2 + 3 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f152cc8..85c903d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -24,6 +24,7 @@ #include "macdrv.h" #include "winuser.h" #include "winreg.h" +#include "ddrawi.h" WINE_DEFAULT_DEBUG_CHANNEL(display); @@ -599,6 +600,91 @@ failed: /*********************************************************************** + * GetDeviceGammaRamp (MACDRV.@) + */ +BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +{ + BOOL ret = FALSE; + DDGAMMARAMP *r = ramp; + struct macdrv_display *displays; + int num_displays; + uint32_t mac_entries; + int win_entries = sizeof(r->red) / sizeof(r->red[0]); + CGGammaValue *red, *green, *blue; + CGError err; + int win_entry; + + TRACE("dev %p ramp %p\n", dev, ramp); + + if (macdrv_get_displays(&displays, &num_displays)) + { + WARN("failed to get Mac displays\n"); + return FALSE; + } + + mac_entries = CGDisplayGammaTableCapacity(displays[0].displayID); + red = HeapAlloc(GetProcessHeap(), 0, mac_entries * sizeof(red[0]) * 3); + if (!red) + goto done; + green = red + mac_entries; + blue = green + mac_entries; + + err = CGGetDisplayTransferByTable(displays[0].displayID, mac_entries, red, green, + blue, &mac_entries); + if (err != kCGErrorSuccess) + { + WARN("failed to get Mac gamma table: %d\n", err); + goto done; + } + + if (mac_entries == win_entries) + { + for (win_entry = 0; win_entry < win_entries; win_entry++) + { + r->red[win_entry] = red[win_entry] * 65535 + 0.5; + r->green[win_entry] = green[win_entry] * 65535 + 0.5; + r->blue[win_entry] = blue[win_entry] * 65535 + 0.5; + } + } + else + { + for (win_entry = 0; win_entry < win_entries; win_entry++) + { + double mac_pos = win_entry * (mac_entries - 1) / (double)(win_entries - 1); + int mac_entry = mac_pos; + double red_value, green_value, blue_value; + + if (mac_entry == mac_entries - 1) + { + red_value = red[mac_entry]; + green_value = green[mac_entry]; + blue_value = blue[mac_entry]; + } + else + { + double distance = mac_pos - mac_entry; + + red_value = red[mac_entry] * (1 - distance) + red[mac_entry + 1] * distance; + green_value = green[mac_entry] * (1 - distance) + green[mac_entry + 1] * distance; + blue_value = blue[mac_entry] * (1 - distance) + blue[mac_entry + 1] * distance; + } + + r->red[win_entry] = red_value * 65535 + 0.5; + r->green[win_entry] = green_value * 65535 + 0.5; + r->blue[win_entry] = blue_value * 65535 + 0.5; + } + } + + ret = TRUE; + +done: + HeapFree(GetProcessHeap(), 0, red); + macdrv_free_displays(displays); + return ret; +} + + +/*********************************************************************** * GetMonitorInfo (MACDRV.@) */ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) @@ -650,6 +736,51 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) /*********************************************************************** + * SetDeviceGammaRamp (MACDRV.@) + */ +BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +{ + DDGAMMARAMP *r = ramp; + struct macdrv_display *displays; + int num_displays; + int win_entries = sizeof(r->red) / sizeof(r->red[0]); + CGGammaValue *red, *green, *blue; + int i; + CGError err = kCGErrorFailure; + + TRACE("dev %p ramp %p\n", dev, ramp); + + if (macdrv_get_displays(&displays, &num_displays)) + { + WARN("failed to get Mac displays\n"); + return FALSE; + } + + red = HeapAlloc(GetProcessHeap(), 0, win_entries * sizeof(red[0]) * 3); + if (!red) + goto done; + green = red + win_entries; + blue = green + win_entries; + + for (i = 0; i < win_entries; i++) + { + red[i] = r->red[i] / 65535.0; + green[i] = r->green[i] / 65535.0; + blue[i] = r->blue[i] / 65535.0; + } + + err = CGSetDisplayTransferByTable(displays[0].displayID, win_entries, red, green, blue); + if (err != kCGErrorSuccess) + WARN("failed to set display gamma table: %d\n", err); + +done: + HeapFree(GetProcessHeap(), 0, red); + macdrv_free_displays(displays); + return (err == kCGErrorSuccess); +} + + +/*********************************************************************** * macdrv_displays_changed * * Handler for DISPLAYS_CHANGED events. diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 2a9a019..e05f9ab 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -461,7 +461,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ macdrv_GetDeviceCaps, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ + macdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontUnicodeRanges */ NULL, /* pGetGlyphIndices */ @@ -522,7 +522,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pSetDCPenColor */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ + macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d4cbe1d..aeeee2d 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -71,6 +71,8 @@ static inline const char *wine_dbgstr_cgrect(CGRect cgrect) extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; extern void macdrv_reset_device_metrics(void) DECLSPEC_HIDDEN; +extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; +extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; /**************************************************************************

1 0

Carlo Bramini : inetcpl.cpl: Minor fix, remove useless code.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: fd7f0517c79af5c60e52182cf12a6390264ad009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f0517c79af5c60e52182cf… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Mar 16 19:53:40 2013 +0100 inetcpl.cpl: Minor fix, remove useless code. --- dlls/inetcpl.cpl/security.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 8f46b79..48c4876 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -134,8 +134,7 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - len = lstrlenW(name); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); TRACE("new title: %s\n", debugstr_w(name));

1 0

Francois Gouget : testbot/TestAgent: Optimize GetVersion().
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: f6535406115e2e158b032acd7e8fde55c1264f1a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6535406115e2e158b032acd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:14:41 2013 +0100 testbot/TestAgent: Optimize GetVersion(). To get the server version we just need to connect, we don't need to send a full RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 4aaaea0..f542991 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -987,8 +987,8 @@ sub GetVersion($) if (!$self->{agentversion}) { - # Force a connection - $self->Ping(); + # Retrieve the server version + $self->_Connect(); } # And return the version we got. # If the connection failed it will be undef as expected.

1 0

Francois Gouget : testbot/TestAgent: Fix Wait() to not depend on other RPCs to retrieve the server version.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: 6032b11f0b005fcd489445ff0f66ef7b4e67ca3f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6032b11f0b005fcd489445ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:14:12 2013 +0100 testbot/TestAgent: Fix Wait() to not depend on other RPCs to retrieve the server version. --- testbot/lib/WineTestBot/TestAgent.pm | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index bce1a78..4aaaea0 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1107,6 +1107,9 @@ sub Wait($$$) # Add 1 second for the reply to come back my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); + # Make sure we have the server version + return undef if (!$self->{agentversion} and !$self->_Connect()); + # Send the command if ($self->{agentversion} =~ / 1\.0$/) {

1 0

Francois Gouget : testbot/testagentd: Fix the zero / infinite timeouts in the wait2 RPC.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: 6c6aa897db13a20ca4bd8c93b8f44361916d0dae URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c6aa897db13a20ca4bd8c93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:12:53 2013 +0100 testbot/testagentd: Fix the zero / infinite timeouts in the wait2 RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/platform.h | 2 ++ testbot/src/testagentd/platform_unix.c | 6 +++--- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 645a18c..bce1a78 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1122,7 +1122,7 @@ sub Wait($$$) if (!$self->_StartRPC($RPC_WAIT2) or !$self->_SendListSize(2) or !$self->_SendUInt64($Pid) or - !$self->_SendUInt32($Timeout)) + !$self->_SendUInt32(defined $Timeout ? $Timeout : 0xffffffff)) { return undef; } diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 621ce98..fffaa4b 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -64,6 +64,8 @@ enum run_flags_t { RUN_DNTRUNC_ERR = 4, }; +#define RUN_NOTIMEOUT ((uint32_t)0xffffffff) + /* Starts the specified command in the background and reports the status to * the client. */ diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 48eef73..e003135 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -154,7 +154,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return 0; } - if (timeout) + if (timeout != RUN_NOTIMEOUT) deadline = time(NULL) + timeout; while (!child->reaped) { @@ -170,14 +170,14 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child debug("Waiting for " U64FMT "\n", pid); FD_ZERO(&rfds); FD_SET(client, &rfds); - if (timeout) + if (timeout != RUN_NOTIMEOUT) { tv.tv_sec = deadline - time(NULL); if (tv.tv_sec < 0) tv.tv_sec = 0; tv.tv_usec = 0; } - ready = select(client+1, &rfds, NULL, NULL, timeout ? &tv : NULL); + ready = select(client+1, &rfds, NULL, NULL, timeout != RUN_NOTIMEOUT ? &tv : NULL); if (ready == 0) { /* This is the timeout */ diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 92fc9aa..a0dccfa 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -177,7 +177,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child handles[0] = WSACreateEvent(); WSAEventSelect(client, handles[0], FD_CLOSE); handles[1] = child->handle; - r = WaitForMultipleObjects(2, handles, FALSE, timeout * 1000); + r = WaitForMultipleObjects(2, handles, FALSE, timeout == RUN_NOTIMEOUT ? INFINITE : timeout * 1000); success = 0; switch (r) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 534495d..75782c4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -34,8 +34,9 @@ * 1.0: Initial release. * 1.1: Added the wait2 RPC. * 1.2: Add more redirection options to the run RPC. + * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. */ -#define PROTOCOL_VERSION "testagentd 1.2" +#define PROTOCOL_VERSION "testagentd 1.3" #define BLOCK_SIZE 65536

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
54
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 2013