- wine-devel - winehq.org

Re: [PATCH 3/3] riched20: Add UTF8 support for EM_SETTEXTEX. (try 5)
by Alexandre Julliard 13 Sep '13

13 Sep '13

Jactry Zeng <jactry92(a)gmail.com> writes: > @@ -3313,6 +3315,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > len = lParam ? strlen((char *)lParam) : 0; > } > } else { > + if(bUTF8) { > + lParam = lParam + 3; > + pStruct->codepage = CP_UTF8; > + } That struct belongs to the caller, you can't change it. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: fonts: Add some box-type glyphs to wingdings.
by Huw Davies 13 Sep '13

13 Sep '13

On Fri, Sep 13, 2013 at 11:07:19AM +0100, Huw Davies wrote: > --- > fonts/wingding.sfd | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Please ignore this one and use 'try 2'. I had the points of one glyph selected in the outline editor which apparently gets saved to the .sfd . Huw.

1 0

Re: ntdll: Add a file access test.
by Nikolay Sivov 13 Sep '13

13 Sep '13

On 9/13/2013 11:20, Dmitry Timoshkov wrote: > This test passes under Wine and shows that ReadFile after CreateFile(GENERIC_WRITE) > is really supposed to fail. > --- > dlls/ntdll/tests/file.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 82 insertions(+) > It looks like it belongs to kernel32/tests.

3 4

Re: ntdll/tests: Fix compilation on systems that don't support nameless unions. (rediffed)
by Dmitry Timoshkov 13 Sep '13

13 Sep '13

Francois Gouget <fgouget(a)free.fr> wrote: > That tree was a bit out of date causing the patch to fail to apply. I > updated it and rediffed. I'd appreciate if you could postpone sending this sort of patches when they could conflict with other pending patches in that area. Thanks. -- Dmitry.

1 0

Re: [1/2] ntdll: Properly handle 0-length reads. Resend.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > This matches what NtWriteFile does. > > I assume that this patch is in 'pending' state because of a test failure caused > by 2/2, if the reason is different - please let me know. It would need some test cases for other file types. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll/tests: Fix compilation on systems that don't support nameless unions.
by Marvin 13 Sep '13

13 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=2144 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [try3] gdi32: abc values remain the same despite any changes in layout direction or Viewport
by Alexandre Julliard 12 Sep '13

12 Sep '13

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -1262,6 +1290,70 @@ static void test_GetCharABCWidths(void) > } > > ReleaseDC(NULL, hdc); > + > + memset(&lf, 0, sizeof(lf)); > + strcpy(lf.lfFaceName, "Tahoma"); > + lf.lfHeight = 20; > + > +#define helper_ABC(a) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : helper_ABCWidths(hdc, glyphs, abc, abcw, abcf, a) Please avoid that sort of macro. You can pass a description string, or simply print the current extents in the helper function, so that we can figure out the failing code without relying on line numbers. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3d9/tests: D3DCMP_GREATER is broken on r500 (try 2).
by Marvin 12 Sep '13

12 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=2136 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/6] user32: Export WINPOS_GetMinMaxInfo() as __wine_get_min_max_info() so it can be called by drivers.
by Dmitry Timoshkov 12 Sep '13

12 Sep '13

Ken Thomases <ken(a)codeweavers.com> wrote: > +@ cdecl __wine_get_min_max_info(long ptr ptr ptr ptr) WINPOS_GetMinMaxInfo What's wrong with calling SendMessage(WM_GETMINMAXINFO) from the driver? -- Dmitry.

2 3

Re: [PATCH 5/5] d3d9/tests: D3DCMP_GREATER is broken on r500.
by Henri Verbeet 12 Sep '13

12 Sep '13

On 12 September 2013 12:23, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + * On the r500 driver on Windows D3DCMP_GREATER and D3DCMP_GREATEREQUAL are broken for depth > + * values > 0.5. The range appears to be distored, apparently an incoming value of ~0.875 is "distorted"?

2 3

Re: [2/2] kernel32: Remove a 0-length read optimization from ReadFile.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > This matches WriteFile behaviour and ensures that invalid parameters are > properly handled and fields in the OVERLAPPED structure are initialized. This is again causing test failures. Please do a full test run before sending patches. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [1/2] ntdll: Properly handle 0-length reads.
by Marvin 12 Sep '13

12 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=2127 Your paranoid android. === wxppro (32 bit comm) === comm.c:863: Test failed: WaitCommEvent failed with a timeout comm.c:875: recovering after WAIT_TIMEOUT... comm.c:886: Test failed: WaitCommEvent error 0 comm.c:888: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:892: WaitCommEvent for EV_TXEMPTY took 1000 ms (timeout 1000) comm.c:894: Test failed: WaitCommEvent used 1000 ms for waiting === w7pro64 (32 bit comm) === comm.c:863: Test failed: WaitCommEvent failed with a timeout comm.c:875: recovering after WAIT_TIMEOUT... comm.c:886: Test failed: WaitCommEvent error 0 comm.c:888: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:892: WaitCommEvent for EV_TXEMPTY took 1014 ms (timeout 1000) comm.c:894: Test failed: WaitCommEvent used 1014 ms for waiting comm.c:1561: test_AbortWaitCts timeout 500 handle 000000F8 comm.c:1528: Changing CommMask on the fly for handle 000000F8 after timeout 500

2 1

Re: ws2_32/tests: Add more WSASocket tests
by Marvin 12 Sep '13

12 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=2126 Your paranoid android. === wxppro (32 bit sock) === sock.c:519: Test failed: oob_server (7e4): unexpectedly at the OOB mark: 0

1 0

Re: [try3] gdi32: abc values remain the same despite any changes in layout direction or Viewport
by Aric Stewart 12 Sep '13

12 Sep '13

Alexandre, Do you want me to rewrite this patch with your new width_to_LP helper function or are you going to do that rewrite yourself? (assuming it is acceptable in other ways) thanks! -aric

1 0

Re: kernel32/tests: Add tests for ResolveDelayLoadedAPI (try3)
by Marvin 11 Sep '13

11 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=2121 Your paranoid android. === wvista (32 bit loader) === loader.c:2056: Test failed: WaitForSingleObject failed: 102 loader.c:2058: Test failed: expected exit code 199, got 259 loader.c:2077: Test failed: expected 198, got 199

1 0

Re: [PATCH 4/5] ddraw: Avoid LPVOID.
by Marvin 11 Sep '13

11 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=2112 Your paranoid android. === wxppro (32 bit d3d) === d3d.c:1260: Test failed: Homogeneous output was generated despite UNCLIPPED flag === wvista (32 bit d3d) === d3d.c:1260: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w7pro64 (32 bit d3d) === d3d.c:1260: Test failed: Homogeneous output was generated despite UNCLIPPED flag

2 1

Re: wininet: Don't assume that end of chunk means end of stream.
by Jacek Caban 11 Sep '13

11 Sep '13

Hi Hans, On 09/11/13 13:50, Hans Leidekker wrote: > static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) > { > - /* Allow reading only from read buffer */ > + chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; > + DWORD res; > + > + if(!chunked_stream->chunk_size || chunked_stream->chunk_size == ~0u) { > + res = start_next_chunk(chunked_stream, req); > + if(res != ERROR_SUCCESS) > + return 0; > + } start_next_chunk may block and we don't want chunked_get_avail_data to block. Jacek

2 4

Re: ws2_32: Fix WSADuplicateSocket implementation
by Marvin 11 Sep '13

11 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=2119 Your paranoid android. === w7pro64 (32 bit sock) === sock.c:528: Test failed: oob_server (a8c): not at the OOB mark: 1

1 0

RFC: HKCR merge implementation
by George Stephanos 11 Sep '13

11 Sep '13

I'm proposing my HKEY_CLASSES_ROOT implementation patches for review. Feel free to comment. So far, I've written code for all functions except for the RegEnum family. General description: HKCR handles are special. All wine handles have the two lowest bits zero'd. HKCR handles are masked. 10b specifically. They have their own table separate from the generic handle table. An HKCR handle has an HKCU handle and an HKLM handle below it. Access mask and a string representing the path are also needed since the handle has to attempt to reopen previously failed openings at certain stages. First patch: specially handles HKCR handles WITHOUT affecting the general behavior. The end result is still the exact same. Patch provides a foundation for the rest. Second patch: added path management Third patch: added HKCU Here's a quick description of each function: create_hkcr_struct: allocates the memory needed for the struct, adds it to the table and gives back a pointer to it get_hkcr_path: given an HKCR handle and a subkey string, prepares a subkey string representing the same subkey rooted at HKLM/HKCU. create_hkcr: RegCreateKeyEx open_hkcr: RegOpenKeyEx resolve_hkcr: checks the HKCR handle, tries to reopen previously failed internal handles, gives back HKCU first if available then HKLM close_hkcr: deallocates path and struct, removes struct from table. http://pastie.org/8314658 http://pastie.org/8314662 http://pastie.org/8314663

3 3

Re: [PATCH 2/2] d3d11.idl: Added some missing declarations.
by Henri Verbeet 11 Sep '13

11 Sep '13

On 11 September 2013 12:09, Jacek Caban <jacek(a)codeweavers.com> wrote: > +typedef enum D3D11_RESOURCE_MISC_FLAG > +{ > + D3D11_RESOURCE_MISC_GENERATE_MIPS = 0x00000001, > + D3D11_RESOURCE_MISC_SHARED = 0x00000002, > + D3D11_RESOURCE_MISC_TEXTURECUBE = 0x00000004, > + D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS = 0x00000010, > + D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS = 0x00000020, > + D3D11_RESOURCE_MISC_BUFFER_STRUCTURED = 0x00000040, > + D3D11_RESOURCE_MISC_RESOURCE_CLAMP = 0x00000080, > + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX = 0x00000100, > + D3D11_RESOURCE_MISC_GDI_COMPATIBLE = 0x00000200, > + D3D11_RESOURCE_MISC_SHARED_NTHANDLE = 0x00000800, > + D3D11_RESOURCE_MISC_RESTRICTED_CONTENT = 0x00001000, > + D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE = 0x00002000, > + D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x00004000, > + D3D11_RESOURCE_MISC_GUARDED = 0x00008000 > +} D3D11_RESOURCE_MISC_FLAG; Arguably those should be __MSABI_LONG, although we may not care enough. We certainly aren't very consistent about it in a lot of other places either.

3 2

riched20/tests: Add tests for ITextDocument_Save. (try 2)
by Jactry Zeng 11 Sep '13

11 Sep '13

Update: Add todo_wine

1 0

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

11 Sep '13

On 11 September 2013 11:31, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -1880,9 +1888,8 @@ 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; > + WORD padding : 1; I don't think that's quite right.

2 2

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

11 Sep '13

On 11 September 2013 11:31, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > - /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ > - if (device->isInDraw && buffer->resource.bind_count > 0) > + /* Reading the declaration makes only sense if we have valid state information > + * (i.e., if this function is called during draws). */ > + if (state) Technically what needs to be valid is the stream info, although we probably don't care that much about the distinction.

1 0

Re: [PATCH 3/5] wined3d: Pass stream info and needed fixups to buffer_find_decl.
by Henri Verbeet 11 Sep '13

11 Sep '13

On 11 September 2013 11:31, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -330,7 +331,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) > if(This->resource.usage & WINED3DUSAGE_STATICDECL) return FALSE; > } > > - if (use_vs(state)) > + if (fixup_flags & WINED3D_BUFFER_FIXUP_USE_SHADER) It can actually be a bit simpler than that. Note that all the texcoord checks are redundant when "support_d3dcolor" is true, because declaration_element_valid_ffp() already prevents D3DCOLOR elements from being used with texcoords. That then implies you can mostly just pass the fixup mask to buffer_check_attribute(), and check for an empty fixup mask instead of vertex shader usage here. (Although that means inverting the flags as you have them right now.)

1 0

Re: (resend) gdi32: abc values remain the same despite any changes in layout direction or Viewport
by Marvin 11 Sep '13

11 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=2103 Your paranoid android. === wxppro (32 bit font) === font.c:1323: Test failed: abcB should be unchanged font.c:1323: Test failed: abcC should be unchanged font.c:1323: Test failed: abcfB should be unchanged font.c:1323: Test failed: abcfC should be unchanged font.c:1345: Test failed: abcB should be unchanged font.c:1345: Test failed: abcC should be unchanged font.c:1345: Test failed: abcfB should be unchanged font.c:1345: Test failed: abcfC should be unchanged

1 0

Re: po: Add English (Philippines) resource (resend)
by Alexandre Julliard 11 Sep '13

11 Sep '13

Ken Sharp <kennybobs(a)o2.co.uk> writes: > @@ -111,6 +111,9 @@ filter: dummy > .svg.bmp: > CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ > > +$(top_srcdir)/po/en_PH.po: $(top_srcdir)/po/en_US.po > + $(LN_S) -f en_US.po $@ > + You can't create links in the source tree, and in any case this should be done directly in wrc, with some sort of alias mechanism. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: (resend) [PATCH] serial: wait_for_event() must set Information in PIO_STATUS_BLOCK
by Dmitry Timoshkov 11 Sep '13

11 Sep '13

Wolfgang Walter <wine(a)stwm.de> wrote: > - if (commio->iosb) commio->iosb->u.Status = *commio->events ? STATUS_SUCCESS : STATUS_CANCELLED; > + if (commio->iosb) { > + commio->iosb->u.Status = *commio->events ? STATUS_SUCCESS : STATUS_CANCELLED; > + if (*commio->events) > + commio->iosb->Information = sizeof(DWORD); > + } Did you run 'make test' with this change? Probably some todo_wine statements need to be removed. Also why 'Information' is set only in the case if events != 0? I'd guess that it should be set in any case since 'events' is always initialized. -- Dmitry.

1 0

Embedding a HWND window into an X11 window
by Alexandre Bique 10 Sep '13

10 Sep '13

Hi, How could I embed a HWND window created with CreateWindow() into an X11 window? Thanks! :-) -- Alexandre Bique

5 8

RFC: HKCR merge implementation
by George Stephanos 10 Sep '13

10 Sep '13

I'm proposing my HKEY_CLASSES_ROOT implementation patches for review. Feel free to comment. So far, I've written code for all functions except for the RegEnum family. General description: HKCR handles are special. All wine handles have the two lowest bits zero'd. HKCR handles are masked. 10b specifically. They have their own table separate from the generic handle table. An HKCR handle has an HKCU handle and an HKLM handle below it. Access mask and a string representing the path are also needed since the handle has to attempt to reopen previously failed openings at certain stages. First patch: specially handles HKCR handles WITHOUT affecting the general behavior. The end result is still the exact same. Patch provides a foundation for the rest. Second patch: added path management Third patch: added HKCU Here's a quick description of each function: create_hkcr_struct: allocates the memory needed for the struct, adds it to the table and gives back a pointer to it get_hkcr_path: given an HKCR handle and a subkey string, prepares a subkey string representing the same subkey rooted at HKLM/HKCU. create_hkcr: RegCreateKeyEx open_hkcr: RegOpenKeyEx resolve_hkcr: checks the HKCR handle, tries to reopen previously failed internal handles, gives back HKCU first if available then HKLM close_hkcr: deallocates path and struct, removes struct from table.

1 0

Re: winemac: Don't return characters for Ctrl-(non-letter symbol) keypresses from ToUnicodeEx() as X11 driver already does (try 2)
by Ken Thomases 10 Sep '13

10 Sep '13

Hi, On Sep 9, 2013, at 7:38 PM, Phil Krylov wrote: > Sorry, my first try had wrong patch attached > > -- Ph. > <0001-winemac-Don-t-return-characters-for-Ctrl-non-letter-try2.patch.txt> Is there a specific problem that you're trying to fix? The Mac driver's ToUnicodeEx() implementation started out very similar to the X11 driver's. It was basically a copy that I hacked on. It originally had this same restriction. However, some testing revealed that this is not an absolute restriction on Windows. For example, in the Khmer keyboard layout, Control-<digit> produces characters for some digits. Given that some Windows keyboard layouts produce characters for Control-<digit>, I figured it was best left up to the Mac keyboard layout. Similarly for Control-<punctuation>. For example, the Windows Chinese keyboard layouts produce characters for some of those keystrokes. So does the Czech layout. It might still be possible to re-introduce this restriction if it can be justified based on broad breakage of apps. Although even then, I'd want to make it possible to override the restriction with a registry setting or something. You never know if the ability to enter characters using these key combinations might be crucial for certain Mac users because of the nature of their native keyboard layout. If a modification like this were justified, it should go earlier in macdrv_ToUnicodeEx(). There's a section at the top where I moved the checks for combinations that don't produce characters. Also, the check should test that Alt is _not_ pressed, since Control-Alt-<digit or punct> and Control-Alt-Shfit-<digit or punct> very commonly produce characters. Control-Alt is a synonym for the AltGr key on some keyboards (e.g. Swiss). Finally, if we're going to pursue this, there are some minor style issues I'd prefer be changed. So, check with me before resubmitting. Thanks and cheers, Ken

2 2

Re: ntdll: Try application manifest path when searching for dependent assemblies
by Alexandre Julliard 10 Sep '13

10 Sep '13

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -2776,8 +2776,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, > /* FIXME: add support for language specific lookup */ > > nameW.Buffer = NULL; > - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, > - (strlenW(acl->actctx->appdir.info) + 2 * strlenW(ai->name) + 2) * sizeof(WCHAR) + sizeof(dotManifestW) ))) > + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) ))) Please try to allocate the correct size. If you want to use MAX_PATH you then have to check for overflow when building the string, which is probably worse. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/5] ntdll: Make NtWriteFile handle special offset -2 same way as -1. Resend.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > --- > dlls/ntdll/file.c | 31 +++++++++++++++---------------- > 1 file changed, 15 insertions(+), 16 deletions(-) Why do you need that? It doesn't look to me like an improvement. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [2/2] oledb32: Implement IDataSourceLocator get/put hWnd (resend)
by Nikolay Sivov 10 Sep '13

10 Sep '13

On 9/10/2013 13:30, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > oledb32: Implement IDataSourceLocator get/put hWnd > > > Best Regards > Alistair Leslie-Hughes Hi, Alistair. This is wrong, interface definition should be fixed as well, HWND parameter can't be LONG: --- [id(0x60020000), propget] HRESULT hWnd([out, retval] long* phwndParent); [id(0x60020000), propput] HRESULT hWnd([in] long phwndParent); --- PSDK header has COMPATIBLE_LONG thing to make it work on win64.

1 0

Re: xcopy: Add an explicit check to avoid an out of array access. access. (RESEND)
by Alexandre Julliard 10 Sep '13

10 Sep '13

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > On Sun, 24 Mar 2013, Gerald Pfeifer wrote: >> This _may_ not be necessary, strictly speaking, but new versions of >> GCC (GCC 4.8) complain about this. (And there might be a fringe case?) > > How about this patch? I see it was not applied, but also did not > see a response. It can't happen (and removing the last char unconditionally is broken anyway). -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/5] ntdll: Add support to NtWriteFile for special offset -1. Take 3.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -961,16 +961,23 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, > > if (type == FD_TYPE_FILE) > { > + off_t off; > + > if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) > { > status = STATUS_INVALID_PARAMETER; > goto done; > } > > - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) > + off = offset ? offset->QuadPart : (off_t)-2 /* FILE_USE_FILE_POINTER_POSITION */; > + > + if (off == (off_t)-1 /* FILE_WRITE_TO_END_OF_FILE */) > + off = lseek( unix_handle, 0, SEEK_END ); You are not supposed to change the position for the asynchronous case. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 5)
by Marvin 10 Sep '13

10 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=2084 Your paranoid android. === wxppro (32 bit sock) === sock.c:509: Test failed: oob_server (b8): unexpectedly at the OOB mark: 0 sock.c:519: Test failed: oob_server (b8): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 71AB8D62 === w7pro64 (32 bit sock) === sock.c:528: Test failed: oob_server (138): not at the OOB mark: 1 === w7pro64 (64 bit sock) === sock.c:509: Test failed: oob_server (934): unexpectedly at the OOB mark: 0 sock.c:519: Test failed: oob_server (934): unexpectedly at the OOB mark: 0 sock.c:288: Test failed: do_synchronous_recv (934): error 10054: sock.c:534: Test failed: oob_server (934): not at the OOB mark: 1

1 0

Re: [1/5] ntdll: Add support to NtWriteFile for special offset -1. Take 2.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > --- > dlls/ntdll/file.c | 13 ++++++++++--- > dlls/ntdll/tests/file.c | 15 --------------- > 2 files changed, 10 insertions(+), 18 deletions(-) This is causing test failures all over the place. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] wait until all data from earlier test has been written in test_waittxempty
by Dmitry Timoshkov 09 Sep '13

09 Sep '13

Wolfgang Walter <wine(a)stwm.de> wrote: > + if (res || (!res && GetLastError() == ERROR_IO_PENDING)) > + /* if data has been sent: wait for termination */ > + Sleep(timeout); I don't see such a problem with real COM-port and serial-USB cable under Windows or Linux here and under testbot VMs. -- Dmitry.

3 12

Re: server: Add a serial event mask change counter.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -209,7 +211,7 @@ DECL_HANDLER(get_serial_info) > reply->writemult = serial->writemult; > > /* event mask */ > - reply->eventmask = serial->eventmask; > + reply->eventmask = serial->eventmask | (serial->generation << 16); It would be better to return it as a separate field, particularly since eventmask is already an int. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/6] ws2_32: Fix parameters checking in WSADuplicateSocket
by Alexandre Julliard 09 Sep '13

09 Sep '13

Bruno Jesus <00cpxxx(a)gmail.com> writes: > + fd = get_sock_fd( s, FILE_READ_DATA, NULL ); > + if (fd == -1) > + { > + SetLastError(WSAENOTSOCK); > + return SOCKET_ERROR; > + } > + release_sock_fd( s, fd ); You should avoid retrieving the fd if you are not using it. The handle should be checked at the point where you are doing something with it. -- Alexandre Julliard julliard(a)winehq.org

2 2

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

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-devel