January 2013 - Wine-Commits

Rico Schüller : wineusr: Fix wineusr-configuring.sgml.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: docs Branch: master Commit: 5ceebe607b8d58c416b71edc3c8fb6fd11a08fee URL: http://source.winehq.org/git/docs.git/?a=commit;h=5ceebe607b8d58c416b71edc3… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:37 2013 +0100 wineusr: Fix wineusr-configuring.sgml. --- en/wineusr-configuring.sgml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 2d3fc9c..ddc896e 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -219,14 +219,15 @@ this file is a publicly available DLL or a custom DLL belonging to your program. In the latter case, check that you have installed your program correctly. + </para> <para> Most often applications will assume that a required redistributable package has already been installed and subsequently fail to run when the required dependencies are not met. For example: - <para> - <programlisting>err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found</programlisting> - <para> </para> + <programlisting> + err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found + </programlisting> <para> Redistributable packages which install the necessary runtimes can be obtained through the use of <ulink url="http://wiki.winehq.org/winetricks">

1 0

Rico Schüller : wineusr: Remove frankscorner.org.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: docs Branch: master Commit: 565b95f6e002a4f01f9c21bc4b6a2fabef4f4b90 URL: http://source.winehq.org/git/docs.git/?a=commit;h=565b95f6e002a4f01f9c21bc4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:46 2013 +0100 wineusr: Remove frankscorner.org. --- en/wineusr-bugs.sgml | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 06b48be..b7df91e 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -134,14 +134,6 @@ </listitem> <listitem> <para> - <ulink url="http://www.frankscorner.org">Frank's Corner</ulink> - contains a list of applications and detailed instructions - for setting them up. Further help can be found in the user - forums. - </para> - </listitem> - <listitem> - <para> <ulink url="http://www.google.com">Google</ulink> can be useful depending on how you use it. You may find it helpful to search

1 0

Rico Schüller : winedev: Fix winedev-testing.sgml.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: docs Branch: master Commit: 01e869a3771652ed8c2aa496973515e56c67f347 URL: http://source.winehq.org/git/docs.git/?a=commit;h=01e869a3771652ed8c2aa4969… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:19 2013 +0100 winedev: Fix winedev-testing.sgml. --- en/winedev-testing.sgml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index ccd1020..2f5dcab 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -206,6 +206,7 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures. </para> <para> Run <command>yum install mingw32-gcc</>. + </para> </sect3> <sect3> <title>*BSD</title>

1 0

Jacek Caban : urlmon: Added support for 'Run' setup hook.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 6f4c5f1dd8c350d2c434edf947d50248ab3386f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4c5f1dd8c350d2c434edf94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 14:45:48 2013 +0100 urlmon: Added support for 'Run' setup hook. --- dlls/urlmon/axinstall.c | 132 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9f53ce0..ca1aef6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -142,6 +142,134 @@ static HRESULT setup_dll(install_ctx_t *ctx) return hres; } +static void expand_command(install_ctx_t *ctx, const WCHAR *cmd, WCHAR *buf, size_t *size) +{ + const WCHAR *ptr = cmd, *prev_ptr = cmd; + size_t len = 0, len2; + + static const WCHAR expand_dirW[] = {'%','E','X','T','R','A','C','T','_','D','I','R','%'}; + + while((ptr = strchrW(ptr, '%'))) { + if(buf) + memcpy(buf+len, prev_ptr, ptr-prev_ptr); + len += ptr-prev_ptr; + + if(!strncmpiW(ptr, expand_dirW, sizeof(expand_dirW)/sizeof(WCHAR))) { + len2 = strlenW(ctx->tmp_dir); + if(buf) + memcpy(buf+len, ctx->tmp_dir, len2*sizeof(WCHAR)); + len += len2; + ptr += sizeof(expand_dirW)/sizeof(WCHAR); + }else { + FIXME("Can't expand %s\n", debugstr_w(ptr)); + if(buf) + buf[len] = '%'; + len++; + ptr++; + } + + prev_ptr = ptr; + } + + if(buf) + strcpyW(buf+len, prev_ptr); + *size = len + strlenW(prev_ptr) + 1; +} + +static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) +{ + WCHAR buf[2048], val[2*MAX_PATH]; + const WCHAR *key; + DWORD len; + HRESULT hres; + + static const WCHAR runW[] = {'r','u','n',0}; + + len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(!len) + return S_OK; + + for(key = buf; *key; key += strlenW(key)+1) { + if(!strcmpiW(key, runW)) { + WCHAR *cmd; + size_t size; + + len = GetPrivateProfileStringW(sect_name, runW, NULL, val, sizeof(val)/sizeof(*val), ctx->install_file); + + TRACE("Run %s\n", debugstr_w(val)); + + expand_command(ctx, val, NULL, &size); + + cmd = heap_alloc(size*sizeof(WCHAR)); + if(!cmd) + heap_free(cmd); + + expand_command(ctx, val, cmd, &size); + hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL); + heap_free(cmd); + if(FAILED(hres)) + return hres; + }else { + FIXME("Unsupported hook %s\n", debugstr_w(key)); + return E_NOTIMPL; + } + } + + return S_OK; +} + +static HRESULT install_inf_file(install_ctx_t *ctx) +{ + WCHAR buf[2048], sect_name[128]; + BOOL default_install = TRUE; + const WCHAR *key; + DWORD len; + HRESULT hres; + + static const WCHAR setup_hooksW[] = {'S','e','t','u','p',' ','H','o','o','k','s',0}; + static const WCHAR add_codeW[] = {'A','d','d','.','C','o','d','e',0}; + + len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(len) { + default_install = FALSE; + + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Setup Hooks] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = process_hook_section(ctx, sect_name); + if(FAILED(hres)) + return hres; + } + } + + len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(len) { + FIXME("[Add.Code] section not supported\n"); + + /* Don't throw an error if we successfully ran setup hooks; + installation is likely to be complete enough */ + if(default_install) + return E_NOTIMPL; + } + + if(default_install) { + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } + + return S_OK; +} + static HRESULT install_cab_file(install_ctx_t *ctx) { WCHAR tmp_path[MAX_PATH], tmp_dir[MAX_PATH]; @@ -169,9 +297,7 @@ static HRESULT install_cab_file(install_ctx_t *ctx) switch(ctx->install_type) { case INSTALL_INF: - hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); - if(FAILED(hres)) - WARN("RunSetupCommandW failed: %08x\n", hres); + hres = install_inf_file(ctx); break; case INSTALL_DLL: FIXME("Installing DLL, registering in temporary location\n");

1 0

Andrew Talbot : d3dx9_36: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 1a45569f72336db77e6387898bdaae55fbae6a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a45569f72336db77e6387898… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 3 22:46:48 2013 +0000 d3dx9_36: Avoid signed-unsigned integer comparisons. --- dlls/d3dx9_36/skin.c | 2 +- dlls/d3dx9_36/surface.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 1525f0e..c3857d6 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -83,7 +83,7 @@ static ULONG WINAPI ID3DXSkinInfoImpl_Release(ID3DXSkinInfo *iface) TRACE("%p decreasing refcount to %u\n", This, ref); if (ref == 0) { - int i; + DWORD i; for (i = 0; i < This->num_bones; i++) { HeapFree(GetProcessHeap(), 0, This->bones[i].name); HeapFree(GetProcessHeap(), 0, This->bones[i].vertices); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 999c12e..923f17d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -49,7 +49,7 @@ static const struct static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) { - int i; + unsigned int i; for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) { @@ -62,7 +62,7 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) { - int i; + unsigned int i; for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) { @@ -143,7 +143,7 @@ struct dds_header static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) { - int i; + unsigned int i; static const DWORD known_fourcc[] = { MAKEFOURCC('U','Y','V','Y'), MAKEFOURCC('Y','U','Y','2'), @@ -193,7 +193,7 @@ static const struct { static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { - int i; + unsigned int i; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) { @@ -278,7 +278,7 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_format, D3DFORMAT d3dformat) { - int i; + unsigned int i; memset(pixel_format, 0, sizeof(*pixel_format)); @@ -575,7 +575,7 @@ HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const vo { HRESULT hr; int face; - int mip_level; + UINT mip_level; UINT size; RECT src_rect; UINT src_pitch;

1 0

Jacek Caban : atl: Added support for category maps in AtlModuleRegisterServer.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 732376d5b9c06987dca08c0894806611395fe802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732376d5b9c06987dca08c089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 11:34:15 2013 +0100 atl: Added support for category maps in AtlModuleRegisterServer. --- dlls/atl/atl_main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index f75ecee..2a96369 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -220,6 +220,17 @@ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const hRes = obj->pfnUpdateRegistry(TRUE); /* register */ if (FAILED(hRes)) return hRes; + + if(pM->cbSize > ATLVer1Size) { + const struct _ATL_CATMAP_ENTRY *catmap; + + catmap = ((const _ATL_OBJMAP_ENTRYW*)obj)->pfnGetCategoryMap(); + if(catmap) { + hRes = AtlRegisterClassCategoriesHelper(obj->pclsid, catmap, TRUE); + if(FAILED(hRes)) + return hRes; + } + } } }

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATRIX.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 293f362d559b040cdb04b4b9dca5b95d95c00281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293f362d559b040cdb04b4b9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:02:57 2013 +0100 ddraw: Avoid LPD3DMATRIX. --- dlls/ddraw/ddraw_private.h | 4 +--- include/d3d.h | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ab190ef..ed4cdfc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -563,9 +563,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; -/* This only needs to be here as long the processvertices functionality of - * IDirect3DExecuteBuffer isn't in WineD3D */ -void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; /* Used for generic dumping */ struct flag_info diff --git a/include/d3d.h b/include/d3d.h index 33fbd50..fcd8e31 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -953,8 +953,8 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; - STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE; + STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE; STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; @@ -1051,9 +1051,9 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE; STDMETHOD(GetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, LPDWORD lpdwLightState) PURE; STDMETHOD(SetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, DWORD dwLightState) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; @@ -1170,9 +1170,9 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE; STDMETHOD(GetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, LPDWORD lpdwLightState) PURE; STDMETHOD(SetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, DWORD dwLightState) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; @@ -1304,10 +1304,10 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType,LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE;

1 0

Henri Verbeet : wined3d: Just restore state-> user_stream in wined3d_device_draw_indexed_primitive_strided().
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 44b462c9b4e3d7251e47a5a6a10f6b8b3389b7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b462c9b4e3d7251e47a5a6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:03:01 2013 +0100 wined3d: Just restore state->user_stream in wined3d_device_draw_indexed_primitive_strided(). --- dlls/wined3d/device.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57eb0d2..78997f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4067,13 +4067,6 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT return WINED3DERR_INVALIDCALL; } - /* The index buffer is not needed here, but restore it, otherwise it is hell to keep track of */ - if (device->stateBlock->state.user_stream) - { - device_invalidate_state(device, STATE_INDEXBUFFER); - device->stateBlock->state.user_stream = FALSE; - } - if (device->stateBlock->state.load_base_vertex_index) { device->stateBlock->state.load_base_vertex_index = 0; @@ -4108,12 +4101,6 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - if (device->stateBlock->state.user_stream) - { - device_invalidate_state(device, STATE_INDEXBUFFER); - device->stateBlock->state.user_stream = FALSE; - } - if (!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && device->stateBlock->state.load_base_vertex_index != device->stateBlock->state.base_vertex_index) { @@ -4180,6 +4167,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic device->up_strided = strided_data; draw_primitive(device, 0, index_count, 0, 0, TRUE, index_data); device->up_strided = NULL; + device->stateBlock->state.user_stream = FALSE; device->stateBlock->state.index_format = prev_idx_format; device_invalidate_state(device, STATE_VDECL);

1 0

Henri Verbeet : wined3d: Don't touch state-> user_stream in wined3d_device_process_vertices().
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: b557f5ba3ad84e1c0f673160f7a7fb2dbf27add5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b557f5ba3ad84e1c0f673160f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:03:00 2013 +0100 wined3d: Don't touch state->user_stream in wined3d_device_process_vertices(). device_stream_info_from_declaration() no longer cares about state->user_stream. --- dlls/wined3d/device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8852472..57eb0d2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3575,7 +3575,6 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_state *state = &device->stateBlock->state; struct wined3d_stream_info stream_info; const struct wined3d_gl_info *gl_info; - BOOL streamWasUP = state->user_stream; struct wined3d_context *context; struct wined3d_shader *vs; unsigned int i; @@ -3593,14 +3592,9 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, context = context_acquire(device, NULL); gl_info = context->gl_info; - /* ProcessVertices reads from vertex buffers, which have to be assigned. - * DrawPrimitive and DrawPrimitiveUP control the streamIsUP flag, thus - * restore it afterwards. */ vs = state->vertex_shader; state->vertex_shader = NULL; - state->user_stream = FALSE; device_stream_info_from_declaration(device, &stream_info); - state->user_stream = streamWasUP; state->vertex_shader = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into

1 0

Vincent Povirk : winex11.drv: Select property change events on selection request windows.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 4013dc85e90e1124489b4055194fa789adcbca2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4013dc85e90e1124489b40551… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 3 16:59:14 2013 -0600 winex11.drv: Select property change events on selection request windows. --- dlls/winex11.drv/clipboard.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e2f5b12..1da3a22 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -262,7 +262,11 @@ static Window thread_selection_wnd(void) w = XCreateWindow(thread_data->display, root_window, 0, 0, 1, 1, 0, CopyFromParent, InputOnly, CopyFromParent, 0, NULL); if (w) + { thread_data->selection_wnd = w; + + XSelectInput(thread_data->display, w, PropertyChangeMask); + } else FIXME("Failed to create window. Fetching selection data will fail.\n"); }

1 0