September 2013 - Wine-devel

Re: [PATCH 4/5] wined3d: Move the decoded stream info into the context
by Henri Verbeet 09 Sep '13

09 Sep '13

On 9 September 2013 12:56, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- I think this patch does a couple of things at once, and would probably benefit from being broken up. > static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *shader, > - const struct arb_vs_compile_args *args, > + const struct wined3d_context *context, const struct arb_vs_compile_args *args, > const struct wined3d_shader_signature_element *ps_input_sig) I think it makes more sense to pass a wined3d_stream_info structure here instead of a context, or perhaps even just the use_map field. > -static BOOL buffer_find_decl(struct wined3d_buffer *This) > +static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_context *context) Same. > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 23d32c2..f7ded75 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -1086,6 +1086,7 @@ struct wined3d_context > DWORD padding : 1; > DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ > DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ > + DWORD use_draw_strided_slow : 1; > DWORD shader_update_mask; > DWORD constant_update_mask; > DWORD numbered_array_mask; I think that's an unfortunate place to insert the field, and you should update the padding. > @@ -1880,9 +1889,7 @@ struct wined3d_device > WORD d3d_initialized : 1; > WORD inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ > WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ > - WORD useDrawStridedSlow : 1; > WORD filter_messages : 1; > - WORD padding : 8; Padding?

3 3

Re: [PATCH 5/5] wined3d: Explicitly pass the state information to buffer_internal_preload
by Henri Verbeet 09 Sep '13

09 Sep '13

On 9 September 2013 12:56, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > -static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_context *context) > +static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_context *context, > + const struct wined3d_state *state) buffer_find_decl() doesn't really care about the context state, it's really just about determining what fixups it should check for, and should probably be passed a mask instead.

1 0

Re: [PATCH 1/5] wined3d: Don't mess with the device in buffer_create_buffer_object
by Henri Verbeet 09 Sep '13

09 Sep '13

On 9 September 2013 12:56, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -148,7 +149,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc > } > > if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) > - device_invalidate_state(This->resource.device, STATE_INDEXBUFFER); > + context_invalidate_state(context, STATE_INDEXBUFFER); > GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); > error = gl_info->gl_ops.gl.p_glGetError(); > if (error != GL_NO_ERROR) The patch is fine, although I probably would have preferred something along the lines of "Only invalidate STATE_INDEXBUFFER for the current context in buffer_create_buffer_object()." for the commit message.

1 0

Re: [PATCH 1/6] ws2_32: Mark WinNT result as broken
by Marvin 09 Sep '13

09 Sep '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2061 Your paranoid android. === wxppro (32 bit sock) === sock.c:519: Test failed: oob_server (7e0): unexpectedly at the OOB mark: 0

2 1

Re: [PATCH 6/6] ws2_32: Fill WSAPROTOCOL_INFO struct in WSADuplicateSocket
by Marvin 08 Sep '13

08 Sep '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2065 Your paranoid android. === wxppro (32 bit sock) === sock.c:509: Test failed: oob_server (f0): unexpectedly at the OOB mark: 0 sock.c:519: Test failed: oob_server (f0): unexpectedly at the OOB mark: 0

1 0

Implementation of ITextDocument_fnOpen needs some advice
by Jactry Zeng 08 Sep '13

08 Sep '13

Hi folks, I need your advice or comment! Implement ITextDocument_fnOpen[0] (riched20) is a part of work to my GSoC. The 'pencils down' date is coming. And I think it is time to clear the code up. This series of patches is the implementation of ITextDocument_fnOpen. I would like to improve it to be enough good for sending to wine-patches and being accepted. I split the implementation into six patches: - patch 0001 is just a simple implementation; - patch 0002 added the creation mode to let it support these parameters: tomCreateNew, tomCreateAlways, tomOpenExisting, tomOpenAlways, tomTruncateExisting; - patch 0003 added the access mode to let support tomReadOnly and any combination of tomReadOnly and tomShareDenyRead, tomShareDenyWrite, tomPasteFile; - patch 0004 added the support of RTF - patch 0005 added tomPasteFile support - patch 0006 added a UTF-16 support, with this patch you can open a UTF-6 text file without dependence of the long CodePage parameter. If you want to open a utf-8 text file with it, you may need these patch to fix a bug of EM_SETTEXTEX: http://source.winehq.org/patches/data/98574 http://source.winehq.org/patches/data/98575 http://source.winehq.org/patches/data/98576 http://source.winehq.org/patches/data/98577 I appreciate for any comment! :) Thank you. ** Thanks my mentor Huw and Qian Hong for giving me a lot good advice. Thanks other people for help! ** [0] http://msdn.microsoft.com/en-us/library/windows/desktop/bb774093(v=vs.85).a… -- Regards, Jactry Zeng

1 0

Re: [PATCH 5/6] ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 4)
by Marvin 08 Sep '13

08 Sep '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2064 Your paranoid android. === wxppro (32 bit sock) === sock.c:519: Test failed: oob_server (ec): unexpectedly at the OOB mark: 0 === w7pro64 (32 bit sock) === sock.c:528: Test failed: oob_server (3a4): not at the OOB mark: 1

1 0

Re: [PATCH 4/6] ws2_32: Add more WSADuplicateSocket tests
by Marvin 08 Sep '13

08 Sep '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2063 Your paranoid android. === wxppro (32 bit sock) === sock.c:519: Test failed: oob_server (b0): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 71AB8D62 === w7pro64 (32 bit sock) === sock.c:519: Test failed: oob_server (138): unexpectedly at the OOB mark: 0 sock.c:768: sock.c:288: Test failed: do_synchronous_recv (138): error 10054: sock.c:534: Test failed: oob_server (138): not at the OOB mark: 1 === w7pro64 (64 bit sock) === sock.c:528: Test failed: oob_server (ab8): not at the OOB mark: 1

1 0

Re: [PATCH 3/6] ws2_32: Fix parameters checking in WSADuplicateSocket
by Marvin 08 Sep '13

08 Sep '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2062 Your paranoid android. === wxppro (32 bit sock) === sock.c:509: Test failed: oob_server (b0): unexpectedly at the OOB mark: 0 sock.c:519: Test failed: oob_server (b0): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 71AB8D62

1 0

Patch for bug 34388
by Charles Davis 07 Sep '13

07 Sep '13

Hi Juan, I need some advice. Attached is a patch to fix bug 34388, where an app that tries to verify its code signature fails because Wine, while parsing the certificates embedded within the signature, encounters an item in the CMS signer info (tag 0x31, i.e. ASN_UNIVERSAL | ASN_CONSTRUCTOR | 0x11), right before the HashEncryptionAlgorithm sequence item, that it doesn't yet know how to decode. This patch (which just skips the item in question) allows that app to successfully verify its code signature and run, but... My testing on Windows (cf. job 2037 on newtestbot) shows some interesting behavior. Windows will indeed accept this item, but only if the AuthAttrs item is also present and immediately precedes it in the sequence. (The other test bails out with CRYPT_E_ASN_BADTAG.) I don't quite know what to make of this. The odd thing is that the certificate in question doesn't have this optional AuthAttrs item, and yet (in most cases, at least) most people who run this particular app on Windows do not have this problem. I can't seem to find anything about this from reading the relevant RFCs. Is there something I'm missing? Thanks. Chip

2 5