wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Jacek Caban : mshtml: Use IUri for nsIURL::GetQuery implementation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 11d33cb1676b63331bfc09dfc7c5cf3c73db25b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d33cb1676b63331bfc09dfc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 12:45:39 2010 +0200 mshtml: Use IUri for nsIURL::GetQuery implementation. --- dlls/mshtml/nsio.c | 32 +------------------------------- 1 files changed, 1 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9ac735c..137b6fb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2171,43 +2171,13 @@ static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam) static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) { nsWineURI *This = NSURI_THIS(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; - WCHAR *ptr_end, *ptr; - char *query; - int len; TRACE("(%p)->(%p)\n", This, aQuery); if(This->nsurl) return nsIURL_GetQuery(This->nsurl, aQuery); - url.dwExtraInfoLength = 1; - if(!InternetCrackUrlW(This->wine_url, 0, 0, &url)) { - WARN("InternetCrackUrlW failed: 0x%08x\n", GetLastError()); - nsACString_SetData(aQuery, ""); - return NS_OK; - } - - ptr_end = url.lpszExtraInfo+url.dwExtraInfoLength; - for(ptr = url.lpszExtraInfo; ptr < ptr_end; ptr++) { - if(*ptr == '#') { - ptr_end = ptr; - break; - } - } - - ptr = url.lpszExtraInfo; - len = WideCharToMultiByte(CP_ACP, 0, ptr, ptr_end-ptr, NULL, 0, NULL, NULL); - query = heap_alloc(len+1); - if(!query) - return NS_ERROR_OUT_OF_MEMORY; - WideCharToMultiByte(CP_ACP, 0, ptr, ptr_end-ptr, query, len, NULL, NULL); - query[len] = 0; - nsACString_SetData(aQuery, query); - - TRACE("ret %s\n", debugstr_a(query)); - heap_free(query); - return NS_OK; + return get_uri_string(This, Uri_PROPERTY_QUERY, aQuery); } static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery)

1 0

Jacek Caban : mshtml: Get rid of use_wine_url.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d98bb11f49b69ad3de14d334ed532d357bd6c9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98bb11f49b69ad3de14d334e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 12:45:13 2010 +0200 mshtml: Get rid of use_wine_url. --- dlls/mshtml/nsio.c | 64 +++++++++------------------------------------------ 1 files changed, 12 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 52a52ff..9ac735c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -66,7 +66,6 @@ struct nsWineURI { LPWSTR wine_url; IUri *uri; BOOL is_doc_uri; - BOOL use_wine_url; }; #define NSURI(x) ((nsIURI*) &(x)->lpIURLVtbl) @@ -246,10 +245,6 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) { - static const WCHAR wszFtp[] = {'f','t','p',':'}; - static const WCHAR wszHttp[] = {'h','t','t','p',':'}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':'}; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url) { @@ -260,20 +255,9 @@ HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) return E_OUTOFMEMORY; heap_free(This->wine_url); This->wine_url = new_url; - - if(This->nsuri) { - /* FIXME: Always use wine url */ - This->use_wine_url = - strncmpW(url, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) - && strncmpW(url, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) - && strncmpW(url, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); - }else { - This->use_wine_url = TRUE; - } }else { heap_free(This->wine_url); This->wine_url = NULL; - This->use_wine_url = FALSE; } return S_OK; @@ -1657,23 +1641,13 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) { nsWineURI *This = NSURI_THIS(iface); + char speca[INTERNET_MAX_URL_LENGTH]; TRACE("(%p)->(%p)\n", This, aSpec); - if(This->use_wine_url) { - char speca[INTERNET_MAX_URL_LENGTH]; - WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); - nsACString_SetData(aSpec, speca); - - return NS_OK; - } - - if(This->nsuri) - return nsIURI_GetSpec(This->nsuri, aSpec); - - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; - + WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); + nsACString_SetData(aSpec, speca); + return NS_OK; } static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) @@ -2016,24 +1990,17 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval) { nsWineURI *This = NSURI_THIS(iface); + WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; + int len; TRACE("(%p)->(%s %p)\n", This, debugstr_a(scheme), _retval); - if(This->use_wine_url) { - WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; - int len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; - - *_retval = lstrlenW(This->wine_url) > len - && This->wine_url[len] == ':' - && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); - return NS_OK; - } - - if(This->nsuri) - return nsIURI_SchemeIs(This->nsuri, scheme, _retval); + len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; + *_retval = lstrlenW(This->wine_url) > len + && This->wine_url[len] == ':' + && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); + return NS_OK; } static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) @@ -2116,14 +2083,7 @@ static nsresult NSAPI nsURI_GetAsciiSpec(nsIURL *iface, nsACString *aAsciiSpec) TRACE("(%p)->(%p)\n", This, aAsciiSpec); - if(This->use_wine_url) - return nsIURI_GetSpec(NSURI(This), aAsciiSpec); - - if(This->nsuri) - return nsIURI_GetAsciiSpec(This->nsuri, aAsciiSpec); - - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return nsIURI_GetSpec(NSURI(This), aAsciiSpec); } static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost)

1 0

Jacek Caban : mshtml: Use IUri for nsIURI::GetScheme implementation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: e58f9df642c489f8b499b09066ab237d184203f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58f9df642c489f8b499b0906… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 12:44:40 2010 +0200 mshtml: Use IUri for nsIURI::GetScheme implementation. --- dlls/mshtml/nsio.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index df8f148..52a52ff 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1707,32 +1707,26 @@ static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath) static nsresult NSAPI nsURI_GetScheme(nsIURL *iface, nsACString *aScheme) { nsWineURI *This = NSURI_THIS(iface); + DWORD scheme; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aScheme); - if(This->use_wine_url) { - char scheme[INTERNET_MAX_SCHEME_LENGTH+1]; - WCHAR *ptr; - int len; + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; - ptr = strchrW(This->wine_url, ':'); - if(!ptr) { - nsACString_SetData(aScheme, "wine"); - return NS_OK; - } + hres = IUri_GetScheme(This->uri, &scheme); + if(FAILED(hres)) { + WARN("GetScheme failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } - len = WideCharToMultiByte(CP_ACP, 0, This->wine_url, ptr-This->wine_url, scheme, - sizeof(scheme), NULL, NULL); - scheme[min(len,sizeof(scheme)-1)] = 0; - nsACString_SetData(aScheme, strcmp(scheme, "about") ? scheme : "wine"); + if(scheme == URL_SCHEME_ABOUT) { + nsACString_SetData(aScheme, "wine"); return NS_OK; } - if(This->nsuri) - return nsIURI_GetScheme(This->nsuri, aScheme); - - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_SCHEME_NAME, aScheme); } static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme)

1 0

Alexandre Julliard : winmm: Add support for the MCI_INTEGER64 type.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d1e9a09388a129f0fa31b49ddb38ddc2e7cad6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e9a09388a129f0fa31b49dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 14:49:48 2010 +0200 winmm: Add support for the MCI_INTEGER64 type. Based on a patch by Octavian Voicu. --- dlls/winmm/mci.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 2e9278b..cb76a1e 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1201,6 +1201,43 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret } break; } +#ifdef MCI_INTEGER64 + case MCI_INTEGER64: + { + static const WCHAR fmt_ld [] = {'%','l','d',0}; + DWORD_PTR data = *(DWORD_PTR *)(params + 1); + switch (dwRet & 0xFFFF0000ul) { + case 0: + case MCI_INTEGER_RETURNED: + snprintfW(lpstrRet, uRetLen, fmt_ld, data); + break; + case MCI_RESOURCE_RETURNED: + /* return string which ID is HIWORD(data), + * string is loaded from mmsystem.dll */ + LoadStringW(hWinMM32Instance, HIWORD(data), lpstrRet, uRetLen); + break; + case MCI_RESOURCE_RETURNED|MCI_RESOURCE_DRIVER: + /* return string which ID is HIWORD(data), + * string is loaded from driver */ + /* FIXME: this is wrong for a 16 bit handle */ + LoadStringW(GetDriverModuleHandle(wmd->hDriver), + HIWORD(data), lpstrRet, uRetLen); + break; + case MCI_COLONIZED3_RETURN: + snprintfW(lpstrRet, uRetLen, wszCol3, + LOBYTE(LOWORD(data)), HIBYTE(LOWORD(data)), + LOBYTE(HIWORD(data))); + break; + case MCI_COLONIZED4_RETURN: + snprintfW(lpstrRet, uRetLen, wszCol4, + LOBYTE(LOWORD(data)), HIBYTE(LOWORD(data)), + LOBYTE(HIWORD(data)), HIBYTE(HIWORD(data))); + break; + default: ERR("Ooops (%04X)\n", HIWORD(dwRet)); + } + break; + } +#endif case MCI_STRING: switch (dwRet & 0xFFFF0000ul) { case 0: @@ -1421,6 +1458,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, case MCI_RECT: offset += 4 * sizeof(DWORD); break; +#ifdef MCI_INTEGER64 + case MCI_INTEGER64: + offset += sizeof(DWORD_PTR); + break; +#endif default: ERR("oops\n"); }

1 0

Alexandre Julliard : winmm: Use proper structure where possible to fix command string parsing on 64-bit .
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 41a5b37b7aa24269257a130d26aae77e22c7c8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a5b37b7aa24269257a130d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 14:47:55 2010 +0200 winmm: Use proper structure where possible to fix command string parsing on 64-bit. --- dlls/winmm/mci.c | 119 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 72 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41a5b37b7aa24269257a1…

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to find_arb_ps_compile_args().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 5029331f559fd200122fff45b30786741e40fec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5029331f559fd200122fff45b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 29 12:20:47 2010 +0200 wined3d: Pass a wined3d_state structure to find_arb_ps_compile_args(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 951ab63..9be5cd2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4390,13 +4390,12 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl return &shader_data->gl_shaders[shader_data->num_gl_shaders++]; } -static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, - struct arb_ps_compile_args *args) +static void find_arb_ps_compile_args(const struct wined3d_state *state, + IWineD3DPixelShaderImpl *shader, struct arb_ps_compile_args *args) { int i; WORD int_skip; const struct wined3d_gl_info *gl_info = &((IWineD3DDeviceImpl *)shader->baseShader.device)->adapter->gl_info; - const struct wined3d_state *state = &stateblock->state; find_ps_compile_args(state, shader, &args->super); @@ -4538,7 +4537,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, struct arb_ps_compiled_shader *compiled; TRACE("Using pixel shader %p.\n", ps); - find_arb_ps_compile_args(ps, This->stateBlock, &compile_args); + find_arb_ps_compile_args(state, ps, &compile_args); compiled = find_arb_pshader(ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled;

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to find_arb_vs_compile_args().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: e5ef8057ea93c27e7fafd8f9afbcaea5da7014ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ef8057ea93c27e7fafd8f9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 29 12:20:46 2010 +0200 wined3d: Pass a wined3d_state structure to find_arb_vs_compile_args(). --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b4c2a3b..951ab63 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4445,14 +4445,13 @@ static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWi } } -static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, - struct arb_vs_compile_args *args) +static void find_arb_vs_compile_args(const struct wined3d_state *state, + IWineD3DVertexShaderImpl *shader, struct arb_vs_compile_args *args) { int i; WORD int_skip; IWineD3DDeviceImpl *dev = (IWineD3DDeviceImpl *)shader->baseShader.device; const struct wined3d_gl_info *gl_info = &dev->adapter->gl_info; - const struct wined3d_state *state = &stateblock->state; find_vs_compile_args(state, shader, &args->super); @@ -4528,13 +4527,15 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, IWineD3DDeviceImpl *This = context->swapchain->device; struct shader_arb_priv *priv = This->shader_priv; const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_state *state = &This->stateBlock->state; int i; /* Deal with pixel shaders first so the vertex shader arg function has the input signature ready */ - if (usePS) { + if (usePS) + { + IWineD3DPixelShaderImpl *ps = state->pixel_shader; struct arb_ps_compile_args compile_args; struct arb_ps_compiled_shader *compiled; - IWineD3DPixelShaderImpl *ps = This->stateBlock->state.pixel_shader; TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(ps, This->stateBlock, &compile_args); @@ -4587,13 +4588,14 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, priv->current_fprogram_id = 0; } - if (useVS) { + if (useVS) + { + IWineD3DVertexShaderImpl *vs = state->vertex_shader; struct arb_vs_compile_args compile_args; struct arb_vs_compiled_shader *compiled; - IWineD3DVertexShaderImpl *vs = This->stateBlock->state.vertex_shader; TRACE("Using vertex shader %p\n", vs); - find_arb_vs_compile_args(vs, This->stateBlock, &compile_args); + find_arb_vs_compile_args(state, vs, &compile_args); compiled = find_arb_vshader(vs, &compile_args); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled;

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to find_ps_compile_args().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: e12f5ff08ab2b478292a9b5d181e10750dde0ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12f5ff08ab2b478292a9b5d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 29 12:20:45 2010 +0200 wined3d: Pass a wined3d_state structure to find_ps_compile_args(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 7 +++---- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5f76a45..b4c2a3b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4398,7 +4398,7 @@ static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWi const struct wined3d_gl_info *gl_info = &((IWineD3DDeviceImpl *)shader->baseShader.device)->adapter->gl_info; const struct wined3d_state *state = &stateblock->state; - find_ps_compile_args(shader, stateblock, &args->super); + find_ps_compile_args(state, shader, &args->super); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->baseShader.reg_maps.local_bool_consts; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f640fa4..28a3350 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4293,7 +4293,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struct vs_compile_args vs_compile_args; if (vshader) find_vs_compile_args(state, (IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); - if (pshader) find_ps_compile_args((IWineD3DPixelShaderImpl *)pshader, device->stateBlock, &ps_compile_args); + if (pshader) find_ps_compile_args(state, (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 08c211e..3bbf5ed 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2067,12 +2067,11 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = pixelshader_GetFunction }; -void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, - IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) +void find_ps_compile_args(const struct wined3d_state *state, + IWineD3DPixelShaderImpl *shader, struct ps_compile_args *args) { - const struct wined3d_state *state = &stateblock->state; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; IWineD3DBaseTextureImpl *texture; - IWineD3DDeviceImpl *device = stateblock->device; UINT i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ce1904..1ab89c5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2915,8 +2915,8 @@ HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *de void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void pixelshader_update_samplers(struct shader_reg_maps *reg_maps, IWineD3DBaseTexture * const *textures) DECLSPEC_HIDDEN; -void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, - struct ps_compile_args *args) DECLSPEC_HIDDEN; +void find_ps_compile_args(const struct wined3d_state *state, + IWineD3DPixelShaderImpl *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN; /* sRGB correction constants */ static const float srgb_cmp = 0.0031308f;

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to find_vs_compile_args().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 8d5a25bbec836f860f3c81363fd2029ba03ff401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5a25bbec836f860f3c81363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 29 12:20:44 2010 +0200 wined3d: Pass a wined3d_state structure to find_vs_compile_args(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 7 ++++--- dlls/wined3d/shader.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 04be331..5f76a45 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4454,7 +4454,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW const struct wined3d_gl_info *gl_info = &dev->adapter->gl_info; const struct wined3d_state *state = &stateblock->state; - find_vs_compile_args(shader, stateblock, &args->super); + find_vs_compile_args(state, shader, &args->super); args->clip.boolclip_compare = 0; if (use_ps(state)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a731d78..f640fa4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4279,8 +4279,9 @@ static GLhandleARB find_glsl_vshader(const struct wined3d_context *context, static void set_glsl_shader_program(const struct wined3d_context *context, IWineD3DDeviceImpl *device, BOOL use_ps, BOOL use_vs) { - IWineD3DVertexShader *vshader = use_vs ? (IWineD3DVertexShader *)device->stateBlock->state.vertex_shader : NULL; - IWineD3DPixelShader *pshader = use_ps ? (IWineD3DPixelShader *)device->stateBlock->state.pixel_shader : NULL; + const struct wined3d_state *state = &device->stateBlock->state; + IWineD3DVertexShader *vshader = use_vs ? (IWineD3DVertexShader *)state->vertex_shader : NULL; + IWineD3DPixelShader *pshader = use_ps ? (IWineD3DPixelShader *)state->pixel_shader : NULL; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = device->shader_priv; struct glsl_shader_prog_link *entry = NULL; @@ -4291,7 +4292,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; - if (vshader) find_vs_compile_args((IWineD3DVertexShaderImpl *)vshader, device->stateBlock, &vs_compile_args); + if (vshader) find_vs_compile_args(state, (IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); if (pshader) find_ps_compile_args((IWineD3DPixelShaderImpl *)pshader, device->stateBlock, &ps_compile_args); entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8d380b7..08c211e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1706,13 +1706,13 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = vertexshader_SetLocalConstantsF, }; -void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, - IWineD3DStateBlockImpl *stateblock, struct vs_compile_args *args) +void find_vs_compile_args(const struct wined3d_state *state, + IWineD3DVertexShaderImpl *shader, struct vs_compile_args *args) { - args->fog_src = stateblock->state.render_states[WINED3DRS_FOGTABLEMODE] + args->fog_src = state->render_states[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE ? VS_FOG_COORD : VS_FOG_Z; - args->clip_enabled = stateblock->state.render_states[WINED3DRS_CLIPPING] - && stateblock->state.render_states[WINED3DRS_CLIPPLANEENABLE]; + args->clip_enabled = state->render_states[WINED3DRS_CLIPPING] + && state->render_states[WINED3DRS_CLIPPLANEENABLE]; args->swizzle_map = ((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.swizzle_map; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8adcc35..2ce1904 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2853,8 +2853,8 @@ typedef struct IWineD3DVertexShaderImpl { UINT rel_offset; } IWineD3DVertexShaderImpl; -void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, - struct vs_compile_args *args) DECLSPEC_HIDDEN; +void find_vs_compile_args(const struct wined3d_state *state, + IWineD3DVertexShaderImpl *shader, struct vs_compile_args *args) DECLSPEC_HIDDEN; HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl *device, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winmm/tests: Skip tests if MIDI cannot be opened.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: c2224ea8bb1532667c84f68a2f5dd23c94c5b25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2224ea8bb1532667c84f68a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 12:19:34 2010 +0200 winmm/tests: Skip tests if MIDI cannot be opened. --- dlls/winmm/tests/midi.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 891bf70..e1f5104 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -227,6 +227,11 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); + if (rc == MMSYSERR_NOTSUPPORTED) + { + skip( "MIDI out not supported\n" ); + return; + } ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (rc) return; @@ -382,6 +387,11 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); + if (rc == MMSYSERR_NOTSUPPORTED) + { + skip( "MIDI stream not supported\n" ); + return; + } ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (rc) return;

1 0

← Newer
1
2
3
4
5
6
7
8
...
86
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 September 2010