October 2009 - Wine-Commits

Michael Stefaniuc : server: A signed 1-bit bitfield doesn't make much sense ; use unsigned.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 0eed4405de418405b43c2b56c92689cd2e2763a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eed4405de418405b43c2b56c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 1 00:22:55 2009 +0200 server: A signed 1-bit bitfield doesn't make much sense; use unsigned. --- server/fd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index d2da624..72ebcfe 100644 --- a/server/fd.c +++ b/server/fd.c @@ -192,8 +192,8 @@ struct fd unsigned int sharing; /* file sharing mode */ int unix_fd; /* unix file descriptor */ unsigned int no_fd_status;/* status to return when unix_fd is -1 */ - int signaled :1; /* is the fd signaled? */ - int fs_locks :1; /* can we use filesystem locks for this fd? */ + unsigned int signaled :1; /* is the fd signaled? */ + unsigned int fs_locks :1; /* can we use filesystem locks for this fd? */ int poll_index; /* index of fd in poll array */ struct async_queue *read_q; /* async readers of this fd */ struct async_queue *write_q; /* async writers of this fd */

1 0

Jacek Caban : mshtml: Added QueryCustomPolicy implementation.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 81079eb221782dbfb16d21453cc0e892f2b1ea3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079eb221782dbfb16d21453… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:01:17 2009 +0200 mshtml: Added QueryCustomPolicy implementation. --- dlls/mshtml/secmgr.c | 82 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/script.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 171 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index c9b1e46..be56e5d 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "objsafe.h" +#include "activscp.h" #include "wine/debug.h" @@ -36,6 +38,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + #define HOSTSECMGR_THIS(iface) DEFINE_THIS(HTMLDocumentNode, IInternetHostSecurityManager, iface) static HRESULT WINAPI InternetHostSecurityManager_QueryInterface(IInternetHostSecurityManager *iface, REFIID riid, void **ppv) @@ -78,12 +84,84 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost pContext, cbContext, dwFlags, dwReserved); } +static DWORD confirm_safety(HTMLDocumentNode *This, const WCHAR *url, IUnknown *obj) +{ + DWORD policy, enabled_opts, supported_opts; + IObjectSafety *obj_safety; + HRESULT hres; + + /* FIXME: Check URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY */ + + hres = IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, + (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return URLPOLICY_DISALLOW; + + hres = IUnknown_QueryInterface(obj, &IID_IObjectSafety, (void**)&obj_safety); + if(FAILED(hres)) + return URLPOLICY_DISALLOW; + + hres = IObjectSafety_GetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, &supported_opts, &enabled_opts); + if(SUCCEEDED(hres)) { + enabled_opts = INTERFACESAFE_FOR_UNTRUSTED_CALLER; + if(supported_opts & INTERFACE_USES_SECURITY_MANAGER) + enabled_opts |= INTERFACE_USES_SECURITY_MANAGER; + hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, enabled_opts, enabled_opts); + } + IObjectSafety_Release(obj_safety); + if(FAILED(hres)) + return URLPOLICY_DISALLOW; + + return URLPOLICY_ALLOW; +} + static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, BYTE **ppPolicy, DWORD *pcbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwReserved) { HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); - FIXME("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); - return E_NOTIMPL; + const WCHAR *url; + HRESULT hres; + + TRACE("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + + url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + + hres = IInternetSecurityManager_QueryCustomPolicy(This->secmgr, url, guidKey, ppPolicy, pcbPolicy, + pContext, cbContext, dwReserved); + if(hres != HRESULT_FROM_WIN32(ERROR_NOT_FOUND)) + return hres; + + if(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey)) { + IActiveScript *active_script; + struct CONFIRMSAFETY *cs; + DWORD policy; + + if(cbContext != sizeof(struct CONFIRMSAFETY)) { + FIXME("wrong context size\n"); + return E_FAIL; + } + + cs = (struct CONFIRMSAFETY*)pContext; + hres = IUnknown_QueryInterface(cs->pUnk, &IID_IActiveScript, (void**)&active_script); + if(SUCCEEDED(hres)) { + FIXME("Got IAciveScript iface\n"); + IActiveScript_Release(active_script); + return E_FAIL; + } + + policy = confirm_safety(This, url, cs->pUnk); + + *ppPolicy = CoTaskMemAlloc(sizeof(policy)); + if(!*ppPolicy) + return E_OUTOFMEMORY; + + *(DWORD*)*ppPolicy = policy; + *pcbPolicy = sizeof(policy); + return S_OK; + } + + FIXME("Unknown guidKey %s\n", debugstr_guid(guidKey)); + return hres; } #undef HOSTSECMGR_THIS diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 89b076c..5f59ea4 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -37,6 +37,10 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + #ifdef _WIN64 #define CTXARG_T DWORDLONG @@ -110,6 +114,10 @@ DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); DEFINE_EXPECT(script_testprop_d); DEFINE_EXPECT(script_testprop_i); +DEFINE_EXPECT(AXQueryInterface_IActiveScript); +DEFINE_EXPECT(AXQueryInterface_IObjectSafety); +DEFINE_EXPECT(AXGetInterfaceSafetyOptions); +DEFINE_EXPECT(AXSetInterfaceSafetyOptions); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -519,7 +527,7 @@ static SCRIPTSTATE state; static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { *ppv = NULL; - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -573,11 +581,72 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { static IObjectSafety ObjectSafety = { &ObjectSafetyVtbl }; +static HRESULT WINAPI AXObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IActiveScript, riid)) { + CHECK_EXPECT(AXQueryInterface_IActiveScript); + return E_NOINTERFACE; + } + + if(IsEqualGUID(&IID_IObjectSafety, riid)) { + CHECK_EXPECT(AXQueryInterface_IObjectSafety); + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI AXObjectSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + CHECK_EXPECT(AXGetInterfaceSafetyOptions); + + ok(IsEqualGUID(&IID_IDispatchEx, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(pdwSupportedOptions != NULL, "pdwSupportedOptions == NULL\n"); + ok(pdwEnabledOptions != NULL, "pdwEnabledOptions == NULL\n"); + + *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER; + *pdwEnabledOptions = INTERFACE_USES_DISPEX; + + return S_OK; +} + +static HRESULT WINAPI AXObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + CHECK_EXPECT(AXSetInterfaceSafetyOptions); + + ok(IsEqualGUID(&IID_IDispatchEx, riid), "unexpected riid %s\n", debugstr_guid(riid)); + + ok(dwOptionSetMask == (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACE_USES_SECURITY_MANAGER), + "dwOptionSetMask=%x\n", dwOptionSetMask); + ok(dwEnabledOptions == (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACE_USES_SECURITY_MANAGER), + "dwEnabledOptions=%x\n", dwOptionSetMask); + + return S_OK; +} + +static const IObjectSafetyVtbl AXObjectSafetyVtbl = { + AXObjectSafety_QueryInterface, + ObjectSafety_AddRef, + ObjectSafety_Release, + AXObjectSafety_GetInterfaceSafetyOptions, + AXObjectSafety_SetInterfaceSafetyOptions +}; + +static IObjectSafety AXObjectSafety = { &AXObjectSafetyVtbl }; + static void test_security(void) { IInternetHostSecurityManager *sec_mgr; IServiceProvider *sp; - DWORD policy; + DWORD policy, policy_size; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); @@ -593,6 +662,26 @@ static void test_security(void) ok(hres == S_OK, "ProcessUrlAction failed: %08x\n", hres); ok(policy == URLPOLICY_ALLOW, "policy = %x\n", policy); + cs.clsid = CLSID_TestActiveX; + cs.pUnk = (IUnknown*)&AXObjectSafety; + cs.dwFlags = 0; + + SET_EXPECT(AXQueryInterface_IActiveScript); + SET_EXPECT(AXQueryInterface_IObjectSafety); + SET_EXPECT(AXGetInterfaceSafetyOptions); + SET_EXPECT(AXSetInterfaceSafetyOptions); + hres = IInternetHostSecurityManager_QueryCustomPolicy(sec_mgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + CHECK_CALLED(AXQueryInterface_IActiveScript); + CHECK_CALLED(AXQueryInterface_IObjectSafety); + CHECK_CALLED(AXGetInterfaceSafetyOptions); + CHECK_CALLED(AXSetInterfaceSafetyOptions); + + ok(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); + ok(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); + ok(*(DWORD*)ppolicy == URLPOLICY_ALLOW, "policy = %x\n", *(DWORD*)ppolicy); + CoTaskMemFree(ppolicy); + IInternetHostSecurityManager_Release(sec_mgr); }

1 0

Jacek Caban : urlmon: Improve QueryCustomPolicy stub.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: e41d6eb94d4d4737a7d7b04258c5357352881da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41d6eb94d4d4737a7d7b0425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:00:33 2009 +0200 urlmon: Improve QueryCustomPolicy stub. --- dlls/urlmon/sec_mgr.c | 4 ++-- dlls/urlmon/tests/sec_mgr.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 173fad7..b3d468d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -590,8 +590,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + WARN("Unknown guidKey %s\n", debugstr_guid(guidKey)); + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); } static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 80a4552..8820811 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -71,6 +71,10 @@ static const BYTE secid10_2[] = static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + static struct secmgr_test { LPCWSTR url; DWORD zone; @@ -297,7 +301,9 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ static void test_activex(IInternetSecurityManager *secmgr) { - DWORD policy; + DWORD policy, policy_size; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; HRESULT hres; policy = 0xdeadbeef; @@ -305,6 +311,13 @@ static void test_activex(IInternetSecurityManager *secmgr) sizeof(DWORD), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); ok(hres == S_OK, "ProcessUrlAction(URLACTION_ACTIVEX_RUN) failed: %08x\n", hres); ok(policy == URLPOLICY_ALLOW || policy == URLPOLICY_DISALLOW, "policy = %x\n", policy); + + cs.clsid = CLSID_TestActiveX; + cs.pUnk = (IUnknown*)0xdeadbeef; + cs.dwFlags = 0; + hres = IInternetSecurityManager_QueryCustomPolicy(secmgr, url1, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + ok(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "QueryCusromPolicy failed: %08x\n", hres); } static void test_polices(void)

1 0

Henri Verbeet : wined3d: Simplify stateblock_savedstates_set().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: c5029f83ecb635a2c342e8b8ab43b7084eb9bf55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5029f83ecb635a2c342e8b8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:07 2009 +0200 wined3d: Simplify stateblock_savedstates_set(). We only need to handle the case where "value" is TRUE, since the stateblock data will be filled with zeroes by default. --- dlls/wined3d/stateblock.c | 72 +++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3c6863e..f37e452 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -79,54 +79,37 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set(SAVEDSTATES *states, BOOL value, const struct wined3d_gl_info *gl_info) +static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) { + unsigned int i; + /* Single values */ - states->primitive_type = value; - states->indices = value; - states->material = value; - states->viewport = value; - states->vertexDecl = value; - states->pixelShader = value; - states->vertexShader = value; - states->scissorRect = value; + states->primitive_type = 1; + states->indices = 1; + states->material = 1; + states->viewport = 1; + states->vertexDecl = 1; + states->pixelShader = 1; + states->vertexShader = 1; + states->scissorRect = 1; /* Fixed size arrays */ - if (value) - { - int i; - states->streamSource = 0xffff; - states->streamFreq = 0xffff; - states->textures = 0xfffff; - stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); - stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); - for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; - states->clipplane = 0xffffffff; - states->pixelShaderConstantsB = 0xffff; - states->pixelShaderConstantsI = 0xffff; - states->vertexShaderConstantsB = 0xffff; - states->vertexShaderConstantsI = 0xffff; - } - else - { - states->streamSource = 0; - states->streamFreq = 0; - states->textures = 0; - memset(states->transform, 0, sizeof(states->transform)); - memset(states->renderState, 0, sizeof(states->renderState)); - memset(states->textureState, 0, sizeof(states->textureState)); - memset(states->samplerState, 0, sizeof(states->samplerState)); - states->clipplane = 0; - states->pixelShaderConstantsB = 0; - states->pixelShaderConstantsI = 0; - states->vertexShaderConstantsB = 0; - states->vertexShaderConstantsI = 0; - } + states->streamSource = 0xffff; + states->streamFreq = 0xffff; + states->textures = 0xfffff; + stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); + stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; + states->clipplane = 0xffffffff; + states->pixelShaderConstantsB = 0xffff; + states->pixelShaderConstantsI = 0xffff; + states->vertexShaderConstantsB = 0xffff; + states->vertexShaderConstantsI = 0xffff; /* Dynamically sized arrays */ - memset(states->pixelShaderConstantsF, value, sizeof(BOOL) * gl_info->max_pshader_constantsF); - memset(states->vertexShaderConstantsF, value, sizeof(BOOL) * gl_info->max_vshader_constantsF); + memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); + memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, @@ -1462,7 +1445,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (type == WINED3DSBT_ALL) { TRACE("ALL => Pretend everything has changed.\n"); - stateblock_savedstates_set(&stateblock->changed, TRUE, gl_info); + + stateblock_savedstates_set(&stateblock->changed, gl_info); /* Lights are not part of the changed / set structure. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -1557,7 +1541,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * else if (type == WINED3DSBT_PIXELSTATE) { TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); - stateblock_savedstates_set(&stateblock->changed, FALSE, gl_info); /* Pixel Shader Constants. */ for (i = 0; i < gl_info->max_pshader_constantsF; ++i) @@ -1629,7 +1612,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * else if (type == WINED3DSBT_VERTEXSTATE) { TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); - stateblock_savedstates_set(&stateblock->changed, FALSE, gl_info); /* Vertex Shader Constants. */ for (i = 0; i < gl_info->max_vshader_constantsF; ++i)

1 0

Henri Verbeet : wined3d: Add a separate function to initialize the saved states for WINED3DSBT_PIXELSTATE .
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 5a01619d3171008092eb4158a3298a71345d8ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a01619d3171008092eb4158a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:09 2009 +0200 wined3d: Add a separate function to initialize the saved states for WINED3DSBT_PIXELSTATE. --- dlls/wined3d/stateblock.c | 46 ++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0df179a..c1a7184 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -79,7 +79,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +static void stateblock_savedstates_set_all(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) { unsigned int i; @@ -112,6 +112,30 @@ static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } +static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +{ + DWORD texture_mask = 0; + WORD sampler_mask = 0; + unsigned int i; + + states->pixelShader = 1; + + for (i = 0; i < NUM_SAVEDPIXELSTATES_R; ++i) + { + DWORD rs = SavedPixelStates_R[i]; + states->renderState[rs >> 5] |= 1 << (rs & 0x1f); + } + + for (i = 0; i < NUM_SAVEDPIXELSTATES_T; ++i) texture_mask |= 1 << SavedPixelStates_T[i]; + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = texture_mask; + for (i = 0; i < NUM_SAVEDPIXELSTATES_S; ++i) sampler_mask |= 1 << SavedPixelStates_S[i]; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = sampler_mask; + states->pixelShaderConstantsB = 0xffff; + states->pixelShaderConstantsI = 0xffff; + + memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); +} + static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, const struct wined3d_gl_info *gl_info) { @@ -1446,7 +1470,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("ALL => Pretend everything has changed.\n"); - stateblock_savedstates_set(&stateblock->changed, gl_info); + stateblock_savedstates_set_all(&stateblock->changed, gl_info); stateblock_init_contained_states(stateblock); /* Lights are not part of the changed / set structure. */ @@ -1474,33 +1498,30 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); + stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); + /* Pixel Shader Constants. */ for (i = 0; i < gl_info->max_pshader_constantsF; ++i) { stateblock->contained_ps_consts_f[i] = i; - stateblock->changed.pixelShaderConstantsF[i] = TRUE; } stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; for (i = 0; i < MAX_CONST_B; ++i) { stateblock->contained_ps_consts_b[i] = i; - stateblock->changed.pixelShaderConstantsB |= (1 << i); } stateblock->num_contained_ps_consts_b = MAX_CONST_B; for (i = 0; i < MAX_CONST_I; ++i) { stateblock->contained_ps_consts_i[i] = i; - stateblock->changed.pixelShaderConstantsI |= (1 << i); } stateblock->num_contained_ps_consts_i = MAX_CONST_I; for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { - DWORD rs = SavedPixelStates_R[i]; - stateblock->changed.renderState[rs >> 5] |= 1 << (rs & 0x1f); - stateblock->contained_render_states[i] = rs; + stateblock->contained_render_states[i] = SavedPixelStates_R[i]; } stateblock->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; @@ -1508,10 +1529,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDPIXELSTATES_T; ++j) { - DWORD state = SavedPixelStates_T[j]; - stateblock->changed.textureState[i] |= 1 << state; stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = state; + stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = SavedPixelStates_T[j]; ++stateblock->num_contained_tss_states; } } @@ -1520,15 +1539,12 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDPIXELSTATES_S; ++j) { - DWORD state = SavedPixelStates_S[j]; - stateblock->changed.samplerState[i] |= 1 << state; stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = state; + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = SavedPixelStates_S[j]; stateblock->num_contained_sampler_states++; } } - stateblock->changed.pixelShader = TRUE; if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); /* Pixel state blocks do not contain vertex buffers. Set them to NULL

1 0

Henri Verbeet : wined3d: Use stateblock_init_contained_states() for WINED3DSBT_ALL stateblocks.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 841afe485e3655f1fec64fde3c1101f65e53caa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841afe485e3655f1fec64fde3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:08 2009 +0200 wined3d: Use stateblock_init_contained_states() for WINED3DSBT_ALL stateblocks. --- dlls/wined3d/stateblock.c | 70 +-------------------------------------------- 1 files changed, 1 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f37e452..0df179a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1447,6 +1447,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * TRACE("ALL => Pretend everything has changed.\n"); stateblock_savedstates_set(&stateblock->changed, gl_info); + stateblock_init_contained_states(stateblock); /* Lights are not part of the changed / set structure. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -1460,75 +1461,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * } } - for (i = 1; i <= WINEHIGHEST_RENDER_STATE; ++i) - { - stateblock->contained_render_states[i - 1] = i; - } - stateblock->num_contained_render_states = WINEHIGHEST_RENDER_STATE; - - /* TODO: Filter unused transforms between TEXTURE8 and WORLD0? */ - for (i = 1; i <= HIGHEST_TRANSFORMSTATE; ++i) - { - stateblock->contained_transform_states[i - 1] = i; - } - stateblock->num_contained_transform_states = HIGHEST_TRANSFORMSTATE; - - for (i = 0; i < gl_info->max_vshader_constantsF; ++i) - { - stateblock->contained_vs_consts_f[i] = i; - } - stateblock->num_contained_vs_consts_f = gl_info->max_vshader_constantsF; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_vs_consts_i[i] = i; - } - stateblock->num_contained_vs_consts_i = MAX_CONST_I; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_vs_consts_b[i] = i; - } - stateblock->num_contained_vs_consts_b = MAX_CONST_B; - - for (i = 0; i < gl_info->max_pshader_constantsF; ++i) - { - stateblock->contained_ps_consts_f[i] = i; - } - stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_ps_consts_i[i] = i; - } - stateblock->num_contained_ps_consts_i = MAX_CONST_I; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_ps_consts_b[i] = i; - } - stateblock->num_contained_ps_consts_b = MAX_CONST_B; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - for (j = 0; j <= WINED3D_HIGHEST_TEXTURE_STATE; ++j) - { - stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = j; - ++stateblock->num_contained_tss_states; - } - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - for (j = 1; j <= WINED3D_HIGHEST_SAMPLER_STATE; ++j) - { - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = j; - ++stateblock->num_contained_sampler_states; - } - } - for (i = 0; i < MAX_STREAMS; ++i) { if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]);

1 0

Henri Verbeet : wined3d: Get rid of stateblock_savedstates_copy().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 75fe879c768a775d7d64b49e42a0166fcf1e44a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe879c768a775d7d64b49e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:06 2009 +0200 wined3d: Get rid of stateblock_savedstates_copy(). This is redundant because we call stateblock_savedstates_set() further down. --- dlls/wined3d/stateblock.c | 38 -------------------------------------- 1 files changed, 0 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4034f1a..3c6863e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -71,41 +71,6 @@ fail: return E_OUTOFMEMORY; } -/* Copy all members of one stateblock to another */ -static void stateblock_savedstates_copy(SAVEDSTATES *dest, const SAVEDSTATES *source, - const struct wined3d_gl_info *gl_info) -{ - /* Single values */ - dest->primitive_type = source->primitive_type; - dest->indices = source->indices; - dest->material = source->material; - dest->viewport = source->viewport; - dest->vertexDecl = source->vertexDecl; - dest->pixelShader = source->pixelShader; - dest->vertexShader = source->vertexShader; - dest->scissorRect = dest->scissorRect; - - /* Fixed size arrays */ - dest->streamSource = source->streamSource; - dest->streamFreq = source->streamFreq; - dest->textures = source->textures; - memcpy(dest->transform, source->transform, sizeof(source->transform)); - memcpy(dest->renderState, source->renderState, sizeof(source->renderState)); - memcpy(dest->textureState, source->textureState, sizeof(source->textureState)); - memcpy(dest->samplerState, source->samplerState, sizeof(source->samplerState)); - dest->clipplane = source->clipplane; - dest->pixelShaderConstantsB = source->pixelShaderConstantsB; - dest->pixelShaderConstantsI = source->pixelShaderConstantsI; - dest->vertexShaderConstantsB = source->vertexShaderConstantsB; - dest->vertexShaderConstantsI = source->vertexShaderConstantsI; - - /* Dynamically sized arrays */ - memcpy(dest->pixelShaderConstantsF, source->pixelShaderConstantsF, - sizeof(BOOL) * gl_info->max_pshader_constantsF); - memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, - sizeof(BOOL) * gl_info->max_vshader_constantsF); -} - static inline void stateblock_set_bits(DWORD *map, UINT map_size) { DWORD mask = (1 << (map_size & 0x1f)) - 1; @@ -1484,9 +1449,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * /* Otherwise, might as well set the whole state block to the appropriate values */ if (device->stateBlock) { - /* Saved states */ - stateblock_savedstates_copy(&stateblock->changed, &device->stateBlock->changed, gl_info); - /* Saved values */ stateblock_copy_values(stateblock, device->stateBlock, gl_info); }

1 0

Alexandre Julliard : winex11: Remove BITBLT_InternalStretchBlt now that it' s identical to X11DRV_StretchBlt.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 89c91ac0b184ff6d92a8fd7b68382647d897199f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c91ac0b184ff6d92a8fd7b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:56:56 2009 +0200 winex11: Remove BITBLT_InternalStretchBlt now that it's identical to X11DRV_StretchBlt. --- dlls/winex11.drv/bitblt.c | 46 +++--------------------------------- dlls/winex11.drv/winex11.drv.spec | 2 - dlls/winex11.drv/x11drv.h | 5 ---- 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index bfbcaaf..435e2c2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1352,15 +1352,11 @@ static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc /*********************************************************************** - * BITBLT_InternalStretchBlt - * - * Implementation of PatBlt(), BitBlt() and StretchBlt(). + * X11DRV_StretchBlt */ -static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, - DWORD rop ) +BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, + DWORD rop ) { BOOL usePat, useSrc, useDst, destUsed, fStretch, fNullBrush; RECT visRectDst, visRectSrc; @@ -1662,37 +1658,3 @@ done: X11DRV_UnlockDIBSection( physDevDst, TRUE ); return TRUE; } - - -/*********************************************************************** - * X11DRV_PatBlt - */ -BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) -{ - return BITBLT_InternalStretchBlt( physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); -} - - -/*********************************************************************** - * X11DRV_BitBlt - */ -BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height, X11DRV_PDEVICE *physDevSrc, - INT xSrc, INT ySrc, DWORD rop ) -{ - return BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, width, height, - physDevSrc, xSrc, ySrc, width, height, rop ); -} - - -/*********************************************************************** - * X11DRV_StretchBlt - */ -BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, DWORD rop ) -{ - return BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, widthDst, heightDst, - physDevSrc, xSrc, ySrc, widthSrc, heightSrc, rop ); -} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index fdd32b3..6fd8831 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -2,7 +2,6 @@ @ cdecl AlphaBlend(ptr long long long long ptr long long long long long) X11DRV_AlphaBlend @ cdecl Arc(ptr long long long long long long long long) X11DRV_Arc -@ cdecl BitBlt(ptr long long long long ptr long long long) X11DRV_BitBlt @ cdecl ChoosePixelFormat(ptr ptr) X11DRV_ChoosePixelFormat @ cdecl Chord(ptr long long long long long long long long) X11DRV_Chord @ cdecl CreateBitmap(ptr long ptr) X11DRV_CreateBitmap @@ -31,7 +30,6 @@ @ cdecl GetTextMetrics(ptr ptr) X11DRV_GetTextMetrics @ cdecl LineTo(ptr long long) X11DRV_LineTo @ cdecl PaintRgn(ptr long) X11DRV_PaintRgn -@ cdecl PatBlt(ptr long long long long long) X11DRV_PatBlt @ cdecl Pie(ptr long long long long long long long long) X11DRV_Pie @ cdecl PolyPolygon(ptr ptr ptr long) X11DRV_PolyPolygon @ cdecl PolyPolyline(ptr ptr ptr long) X11DRV_PolyPolyline diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e97bbea..8f0764d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -178,9 +178,6 @@ extern BOOL CDECL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT y INT widthDst, INT heightDst, X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, BLENDFUNCTION blendfn ); -extern BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height, X11DRV_PDEVICE *physDevSrc, - INT xSrc, INT ySrc, DWORD rop ); extern BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, FONTENUMPROCW dfeproc, LPARAM lp ); extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ); @@ -190,8 +187,6 @@ extern BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ); extern BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); extern BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics); -extern BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, - INT width, INT height, DWORD rop ); extern BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,

1 0

Juan Lang : kernel32: Set time between interrupts in GetSystemTimeAdjustment.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 6614323807778b5ffede2498b1bee841a7eb4fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6614323807778b5ffede2498b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 30 13:09:31 2009 -0700 kernel32: Set time between interrupts in GetSystemTimeAdjustment. --- dlls/kernel32/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 7079b49..2b7bd6c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -325,7 +325,7 @@ BOOL WINAPI GetSystemTimeAdjustment( PDWORD lpTimeAdjustment, PDWORD lpTimeIncre PBOOL lpTimeAdjustmentDisabled ) { *lpTimeAdjustment = 0; - *lpTimeIncrement = 0; + *lpTimeIncrement = 10000000 / sysconf(_SC_CLK_TCK); *lpTimeAdjustmentDisabled = TRUE; return TRUE; }

1 0

Juan Lang : server: A thread' s affinity is restricted to the process affinity.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: bfb4578356b33b9c3d43b813fe5fae142783ab05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb4578356b33b9c3d43b813f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 30 13:49:12 2009 -0700 server: A thread's affinity is restricted to the process affinity. --- dlls/ntdll/tests/info.c | 5 +++++ server/thread.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cc25513..55b4498 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -947,6 +947,11 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" ); + /* The thread affinity is restricted to the process affinity */ + thread_affinity = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); proc_affinity = (1 << si.dwNumberOfProcessors) - 1; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); diff --git a/server/thread.c b/server/thread.c index 211cefe..f45be24 100644 --- a/server/thread.c +++ b/server/thread.c @@ -409,6 +409,11 @@ struct thread *get_thread_from_pid( int pid ) void set_thread_affinity( struct thread *thread, affinity_t affinity ) { + if ((affinity & thread->process->affinity) != affinity) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } #ifdef HAVE_SCHED_SETAFFINITY if (thread->unix_pid != -1) {

1 0