May 2009 - Wine-Commits - list.winehq.org

Aric Stewart : msctf: Define compartment guids.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 4ada967d16ffdc2806c6796e7057ff000201d87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ada967d16ffdc2806c6796e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 28 15:01:19 2009 -0500 msctf: Define compartment guids. --- dlls/uuid/uuid.c | 9 +++++++++ include/msctf.idl | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 35d4ae8..840a346 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -118,3 +118,12 @@ DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_DISABLED, 0x71a5b253,0x1951,0x466b,0x9f,0xbc,0x9c,0x88,0x08,0xfa,0x84,0xf2); +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, 0x58273aad,0x01bb,0x4164,0x95,0xc6,0x75,0x5b,0xa0,0xb5,0x16,0x2d); +DEFINE_GUID(GUID_COMPARTMENT_HANDWRITING_OPENCLOSE, 0xf9ae2c6b,0x1866,0x4361,0xaf,0x72,0x7a,0xa3,0x09,0x48,0x89,0x0e); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_DISABLED, 0x56c5c607,0x0703,0x4e59,0x8e,0x52,0xcb,0xc8,0x4e,0x8b,0xbe,0x35); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544d6a63,0xe2e8,0x4752,0xbb,0xd1,0x00,0x09,0x60,0xbc,0xa0,0x83); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_GLOBALSTATE, 0x2a54fe8e,0x0d08,0x460c,0xa7,0x5d,0x87,0x03,0x5f,0xf4,0x36,0xc5); +DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xae,0x5d,0x91,0xa0,0x1a,0x1f,0x75,0x92); +DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); +DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); diff --git a/include/msctf.idl b/include/msctf.idl index fc87c0a..0a441a6 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -33,6 +33,17 @@ cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") +/* GUIDs for Compartments */ +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_DISABLED;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_OPENCLOSE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_HANDWRITING_OPENCLOSE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_SPEECH_DISABLED;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_SPEECH_OPENCLOSE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_SPEECH_GLOBALSTATE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_PERSISTMENUENABLED;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_EMPTYCONTEXT;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_TIPUISTATUS;") + /* GUIDs for Categories */ cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_KEYBOARD;") cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_SPEECH;")

1 0

Henri Verbeet : d3d9: Having a NULL rendertarget isn't a failure.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 59268f792413e69081502f22d33b9cea55c6880d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59268f792413e69081502f22d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 d3d9: Having a NULL rendertarget isn't a failure. --- dlls/d3d9/device.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e5ca4c4..9508ff5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -851,8 +851,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9EX iface, DWORD RenderTargetIndex, IDirect3DSurface9 **ppRenderTarget) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr = D3D_OK; IWineD3DSurface *pRenderTarget; + HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -863,13 +863,20 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9EX EnterCriticalSection(&d3d9_cs); hr=IWineD3DDevice_GetRenderTarget(This->WineD3DDevice,RenderTargetIndex,&pRenderTarget); - if (hr == D3D_OK && pRenderTarget != NULL) { - IWineD3DSurface_GetParent(pRenderTarget,(IUnknown**)ppRenderTarget); - IWineD3DSurface_Release(pRenderTarget); - } else { - FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); + if (FAILED(hr)) + { + FIXME("Call to IWineD3DDevice_GetRenderTarget failed, hr %#x\n", hr); + } + else if (!pRenderTarget) + { *ppRenderTarget = NULL; } + else + { + IWineD3DSurface_GetParent(pRenderTarget, (IUnknown **)ppRenderTarget); + IWineD3DSurface_Release(pRenderTarget); + } + LeaveCriticalSection(&d3d9_cs); return hr;

1 0

Gerald Pfeifer : user32/tests: Remove unused SAME macro.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: bb902d68101fcb4a44f4c61d000f4b7c6e2849b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb902d68101fcb4a44f4c61d0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 28 23:22:06 2009 +0200 user32/tests: Remove unused SAME macro. --- dlls/user32/tests/text.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index a55c014..080e5dd 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -28,7 +28,6 @@ #include "winerror.h" #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) -#define SAME(rect) (rect.left = 10 && rect.right == 100 && rect.top == 10 && rect.bottom == 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) static void test_DrawTextCalcRect(void)

1 0

Stefan Dösinger : wined3d: Use DP2A or X2D for dp2add if available.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: da7176be2a9712737a531f1c661a9346c49fdd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7176be2a9712737a531f1c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 28 17:27:54 2009 +0200 wined3d: Use DP2A or X2D for dp2add if available. --- dlls/wined3d/arb_program_shader.c | 48 ++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1713302..0b188b7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1020,19 +1020,51 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); - shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - /* Emulate a DP2 with a DP3 and 0.0. Don't use the dest as temp register, it could be src[1] or src[2] - * src_name[0] can be TA, but TA is a private temp for modifiers, so it is save to overwrite - */ - shader_addline(buffer, "MOV TA, %s;\n", src_name[0]); - shader_addline(buffer, "MOV TA.z, 0.0;\n"); - shader_addline(buffer, "DP3 TA, TA, %s;\n", src_name[1]); - shader_addline(buffer, "ADD%s %s, TA, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[2]); + if(ctx->target_version >= NV3) + { + /* GL_NV_fragment_program2 has a 1:1 matching instruction */ + shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); + shader_addline(buffer, "DP2A%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[0], src_name[1], src_name[2]); + } + else if(ctx->target_version >= NV2) + { + /* dst.x = src2.?, src0.x, src1.x + src0.y * src1.y + * dst.y = src2.?, src0.x, src1.z + src0.y * src1.w + * dst.z = src2.?, src0.x, src1.x + src0.y * src1.y + * dst.z = src2.?, src0.x, src1.z + src0.y * src1.w + * + * Make sure that src1.zw = src1.xy, then we get a classic dp2add + * + * .xyxy and other swizzles that we could get with this are not valid in + * plain ARBfp, but luckily the NV extension grammar lifts this limitation. + */ + struct wined3d_shader_src_param tmp_param = ins->src[1]; + DWORD swizzle = tmp_param.swizzle & 0xf; /* Selects .xy */ + tmp_param.swizzle = swizzle | (swizzle << 4); /* Creates .xyxy */ + + shader_arb_get_src_param(ins, &tmp_param, 1, src_name[1]); + + shader_addline(buffer, "X2D%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[2], src_name[0], src_name[1]); + } + else + { + shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); + /* Emulate a DP2 with a DP3 and 0.0. Don't use the dest as temp register, it could be src[1] or src[2] + * src_name[0] can be TA, but TA is a private temp for modifiers, so it is save to overwrite + */ + shader_addline(buffer, "MOV TA, %s;\n", src_name[0]); + shader_addline(buffer, "MOV TA.z, 0.0;\n"); + shader_addline(buffer, "DP3 TA, TA, %s;\n", src_name[1]); + shader_addline(buffer, "ADD%s %s, TA, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[2]); + } } /* Map the opcode 1-to-1 to the GL code */

1 0

Stefan Dösinger : wined3d: Avoid the TMP_COLOR mov in some cases.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: d8e219be752b7ac162a89fa038b5ad24594fe2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e219be752b7ac162a89fa03… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 15:53:52 2009 +0200 wined3d: Avoid the TMP_COLOR mov in some cases. Many 2.0 and 3.0 shaders end with a "mov oC0, rx". If sRGB writing is enabled, the ARB backend writes to a TMP_COLOR temporary, and at the end of the shader writes the sRGB corrected color to result.color. If oC0 is not partially rewritten after the mov, we can ignore the mov, not declare TMP_COLOR at all, and just use the rx register as input for the sRGB correction code. This saves a temporary and an instruction. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++------ dlls/wined3d/baseshader.c | 33 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0b188b7..0b6bb35 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1130,12 +1130,13 @@ static void shader_hw_nop(const struct wined3d_shader_instruction *ins) static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; + BOOL pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; SHADER_BUFFER *buffer = ins->ctx->buffer; char src0_param[256]; if(ins->handler_idx == WINED3DSIH_MOVA) { - struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; struct wined3d_shader_src_param tmp_src = ins->src[0]; char write_mask[6]; @@ -1188,6 +1189,16 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } } + else if(ins->dst[0].reg.type == WINED3DSPR_COLOROUT && ins->dst[0].reg.idx == 0 && pshader) + { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) shader; + if(ctx->cur_ps_args->super.srgb_correction && ps->color0_mov) + { + shader_addline(buffer, "#mov handled in srgb write code\n"); + return; + } + shader_hw_map2gl(ins); + } else { shader_hw_map2gl(ins); @@ -2022,7 +2033,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; const local_constant *lconst; GLuint retval; - const char *fragcolor; + char fragcolor[16]; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; @@ -2065,13 +2076,17 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, if (reg_maps->shader_version.major < 2) { - fragcolor = "R0"; + strcpy(fragcolor, "R0"); } else { if(args->super.srgb_correction) { - shader_addline(buffer, "TEMP TMP_COLOR;\n"); - fragcolor = "TMP_COLOR"; + if(This->color0_mov) { + sprintf(fragcolor, "R%u", This->color0_reg); + } else { + shader_addline(buffer, "TEMP TMP_COLOR;\n"); + strcpy(fragcolor, "TMP_COLOR"); + } } else { - fragcolor = "result.color"; + strcpy(fragcolor, "result.color"); } } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2ace72a..9dcdbe6 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -588,6 +588,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 else { int i, limit; + BOOL color0_mov = FALSE; /* This will loop over all the registers and try to * make a bitmask of the ones we're interested in. @@ -612,6 +613,11 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } else { + if(pshader && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This; + ps->color0_mov = FALSE; + } shader_record_register_usage(This, reg_maps, &dst_param.reg, pshader); } @@ -651,6 +657,22 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->bumpmat[dst_param.reg.idx] = TRUE; } + else if(pshader && ins.handler_idx == WINED3DSIH_MOV) + { + /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to + * COLOROUT 0. If we know this in advance, the ARB shader backend can skip + * the mov and perform the sRGB write correction from the source register. + * + * However, if the mov is only partial, we can't do this, and if the write + * comes from an instruction other than MOV it is hard to do as well. If + * COLOROUT 0 is overwritten partially later, the marker is dropped again + */ + if(dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + { + /* Used later when the source register is read */ + color0_mov = TRUE; + } + } } if (ins.handler_idx == WINED3DSIH_NRM) @@ -686,6 +708,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); --count; } + + if(color0_mov) + { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This; + if(src_param.reg.type == WINED3DSPR_TEMP && + src_param.swizzle == WINED3DSP_NOSWIZZLE) + { + ps->color0_mov = TRUE; + ps->color0_reg = src_param.reg.idx; + } + } } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e0eae7..8b7bff8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2711,6 +2711,10 @@ typedef struct IWineD3DPixelShaderImpl { unsigned char numbumpenvmatconsts; struct stb_const_desc luminanceconst[MAX_TEXTURES]; char vpos_uniform; + + BOOL color0_mov; + DWORD color0_reg; + } IWineD3DPixelShaderImpl; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl;

1 0

Henri Verbeet : wined3d: Remove ResourceReleased() from the public device interface.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 5e0f54162168fcbf8a77eedc2fc478f8e3bb9468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0f54162168fcbf8a77eedc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 wined3d: Remove ResourceReleased() from the public device interface. --- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/resource.c | 5 +---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 3 --- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b022755..2b4a461 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7786,23 +7786,21 @@ static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResour list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } -static void IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - +static void device_resource_remove(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +{ TRACE("(%p) : Removing resource %p\n", This, resource); list_remove(&((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } - -static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IWineD3DResource *resource){ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; +void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +{ WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource); int counter; TRACE("(%p) : resource %p\n", This, resource); - context_resource_released(iface, resource, type); + context_resource_released((IWineD3DDevice *)This, resource, type); switch (type) { /* TODO: check front and back buffers, rendertargets etc.. possibly swapchains? */ @@ -7917,7 +7915,7 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW /* Remove the resource from the resourceStore */ - IWineD3DDeviceImpl_RemoveResource(iface, resource); + device_resource_remove(This, resource); TRACE("Resource released\n"); @@ -8089,7 +8087,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_UpdateSurface, IWineD3DDeviceImpl_GetFrontBufferData, /*** object tracking ***/ - IWineD3DDeviceImpl_ResourceReleased, IWineD3DDeviceImpl_EnumResources }; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 807240b..658a735 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -96,10 +96,7 @@ void resource_cleanup(IWineD3DResource *iface) This->resource.allocatedMemory = 0; This->resource.heapMemory = 0; - if (This->resource.wineD3DDevice != NULL) { - IWineD3DDevice_ResourceReleased((IWineD3DDevice *)This->resource.wineD3DDevice, iface); - }/* NOTE: this is not really an error for system memory resources */ - return; + if (This->resource.wineD3DDevice) device_resource_released(This->resource.wineD3DDevice, iface); } HRESULT resource_get_device(IWineD3DResource *iface, IWineD3DDevice** ppDevice) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cac748c..f062c97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1578,6 +1578,7 @@ struct IWineD3DDeviceImpl extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl; +void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource); void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup); void device_stream_info_from_strided(IWineD3DDeviceImpl *This, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 48938cb..51d886c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3468,9 +3468,6 @@ interface IWineD3DDevice : IWineD3DBase [in] UINT swapchain_idx, [in] IWineD3DSurface *dst_surface ); - void ResourceReleased( - [in] IWineD3DResource *resource - ); HRESULT EnumResources( [in] D3DCB_ENUMRESOURCES callback, [in] void *data

1 0

Gerald Pfeifer : gphoto2.ds: Only provide GPHOTO2_StrDup() when we have HAVE_GPHOTO2.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 96929d151ec5ddc162131d8bd4618371886588bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=96929d151ec5ddc162131d8bd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 28 21:25:35 2009 +0200 gphoto2.ds: Only provide GPHOTO2_StrDup() when we have HAVE_GPHOTO2. --- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index ab4f392..5d80d4c 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -37,12 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +#ifdef HAVE_GPHOTO2 static char* GPHOTO2_StrDup(const char* str) { char* dst = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); strcpy(dst, str); return dst; } +#endif static void load_filesystem(const char *folder) {

1 0

Alexandre Julliard : rpcrt4/tests: Remove tests for v1 memory list, the layout is wrong and we don't care about it anyway.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 05f57146c87d63a9cdee502df3818ef8b6997b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f57146c87d63a9cdee502df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 20:18:34 2009 +0200 rpcrt4/tests: Remove tests for v1 memory list, the layout is wrong and we don't care about it anyway. --- dlls/rpcrt4/tests/ndr_marshall.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 1cf432f..a4f8bb4 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1313,12 +1313,6 @@ static void test_ndr_allocate(void) MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc; void *p1, *p2; - struct tag_mem_list_v1_t - { - DWORD magic; - void *ptr; - struct tag_mem_list_v1_t *next; - } *mem_list_v1; struct tag_mem_list_v2_t { DWORD magic; @@ -1331,7 +1325,6 @@ static void test_ndr_allocate(void) StubDesc = Object_StubDesc; NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0); - ok(StubMsg.pMemoryList == NULL, "memlist %p\n", StubMsg.pMemoryList); my_alloc_called = my_free_called = 0; p1 = NdrAllocate(&StubMsg, 10); p2 = NdrAllocate(&StubMsg, 24); @@ -1358,21 +1351,7 @@ static void test_ndr_allocate(void) ok(mem_list_v2->next == NULL, "next %p\n", mem_list_v2->next); } } - else - { - trace("v1 mem list format\n"); - mem_list_v1 = StubMsg.pMemoryList; - ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic); - ok(mem_list_v1->ptr == p2, "ptr != p2\n"); - ok(mem_list_v1->next != NULL, "next NULL\n"); - mem_list_v1 = mem_list_v1->next; - if(mem_list_v1) - { - ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic); - ok(mem_list_v1->ptr == p1, "ptr != p1\n"); - ok(mem_list_v1->next == NULL, "next %p\n", mem_list_v1->next); - } - } + else win_skip("v1 mem list format\n"); } /* NdrFree isn't exported so we can't test free'ing */ }

1 0

Alexandre Julliard : wininet: Add a critical section to protect the read-ahead buffer.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 5c227a9d8adeb2541008ef50ac99aa5dba114041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c227a9d8adeb2541008ef50a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 23:01:28 2009 +0200 wininet: Add a critical section to protect the read-ahead buffer. --- dlls/wininet/http.c | 91 +++++++++++++++++++++++++++++++++++------------ dlls/wininet/internet.h | 6 ++- 2 files changed, 72 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c227a9d8adeb2541008e…

1 0

Alexandre Julliard : rpcrt4/tests: Mark some stub message tests broken for older Windows versions.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 03b6dcb4a1254e3ae1b707bdb17195b8cad6286a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b6dcb4a1254e3ae1b707bdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 20:10:15 2009 +0200 rpcrt4/tests: Mark some stub message tests broken for older Windows versions. Group the common tests in a function shared between client and server. --- dlls/rpcrt4/tests/ndr_marshall.c | 269 ++++++++++++++++---------------------- 1 files changed, 112 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03b6dcb4a1254e3ae1b70…

1 0