wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Huw Davies : ole32: Implement OleCreateEmbeddingHelper.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: e67da1171661660bd73403d03c86be1117d4289c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67da1171661660bd73403d03… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 25 15:15:50 2009 +0100 ole32: Implement OleCreateEmbeddingHelper. Based on a patch by Rob Shearman. --- dlls/ole32/defaulthandler.c | 69 +++++++++++++++++++++++++++++++++++++++--- dlls/ole32/ole32.spec | 2 +- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b85002a..4102d50 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -137,6 +137,11 @@ struct DefaultHandler /* storage passed to Load or InitNew */ IStorage *storage; enum storage_state storage_state; + + /* optional class factory for object */ + IClassFactory *pCFObject; + /* TRUE if acting as an inproc server instead of an inproc handler */ + BOOL inproc_server; }; typedef struct DefaultHandler DefaultHandler; @@ -223,6 +228,12 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( if (FAILED(hr)) FIXME("interface %s not implemented by data cache\n", debugstr_guid(riid)); return hr; } + else if (This->inproc_server && This->pOleDelegate) + { + HRESULT hr = IUnknown_QueryInterface(This->pOleDelegate, riid, ppvObject); + if (SUCCEEDED(hr)) + return hr; + } /* Check that we obtained an interface. */ if (*ppvObject == NULL) @@ -1901,7 +1912,9 @@ static const IPersistStorageVtbl DefaultHandler_IPersistStorage_VTable = */ static DefaultHandler* DefaultHandler_Construct( REFCLSID clsid, - LPUNKNOWN pUnkOuter) + LPUNKNOWN pUnkOuter, + DWORD flags, + IClassFactory *pCF) { DefaultHandler* This = NULL; HRESULT hr; @@ -1918,6 +1931,8 @@ static DefaultHandler* DefaultHandler_Construct( This->lpvtblIAdviseSink = &DefaultHandler_IAdviseSink_VTable; This->lpvtblIPersistStorage = &DefaultHandler_IPersistStorage_VTable; + This->inproc_server = (flags & EMBDHLP_INPROC_SERVER) ? TRUE : FALSE; + /* * Start with one reference count. The caller of this function * must release the interface pointer when it is done. @@ -1964,6 +1979,30 @@ static DefaultHandler* DefaultHandler_Construct( This->storage = NULL; This->storage_state = storage_state_uninitialised; + if (This->inproc_server && !(flags & EMBDHLP_DELAYCREATE)) + { + HRESULT hr; + This->pCFObject = NULL; + if (pCF) + hr = IClassFactory_CreateInstance(pCF, NULL, &IID_IOleObject, (void **)&This->pOleDelegate); + else + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IOleObject, (void **)&This->pOleDelegate); + if (SUCCEEDED(hr)) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, (void **)&This->pPSDelegate); + if (SUCCEEDED(hr)) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, (void **)&This->pDataDelegate); + if (SUCCEEDED(hr)) + This->object_state = object_state_running; + if (FAILED(hr)) + WARN("object creation failed with error %08x\n", hr); + } + else + { + This->pCFObject = pCF; + if (pCF) IClassFactory_AddRef(pCF); + } + return This; } @@ -2011,22 +2050,30 @@ static void DefaultHandler_Destroy( This->storage = NULL; } + if (This->pCFObject) + { + IClassFactory_Release(This->pCFObject); + This->pCFObject = NULL; + } + HeapFree(GetProcessHeap(), 0, This); } /****************************************************************************** - * OleCreateDefaultHandler [OLE32.@] + * OleCreateEmbeddingHelper [OLE32.@] */ -HRESULT WINAPI OleCreateDefaultHandler( +HRESULT WINAPI OleCreateEmbeddingHelper( REFCLSID clsid, LPUNKNOWN pUnkOuter, + DWORD flags, + IClassFactory *pCF, REFIID riid, LPVOID* ppvObj) { DefaultHandler* newHandler = NULL; HRESULT hr = S_OK; - TRACE("(%s, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, debugstr_guid(riid), ppvObj); + TRACE("(%s, %p, %08x, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, flags, pCF, debugstr_guid(riid), ppvObj); if (!ppvObj) return E_POINTER; @@ -2045,7 +2092,7 @@ HRESULT WINAPI OleCreateDefaultHandler( /* * Try to construct a new instance of the class. */ - newHandler = DefaultHandler_Construct(clsid, pUnkOuter); + newHandler = DefaultHandler_Construct(clsid, pUnkOuter, flags, pCF); if (!newHandler) return E_OUTOFMEMORY; @@ -2063,3 +2110,15 @@ HRESULT WINAPI OleCreateDefaultHandler( return hr; } + + +/****************************************************************************** + * OleCreateDefaultHandler [OLE32.@] + */ +HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid, LPUNKNOWN pUnkOuter, + REFIID riid, LPVOID* ppvObj) +{ + TRACE("(%s, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter,debugstr_guid(riid), ppvObj); + return OleCreateEmbeddingHelper(clsid, pUnkOuter, EMBDHLP_INPROC_HANDLER | EMBDHLP_CREATENOW, + NULL, riid, ppvObj); +} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b9e5c4c..97f2f3d 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -180,7 +180,7 @@ @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateDefaultHandler(ptr ptr ptr ptr) -@ stub OleCreateEmbeddingHelper +@ stdcall OleCreateEmbeddingHelper(ptr ptr long ptr ptr ptr) @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr)

1 0

Paul Chitescu : crypt32: Add Romanian translation.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 114f8c1ad22b0eaaed681a276f8df4d89ea761bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=114f8c1ad22b0eaaed681a276… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Jun 25 16:56:50 2009 +0300 crypt32: Add Romanian translation. --- dlls/crypt32/crypt32.rc | 1 + dlls/crypt32/crypt32_Ro.rc | 243 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=114f8c1ad22b0eaaed681…

1 0

Dmitry Timoshkov : mlang: Make it possible to build the mlang test with PSDK.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 3bd36c841918e2060028976fced09dfd0c1cf2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd36c841918e2060028976fc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 25 19:28:40 2009 +0900 mlang: Make it possible to build the mlang test with PSDK. --- dlls/mlang/tests/mlang.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 54ab987..4530a09 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -50,6 +50,9 @@ static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT); static HRESULT (WINAPI *pConvertINetUnicodeToMultiByte)(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT); +static HRESULT (WINAPI *pRfc1766ToLcidA)(LCID *, LPCSTR); +static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); + typedef struct lcid_tag_table { LPCSTR rfc1766; LCID lcid; @@ -239,6 +242,8 @@ static BOOL init_function_ptrs(void) pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode"); pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte"); + pRfc1766ToLcidA = (void *)GetProcAddress(hMlang, "Rfc1766ToLcidA"); + pLcidToRfc1766A = (void *)GetProcAddress(hMlang, "LcidToRfc1766A"); pGetCPInfoExA = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetCPInfoExA"); @@ -1137,7 +1142,7 @@ static void test_Rfc1766ToLcid(void) for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { lcid = -1; - ret = Rfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); + ret = pRfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); /* IE <6.0 guess 0x412 (ko) from "kok" */ ok( (ret == lcid_table[i].hr) || @@ -1147,15 +1152,13 @@ static void test_Rfc1766ToLcid(void) ok( (lcid == lcid_table[i].lcid) || broken(lcid == lcid_table[i].broken_lcid), /* IE <6.0 */ "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); - } - ret = Rfc1766ToLcidA(&lcid, NULL); + ret = pRfc1766ToLcidA(&lcid, NULL); ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); - ret = Rfc1766ToLcidA(NULL, "en"); + ret = pRfc1766ToLcidA(NULL, "en"); ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); - } static void test_GetNumberOfCodePageInfo(IMultiLanguage2 *iML2) @@ -1220,7 +1223,7 @@ static void test_LcidToRfc1766(void) memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(lcid_table[i].lcid, buffer, MAX_RFC1766_NAME); + hr = pLcidToRfc1766A(lcid_table[i].lcid, buffer, MAX_RFC1766_NAME); /* IE <5.0 does not recognize 0x180c (fr-mc) and 0x457 (kok) */ ok( (hr == lcid_table[i].hr) || @@ -1243,22 +1246,21 @@ static void test_LcidToRfc1766(void) memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(-1, buffer, MAX_RFC1766_NAME); + hr = pLcidToRfc1766A(-1, buffer, MAX_RFC1766_NAME); ok(hr == E_FAIL, "got 0x%08x and '%s' (expected E_FAIL)\n", hr, buffer); - hr = LcidToRfc1766A(LANG_ENGLISH, NULL, MAX_RFC1766_NAME); + hr = pLcidToRfc1766A(LANG_ENGLISH, NULL, MAX_RFC1766_NAME); ok(hr == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", hr); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(LANG_ENGLISH, buffer, -1); + hr = pLcidToRfc1766A(LANG_ENGLISH, buffer, -1); ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(LANG_ENGLISH, buffer, 0); + hr = pLcidToRfc1766A(LANG_ENGLISH, buffer, 0); ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); - } static void test_GetRfc1766Info(IMultiLanguage2 *iML2)

1 0

Hans Leidekker : wininet: Improve the PrivacyGet/SetZonePreferenceW stubs.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: deeb3a9fcb3a05908063ada858071c7a99779f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeb3a9fcb3a05908063ada85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:52:14 2009 +0200 wininet: Improve the PrivacyGet/SetZonePreferenceW stubs. --- dlls/wininet/internet.c | 8 +++++++- dlls/wininet/tests/internet.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4bb25e7..7fc3d4b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3815,12 +3815,16 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s return ERROR_SUCCESS; } +static DWORD zone_preference = 3; + /*********************************************************************** * PrivacySetZonePreferenceW (WININET.@) */ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference ) { FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) ); + + zone_preference = template; return 0; } @@ -3830,7 +3834,9 @@ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template, LPWSTR preference, LPDWORD length ) { - FIXME( "%x %x: stub\n", zone, type ); + FIXME( "%x %x %p %p %p: stub\n", zone, type, template, preference, length ); + + if (template) *template = zone_preference; return 0; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5f36c3d..728c8dc 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -795,6 +795,33 @@ static void test_IsDomainLegalCookieDomainW(void) ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); } +static void test_PrivacyGetSetZonePreferenceW(void) +{ + DWORD ret, zone, type, template, old_template; + + zone = 3; + type = 0; + ret = PrivacyGetZonePreferenceW(zone, type, NULL, NULL, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + + old_template = 0; + ret = PrivacyGetZonePreferenceW(zone, type, &old_template, NULL, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + + template = 5; + ret = PrivacySetZonePreferenceW(zone, type, template, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + + template = 0; + ret = PrivacyGetZonePreferenceW(zone, type, &template, NULL, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + ok(template == 5, "expected template == 5, got %u\n", template); + + template = 5; + ret = PrivacySetZonePreferenceW(zone, type, old_template, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); +} + /* ############################### */ START_TEST(internet) @@ -833,4 +860,6 @@ START_TEST(internet) win_skip("IsDomainLegalCookieDomainW (or ordinal 117) is not available\n"); else test_IsDomainLegalCookieDomainW(); + + test_PrivacyGetSetZonePreferenceW(); }

1 0

Paul Vriens : comctl32/tests: Fix test failures on comctl32 < 5.80.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 7665699411a0a3b1cd7444d9d6e2035f1d007b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7665699411a0a3b1cd7444d9d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 25 11:49:14 2009 +0200 comctl32/tests: Fix test failures on comctl32 < 5.80. --- dlls/comctl32/tests/updown.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 433c190..f2b3cc2 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -426,8 +426,14 @@ static void test_updown_pos32(void) expect(0,low); expect(1000,high); - /* Set position to 500, don't check return since it is unset*/ - SendMessage(updown, UDM_SETPOS32, 0 , 500 ); + /* Set position to 500 */ + r = SendMessage(updown, UDM_SETPOS32, 0 , 500 ); + if (!r) + { + win_skip("UDM_SETPOS32 and UDM_GETPOS32 need 5.80\n"); + return; + } + expect(100,r); /* As set by test_updown_pos() */ /* Since UDM_SETBUDDYINT was not set at creation bRet will always be true as a return from UDM_GETPOS32 */

1 0

Tobias Jakobi : wined3d: Force NP2 fixup constant reloading in shader_glsl_select.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: a9f912466b94a93b84a0b30d374b7448faff4b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f912466b94a93b84a0b30d3… Author: Tobias Jakobi <tjakobi(a)xdf79.math.uni-bielefeld.de> Date: Fri May 29 15:01:44 2009 +0200 wined3d: Force NP2 fixup constant reloading in shader_glsl_select. --- dlls/wined3d/glsl_shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2fc8586..e797889 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4250,6 +4250,13 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { if (program_id) TRACE("Using GLSL program %u\n", program_id); GL_EXTCALL(glUseProgramObjectARB(program_id)); checkGLcall("glUseProgramObjectARB"); + + /* In case that NP2 texcoord fixup data is found for the selected program, trigger a reload of the + * constants. This has to be done because it can't be guaranteed that sampler() (from state.c) is + * called between selecting the shader and using it, which results in wrong fixup for some frames. */ + if (priv->glsl_program && priv->glsl_program->np2Fixup_info) { + This->shader_backend->shader_load_np2fixup_constants(iface, usePS, useVS); + } } /* GL locking is done by the caller */

1 0

Tobias Jakobi : wined3d: Enable constant packing for NP2 texcoord fixup.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: ef7f769be6dbc4655f6363cd7ed3670f8b1dfc01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7f769be6dbc4655f6363cd7… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jun 17 23:26:38 2009 +0200 wined3d: Enable constant packing for NP2 texcoord fixup. Previously every texture that was flagged for NP2 fixup used a vec2 uniform in the shader to store texture dimensions. Turns out that the GLSL compilers just maps vec2 to vec4, so essentially wasting 2 floats. The new code only uses vec4 uniforms but packs dimensions info of 2 textures into a single uniform. --- dlls/wined3d/glsl_shader.c | 104 ++++++++++++++++++++++++++++--------------- 1 files changed, 68 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bd5724a..2fc8586 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -103,7 +103,7 @@ struct glsl_shader_prog_link { GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; GLint posFixup_location; - GLint np2Fixup_location[MAX_FRAGMENT_SAMPLERS]; + GLint np2Fixup_location; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; @@ -572,24 +572,31 @@ static void shader_glsl_load_np2fixup_constants( return; } - if (prog->ps_args.np2_fixup) { - UINT i; - UINT fixup = prog->ps_args.np2_fixup; + if (prog->ps_args.np2_fixup && -1 != prog->np2Fixup_location) { const WineD3D_GL_Info* gl_info = &deviceImpl->adapter->gl_info; const IWineD3DStateBlockImpl* stateBlock = (const IWineD3DStateBlockImpl*) deviceImpl->stateBlock; + UINT i; + UINT fixup = prog->ps_args.np2_fixup; + GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; for (i = 0; fixup; fixup >>= 1, ++i) { - if (-1 != prog->np2Fixup_location[i]) { - const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; - if (!tex) { - FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); - continue; - } else { - const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; - GL_EXTCALL(glUniform2fvARB(prog->np2Fixup_location[i], 1, tex_dim)); - } + const unsigned char idx = prog->np2Fixup_info->idx[i]; + const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; + GLfloat* tex_dim = &np2fixup_constants[(idx >> 1) * 4]; + + if (!tex) { + FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); + continue; + } + + if (idx % 2) { + tex_dim[2] = tex->baseTexture.pow2Matrix[0]; tex_dim[3] = tex->baseTexture.pow2Matrix[5]; + } else { + tex_dim[0] = tex->baseTexture.pow2Matrix[0]; tex_dim[1] = tex->baseTexture.pow2Matrix[5]; } } + + GL_EXTCALL(glUniform4fvARB(prog->np2Fixup_location, prog->np2Fixup_info->num_consts, np2fixup_constants)); } } @@ -776,10 +783,11 @@ static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) /** Generate the variable & register declarations for the GLSL output target */ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const shader_reg_maps *reg_maps, SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, - const struct ps_compile_args *ps_args) + struct shader_glsl_ctx_priv *ctx_priv) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; + const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; unsigned int i, extra_constants_needed = 0; const local_constant *lconst; @@ -922,15 +930,6 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } else { shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - - if (pshader && ps_args->np2_fixup & (1 << i)) - { - /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] - * while D3D has them in the (normalized) [0,1]x[0,1] range. - * samplerNP2Fixup stores texture dimensions and is updated through - * shader_glsl_load_np2fixup_constants when the sampler changes. */ - shader_addline(buffer, "uniform vec2 %csamplerNP2Fixup%u;\n", prefix, i); - } break; case WINED3DSTT_CUBE: shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i); @@ -945,7 +944,38 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } } } - + + /* Declare uniforms for NP2 texcoord fixup: + * This is NOT done inside the loop that declares the texture samplers since the NP2 fixup code + * is currently only used for the GeforceFX series and when forcing the ARB_npot extension off. + * Modern cards just skip the code anyway, so put it inside a seperate loop. */ + if (pshader && ps_args->np2_fixup) { + + struct ps_np2fixup_info* const fixup = ctx_priv->cur_np2fixup_info; + UINT cur = 0; + + /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] + * while D3D has them in the (normalized) [0,1]x[0,1] range. + * samplerNP2Fixup stores texture dimensions and is updated through + * shader_glsl_load_np2fixup_constants when the sampler changes. */ + + for (i = 0; i < This->baseShader.limits.sampler; ++i) { + if (reg_maps->sampler_type[i]) { + if (!(ps_args->np2_fixup & (1 << i))) continue; + + if (WINED3DSTT_2D != reg_maps->sampler_type[i]) { + FIXME("Non-2D texture is flagged for NP2 texcoord fixup.\n"); + continue; + } + + fixup->idx[i] = cur++; + } + } + + fixup->num_consts = (cur + 1) >> 1; + shader_addline(buffer, "uniform vec4 %csamplerNP2Fixup[%u];\n", prefix, fixup->num_consts); + } + /* Declare address variables */ for (i = 0; i < This->baseShader.limits.address; i++) { if (reg_maps->address[i]) @@ -1679,7 +1709,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; sampler_base = "Psampler"; @@ -1707,7 +1737,11 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); } else { if (np2_fixup) { - shader_addline(ins->ctx->buffer, " * PsamplerNP2Fixup%u)%s);\n", sampler, dst_swizzle); + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; + + shader_addline(ins->ctx->buffer, " * PsamplerNP2Fixup[%u].%s)%s);\n", idx >> 1, + (idx % 2) ? "zw" : "xy", dst_swizzle); } else if(dx && dy) { shader_addline(ins->ctx->buffer, ", %s, %s)%s);\n", dx, dy, dst_swizzle); } else { @@ -3658,7 +3692,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Declarations */ - shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, args); + shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, &priv_ctx); /* Pack 3.0 inputs */ if (reg_maps->shader_version.major >= 3 && args->vp_mode != vertexshader) @@ -3747,7 +3781,7 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShaderImpl *This, priv_ctx.cur_vs_args = args; /* Base Declarations */ - shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); + shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, &priv_ctx); /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); @@ -4053,7 +4087,6 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use if(pshader) { char name[32]; - WORD map; for(i = 0; i < MAX_TEXTURES; i++) { sprintf(name, "bumpenvmat%u", i); @@ -4064,13 +4097,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->luminanceoffset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } - map = ps_compile_args.np2_fixup; - for (i = 0; map; map >>= 1, ++i) - { - if (!(map & 1)) continue; - - sprintf(name, "PsamplerNP2Fixup%u", i); - entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + if (ps_compile_args.np2_fixup) { + if (entry->np2Fixup_info) { + entry->np2Fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "PsamplerNP2Fixup")); + } else { + FIXME("NP2 texcoord fixup needed for this pixelshader, but no fixup uniform found."); + } } }

1 0

Tobias Jakobi : wined3d: Add ps_np2fixup_info structure.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 7906774339c503200d950e5ad03d3b4d5955855b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7906774339c503200d950e5ad… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jun 17 23:24:25 2009 +0200 wined3d: Add ps_np2fixup_info structure. --- dlls/wined3d/glsl_shader.c | 23 ++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 035844a..bd5724a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -114,6 +114,7 @@ struct glsl_shader_prog_link { struct vs_compile_args vs_args; struct ps_compile_args ps_args; UINT constant_version; + const struct ps_np2fixup_info *np2Fixup_info; }; typedef struct { @@ -126,11 +127,13 @@ typedef struct { struct shader_glsl_ctx_priv { const struct vs_compile_args *cur_vs_args; const struct ps_compile_args *cur_ps_args; + struct ps_np2fixup_info *cur_np2fixup_info; }; struct glsl_ps_compiled_shader { struct ps_compile_args args; + struct ps_np2fixup_info np2fixup; GLhandleARB prgId; }; @@ -3627,7 +3630,7 @@ static void hardcode_local_constants(IWineD3DBaseShaderImpl *shader, const WineD /* GL locking is done by the caller */ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, - SHADER_BUFFER *buffer, const struct ps_compile_args *args) + SHADER_BUFFER *buffer, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; @@ -3640,6 +3643,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_ps_args = args; + priv_ctx.cur_np2fixup_info = np2fixup_info; shader_addline(buffer, "#version 120\n"); @@ -3792,13 +3796,15 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShaderImpl *This, return shader_obj; } -static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args) +static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args, + const struct ps_np2fixup_info **np2fixup_info) { UINT i; DWORD new_size; struct glsl_ps_compiled_shader *new_array; + struct glsl_pshader_private *shader_data; + struct ps_np2fixup_info *np2fixup = NULL; SHADER_BUFFER buffer; - struct glsl_pshader_private *shader_data; GLhandleARB ret; if(!shader->backend_priv) { @@ -3812,6 +3818,7 @@ static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const stru */ for(i = 0; i < shader_data->num_gl_shaders; i++) { if(memcmp(&shader_data->gl_shaders[i].args, args, sizeof(*args)) == 0) { + if(args->np2_fixup) *np2fixup_info = &shader_data->gl_shaders[i].np2fixup; return shader_data->gl_shaders[i].prgId; } } @@ -3838,13 +3845,17 @@ static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const stru shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; + memset(&shader_data->gl_shaders[shader_data->num_gl_shaders].np2fixup, 0, sizeof(struct ps_np2fixup_info)); + if (args->np2_fixup) np2fixup = &shader_data->gl_shaders[shader_data->num_gl_shaders].np2fixup; + pixelshader_update_samplers(&shader->baseShader.reg_maps, ((IWineD3DDeviceImpl *)shader->baseShader.device)->stateBlock->textures); shader_buffer_init(&buffer); - ret = shader_glsl_generate_pshader(shader, &buffer, args); + ret = shader_glsl_generate_pshader(shader, &buffer, args, np2fixup); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders++].prgId = ret; + *np2fixup_info = np2fixup; return ret; } @@ -3956,6 +3967,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->vs_args = vs_compile_args; entry->ps_args = ps_compile_args; entry->constant_version = 0; + entry->np2Fixup_info = NULL; /* Add the hash table entry */ add_glsl_program_entry(priv, entry); @@ -4006,7 +4018,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use /* Attach GLSL pshader */ if (pshader) { - GLhandleARB pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); + GLhandleARB pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *)pshader, &ps_compile_args, + &entry->np2Fixup_info); TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, pshader_id)); checkGLcall("glAttachObjectARB"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afef4af..afdf642 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2707,6 +2707,24 @@ void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockIm /***************************************************************************** * IDirect3DPixelShader implementation structure */ + +/* Using additional shader constants (uniforms in GLSL / program environment + * or local parameters in ARB) is costly: + * ARB only knows float4 parameters and GLSL compiler are not really smart + * when it comes to efficiently pack float2 uniforms, so no space is wasted + * (in fact most compilers map a float2 to a full float4 uniform). + * + * For NP2 texcoord fixup we only need 2 floats (width and height) for each + * 2D texture used in the shader. We therefore pack fixup info for 2 textures + * into a single shader constant (uniform / program parameter). + * + * This structure is shared between the GLSL and the ARB backend.*/ +struct ps_np2fixup_info { + unsigned char idx[MAX_FRAGMENT_SAMPLERS]; /* indices to the real constant */ + WORD active; /* bitfield indicating if we can apply the fixup */ + WORD num_consts; +}; + typedef struct IWineD3DPixelShaderImpl { /* IUnknown parts */ const IWineD3DPixelShaderVtbl *lpVtbl;

1 0

Huw Davies : configure: Remove reference to obsolete ftnames.h.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 08453c1f2bbb4c74d6643fc8df7c040e2c765147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08453c1f2bbb4c74d6643fc8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 24 15:41:04 2009 +0100 configure: Remove reference to obsolete ftnames.h. --- configure | 2 -- configure.ac | 1 - dlls/gdi32/freetype.c | 4 ---- dlls/wineps.drv/truetype.c | 4 ---- include/config.h.in | 3 --- 5 files changed, 0 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 3f3548e..ebf519f 100755 --- a/configure +++ b/configure @@ -14601,13 +14601,11 @@ fi - for ac_header in ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ freetype/fttypes.h \ freetype/tttables.h \ - freetype/ftnames.h \ freetype/ftsnames.h \ freetype/ttnameid.h \ freetype/ftoutln.h \ diff --git a/configure.ac b/configure.ac index bb4d82e..8ce3686 100644 --- a/configure.ac +++ b/configure.ac @@ -1169,7 +1169,6 @@ then freetype/ftglyph.h \ freetype/fttypes.h \ freetype/tttables.h \ - freetype/ftnames.h \ freetype/ftsnames.h \ freetype/ttnameid.h \ freetype/ftoutln.h \ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ef93402..6500601 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -109,10 +109,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #endif #ifdef HAVE_FREETYPE_FTSNAMES_H #include <freetype/ftsnames.h> -#else -# ifdef HAVE_FREETYPE_FTNAMES_H -# include <freetype/ftnames.h> -# endif #endif #ifdef HAVE_FREETYPE_TTNAMEID_H #include <freetype/ttnameid.h> diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index b526959..59ebe19 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -49,10 +49,6 @@ #endif #ifdef HAVE_FREETYPE_FTSNAMES_H #include <freetype/ftsnames.h> -#else -# ifdef HAVE_FREETYPE_FTNAMES_H -# include <freetype/ftnames.h> -# endif #endif #ifdef HAVE_FREETYPE_TTNAMEID_H #include <freetype/ttnameid.h> diff --git a/include/config.h.in b/include/config.h.in index f6799c6..b2642c9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -123,9 +123,6 @@ /* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ #undef HAVE_FREETYPE_FTMODAPI_H -/* Define to 1 if you have the <freetype/ftnames.h> header file. */ -#undef HAVE_FREETYPE_FTNAMES_H - /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ #undef HAVE_FREETYPE_FTOUTLN_H

1 0

Eric van Beurden : wininet: Check for failed heap allocations.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: f0ce72082d90dfeef4c1b8dc3144908c341b6856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ce72082d90dfeef4c1b8dc3… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Wed Jun 24 13:31:34 2009 -0400 wininet: Check for failed heap allocations. --- dlls/wininet/cookie.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index dc77b17..c9bcad0 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -453,6 +453,12 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST BOOL expired = FALSE; value = data = HeapAlloc(GetProcessHeap(), 0, (strlenW(cookie_data) + 1) * sizeof(WCHAR)); + if (data == NULL) + { + ERR("could not allocate %zu bytes for the cookie data buffer\n", (strlenW(cookie_data) + 1) * sizeof(WCHAR)); + return FALSE; + } + strcpyW(data,cookie_data); memset(&expiry,0,sizeof(expiry)); @@ -470,7 +476,15 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST if (!(ptr = strchrW(ptr,';'))) break; *ptr++ = 0; + if (value != data) + HeapFree(GetProcessHeap(), 0, value); value = HeapAlloc(GetProcessHeap(), 0, (ptr - data) * sizeof(WCHAR)); + if (value == NULL) + { + HeapFree(GetProcessHeap(), 0, data); + ERR("could not allocate %zu bytes for the cookie value buffer\n", (ptr - data) * sizeof(WCHAR)); + return FALSE; + } strcpyW(value, data); while (*ptr == ' ') ptr++; /* whitespace */

1 0

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 June 2009