wine-devel August 2016

wine-devel@winehq.org

55 participants
282 discussions

Re: [v3 PATCH] kernel32: Fix RegisterWaitForSingleObject for console handles
by Sebastian Lackner 17 Aug '16

17 Aug '16

On 17.08.2016 21:02, Keno Fischer wrote: > Minimal change from v2, just an extra Sleep(100) before UnregisterWait > to hopefully fix the failure identified by the testbot. > > > 0001-kernel32-Fix-RegisterWaitForSingleObject-for-console.patch > > > From 50347e64eedb1c07f1c9aedf253ec78eac4d3476 Mon Sep 17 00:00:00 2001 > From: Keno Fischer <keno(a)juliacomputing.com> > Date: Tue, 16 Aug 2016 14:35:27 -0400 > Subject: [PATCH] kernel32: Fix RegisterWaitForSingleObject for console handles > > WaitForSingleObject contains a special case to wait on the correct > handle if the passed in handle is a console object. However, > RegisterWaitForSingleObject was missing this special case. This > functionality was used e.g., by the libuv I/O library, causing > any users thereof to not receive input under wine, > e.g. fixes https://github.com/JuliaLang/julia/issues/18006. > > Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> > --- > dlls/kernel32/sync.c | 37 +++++++++++++++-------------- > dlls/kernel32/tests/console.c | 54 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 74 insertions(+), 17 deletions(-) > Thanks for all your effort to get this bug fixed. :) Unfortunately you'll have to send another iteration, C++ - style comments ("//") are not allowed in Wine source code, only C-style comments ("/* ... */"). If you don't mind, I also have some other suggestions how to improve the code a bit. > diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c > index c10fd01..2d6625b 100644 > --- a/dlls/kernel32/sync.c > +++ b/dlls/kernel32/sync.c > @@ -148,6 +148,23 @@ DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE *handles, > return WaitForMultipleObjectsEx( count, handles, wait_all, timeout, FALSE ); > } > > +static HANDLE NormalizeHandleIfConsole(HANDLE handle) Usually lowercase names (with underscores) are preferred for Wine internal functions, otherwise it looks like a WINAPI function. ;) > +{ > + if ((handle == (HANDLE)STD_INPUT_HANDLE) || > + (handle == (HANDLE)STD_OUTPUT_HANDLE) || > + (handle == (HANDLE)STD_ERROR_HANDLE)) > + handle = GetStdHandle( HandleToULong(handle) ); > + > + /* yes, even screen buffer console handles are waitable, and are > + * handled as a handle to the console itself !! > + */ > + if (is_console_handle(handle)) > + { > + if (VerifyConsoleIoHandle(handle)) > + handle = GetConsoleInputWaitHandle(); > + } > + return handle; > +} > > /*********************************************************************** > * WaitForMultipleObjectsEx (KERNEL32.@) > @@ -167,23 +184,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, > return WAIT_FAILED; > } > for (i = 0; i < count; i++) > - { > - if ((handles[i] == (HANDLE)STD_INPUT_HANDLE) || > - (handles[i] == (HANDLE)STD_OUTPUT_HANDLE) || > - (handles[i] == (HANDLE)STD_ERROR_HANDLE)) > - hloc[i] = GetStdHandle( HandleToULong(handles[i]) ); > - else > - hloc[i] = handles[i]; > - > - /* yes, even screen buffer console handles are waitable, and are > - * handled as a handle to the console itself !! > - */ > - if (is_console_handle(hloc[i])) > - { > - if (VerifyConsoleIoHandle(hloc[i])) > - hloc[i] = GetConsoleInputWaitHandle(); > - } > - } > + hloc[i] = NormalizeHandleIfConsole(handles[i]); > > status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, > get_nt_timeout( &time, timeout ) ); > @@ -209,6 +210,7 @@ BOOL WINAPI RegisterWaitForSingleObject(PHANDLE phNewWaitObject, HANDLE hObject, > TRACE("%p %p %p %p %d %d\n", > phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); > > + hObject = NormalizeHandleIfConsole(hObject); > status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); > if (status != STATUS_SUCCESS) > { > @@ -231,6 +233,7 @@ HANDLE WINAPI RegisterWaitForSingleObjectEx( HANDLE hObject, > TRACE("%p %p %p %d %d\n", > hObject,Callback,Context,dwMilliseconds,dwFlags); > > + hObject = NormalizeHandleIfConsole(hObject); > status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); > if (status != STATUS_SUCCESS) > { > diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c > index 5b66d9f..88ef2b8 100644 > --- a/dlls/kernel32/tests/console.c > +++ b/dlls/kernel32/tests/console.c > @@ -908,6 +908,58 @@ static void testScreenBuffer(HANDLE hConOut) > SetConsoleOutputCP(oldcp); > } > > +static void CALLBACK signaled_function(void *p, BOOLEAN timeout) > +{ > + HANDLE event = p; > + SetEvent(event); > + ok(!timeout, "wait shouldn't have timed out\n"); > +} > + > +static void testWaitForConsoleInput(HANDLE input_handle) > +{ > + HANDLE wait_handle; > + HANDLE complete_event; > + INPUT_RECORD record; > + DWORD events_written; > + DWORD wait_ret; > + BOOL ret; > + > + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); > + > + // Test success case > + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); > + ok(ret == TRUE, "Expected RegisterWaitForSingleObject to return TRUE, got %d\n", ret); > + /* give worker thread a chance to start up */ > + Sleep(100); > + record.EventType = KEY_EVENT; > + record.Event.KeyEvent.bKeyDown = 1; > + record.Event.KeyEvent.wRepeatCount = 1; > + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; > + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; > + record.Event.KeyEvent.uChar.UnicodeChar = L'\r'; The L prefix should be omitted here. Wine can't use the Compilers wchar_t features because they might have a different size than WCHAR on Windows. > + record.Event.KeyEvent.dwControlKeyState = 0; > + ret = WriteConsoleInputW(input_handle, &record, 1, &events_written); > + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); > + wait_ret = WaitForSingleObject(complete_event, INFINITE); > + ok(wait_ret == WAIT_OBJECT_0, "Expected the handle to be signaled\n"); > + /* give worker thread chance to complete */ > + Sleep(100); > + ret = UnregisterWait(wait_handle); > + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); According to MSDN "If any callback functions associated with the timer have not completed when UnregisterWait is called, UnregisterWait unregisters the wait on the callback functions and fails with the ERROR_IO_PENDING error code. The error code does not indicate that the function has failed, and the function does not need to be called again." Since tests should always run as quickly as possible I would suggest to omit the Sleep and remove the return value check here (or if you prefer, explicitly treat ERROR_IO_PENDING as success). > + > + // Test timeout case > + FlushConsoleInputBuffer(input_handle); > + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); > + wait_ret = WaitForSingleObject(complete_event, 100); > + ok(wait_ret == WAIT_TIMEOUT, "Expected the wait to time out\n"); > + ret = UnregisterWait(wait_handle); > + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); > + > + // Clean up > + ret = CloseHandle(complete_event); > + ok(!!ret, "Failed to close event handle, last error %#x.\n", GetLastError()); CloseHandle returns a BOOL, so there should be no need to use "!!". Also I would suggest to use a consistent way of tracing GetLastError() within the patch, above you used "%d". > +} > + > static void test_GetSetConsoleInputExeName(void) > { > BOOL ret; > @@ -3044,6 +3096,8 @@ START_TEST(console) > testScroll(hConOut, sbi.dwSize); > /* will test sb creation / modification / codepage handling */ > testScreenBuffer(hConOut); > + /* Test waiting for a console handle */ > + testWaitForConsoleInput(hConIn); > > /* clear duplicated console font table */ > CloseHandle(hConIn); > -- 2.7.4 > > >

1 0

Re: gdiplus: Reimplement metafile loading using gdi32 instead of IPicture.
by Vincent Povirk 17 Aug '16

17 Aug '16

I'd probably be OK with this as-is, but since you asked for feedback: > @@ -2219,12 +2155,6 @@ GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, > srcRect->Height = (REAL) ((GpBitmap*)image)->height; > *srcUnit = UnitPixel; > } > - else{ > - srcRect->X = srcRect->Y = 0.0; > - srcRect->Width = ipicture_pixel_width(image->picture); > - srcRect->Height = ipicture_pixel_height(image->picture); > - *srcUnit = UnitPixel; > - } > > TRACE("returning (%f, %f) (%f, %f) unit type %d\n", srcRect->X, srcRect->Y, > srcRect->Width, srcRect->Height, *srcUnit); Even for ipicture metafiles, this case wasn't really used before, except when given an invalid image object (type isn't bitmap or metafile) where it would likely crash. We should probably return InvalidParameter here. Same with the other GdipGetImage* functions where we're removing else clauses. I am OK with the simplified error handling from IStream_Read. > + hr = IStream_Read(stream, buf, emh.nBytes, &size); > + if (hr == S_OK && size == emh.nBytes) > + { > + hemf = SetEnhMetaFileBits(emh.nBytes, buf); > + if (hemf) > + { > + status = GdipCreateMetafileFromEmf(hemf, TRUE, metafile); > + if (status != Ok) > + DeleteEnhMetaFile(hemf); > + } > } > > + heap_free(buf); > + return status; > +} I guess this works, but it's kind of confusing how status gets set here when IStream_Read or SetEnhMetaFileBits fails. I'd rather it be set closer to the failure.

2 1

Re: [v3 PATCH] kernel32: Fix RegisterWaitForSingleObject for console handles
by Marvin 17 Aug '16

17 Aug '16

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://testbot.winehq.org/JobDetails.pl?Key=25178 Your paranoid android. === w8 (32 bit console) === console.c:1497: Test failed: [13] Expected output count to be 0, got 2297442973 console.c:1497: Test failed: [15] Expected output count to be 0, got 2297442973 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 2297442973 console.c:1741: Test failed: [13] Expected output count to be 0, got 2297442973 console.c:1741: Test failed: [15] Expected output count to be 0, got 2297442973 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 2297442973 === w864 (32 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [13] Expected output count to be 0, got 2437813945 console.c:1497: Test failed: [15] Expected output count to be 0, got 2437813945 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 2437813945 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [13] Expected output count to be 0, got 2437813945 console.c:1741: Test failed: [15] Expected output count to be 0, got 2437813945 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 2437813945 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [13] Expected output count to be 0, got 4156894918 console.c:1497: Test failed: [15] Expected output count to be 0, got 4156894918 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 4156894918 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [13] Expected output count to be 0, got 4156894918 console.c:1741: Test failed: [15] Expected output count to be 0, got 4156894918 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 4156894918 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [v2 PATCH] kernel32: Fix RegisterWaitForSingleObject for console handles
by Marvin 17 Aug '16

17 Aug '16

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://testbot.winehq.org/JobDetails.pl?Key=25177 Your paranoid android. === w8 (32 bit console) === console.c:946: Test failed: UnregisterWait failed with error 997 console.c:1495: Test failed: [13] Expected output count to be 0, got 1795086881 console.c:1495: Test failed: [15] Expected output count to be 0, got 1795086881 console.c:1495: Test failed: [18] Expected output count to be 3735928559, got 1795086881 console.c:1739: Test failed: [13] Expected output count to be 0, got 1795086881 console.c:1739: Test failed: [15] Expected output count to be 0, got 1795086881 console.c:1739: Test failed: [18] Expected output count to be 3735928559, got 1795086881 === w864 (32 bit console) === console.c:2617: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2623: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2630: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2637: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:946: Test failed: UnregisterWait failed with error 997 console.c:1320: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1495: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [13] Expected output count to be 0, got 3132035615 console.c:1495: Test failed: [15] Expected output count to be 0, got 3132035615 console.c:1495: Test failed: [18] Expected output count to be 3735928559, got 3132035615 console.c:1739: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [13] Expected output count to be 0, got 3132035615 console.c:1739: Test failed: [15] Expected output count to be 0, got 3132035615 console.c:1739: Test failed: [18] Expected output count to be 3735928559, got 3132035615 console.c:2198: Test failed: [7] Expected count to be 0, got 1 console.c:2264: Test failed: [7] Expected count to be 0, got 1 console.c:2330: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2617: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2623: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2630: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2637: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:946: Test failed: UnregisterWait failed with error 997 console.c:1320: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1495: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [13] Expected output count to be 0, got 2323415655 console.c:1495: Test failed: [15] Expected output count to be 0, got 2323415655 console.c:1495: Test failed: [18] Expected output count to be 3735928559, got 2323415655 console.c:1739: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [13] Expected output count to be 0, got 2323415655 console.c:1739: Test failed: [15] Expected output count to be 0, got 2323415655 console.c:1739: Test failed: [18] Expected output count to be 3735928559, got 2323415655 console.c:2198: Test failed: [7] Expected count to be 0, got 1 console.c:2264: Test failed: [7] Expected count to be 0, got 1 console.c:2330: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2617: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2623: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2630: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2637: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:946: Test failed: UnregisterWait failed with error 997 console.c:1320: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1495: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2198: Test failed: [7] Expected count to be 0, got 1 console.c:2264: Test failed: [7] Expected count to be 0, got 1 console.c:2330: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2617: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2623: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2630: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2637: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:946: Test failed: UnregisterWait failed with error 997 console.c:1320: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1495: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1495: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1739: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2198: Test failed: [7] Expected count to be 0, got 1 console.c:2264: Test failed: [7] Expected count to be 0, got 1 console.c:2330: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH] kernel32: Add GetNumberFormatEx
by Marvin 17 Aug '16

17 Aug '16

2 1

Compilation with winegcc vs compilation in Wine source
by Ruslan Kabatsayev 17 Aug '16

17 Aug '16

Hello all, I'm trying to integrate my program into Wine source and having some difficulties with doing OpenGL calls. Namely, when I compile the program with mingw and with winegcc, it works flawlessly. But when I integrate it into Wine source tree (taking regedit as an example), stack appears smashed after OpenGL calls. Here's what my command line looks like with winegcc (written by me manually): # compilation winegcc -c wgl.c -o wgl.o -g -m32 -municode -DUNICODE -D_UNICODE -g # linking winegcc main.o wgl.o d3d8.o d3d9.o texture.o common.o demo-res.o -lopengl32 -ld3d8 -ld3d9 -ld3dx9 -lgdi32 -lgdiplus -lglu32 -lole32 -lshell32 -lmsvcrt -o 3d-demo.exe -g -m32 -municode And the function where the crash happens looks like: 00012839 <initLightAndMaterial>: 12839: 55 push ebp 1283a: 89 e5 mov ebp,esp 1283c: 53 push ebx 1283d: 83 ec 24 sub esp,0x24 12840: e8 02 f1 ff ff call 11947 <__i686.get_pc_thunk.bx> 12845: 81 c3 17 5f 00 00 add ebx,0x5f17 1284b: b8 00 00 00 00 mov eax,0x0 12850: 89 45 e8 mov DWORD PTR [ebp-0x18],eax 12853: b8 00 00 00 00 mov eax,0x0 12858: 89 45 ec mov DWORD PTR [ebp-0x14],eax 1285b: b8 00 00 00 00 mov eax,0x0 12860: 89 45 f0 mov DWORD PTR [ebp-0x10],eax 12863: b8 00 00 80 3f mov eax,0x3f800000 12868: 89 45 f4 mov DWORD PTR [ebp-0xc],eax 1286b: 8d 45 e8 lea eax,[ebp-0x18] 1286e: 89 44 24 04 mov DWORD PTR [esp+0x4],eax 12872: c7 04 24 53 0b 00 00 mov DWORD PTR [esp],0xb53 12879: e8 92 f1 ff ff call 11a10 <glLightModelfv> 1287e: 83 ec 08 sub esp,0x8 12881: 8b 5d fc mov ebx,DWORD PTR [ebp-0x4] 12884: c9 leave 12885: c3 ret And here's the command from Wine tree (generated by its build system): # compilation /usr/lib/ccache/gcc-4.5 -c -o wgl.o wgl.c -I. -I../../include -I../../include/msvcrt -D__WINESRC__ -D_REENTRANT -fPIC \ -fno-builtin -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body \ -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith \ -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g # linking ../../tools/winegcc/winegcc -o 3d-demo.exe.so -B../../tools/winebuild -fasynchronous-unwind-tables -mwindows \ -municode -mno-cygwin d3d8.o d3d9.o wgl.o main.o common.o texture.o demo.res -luser32 -lgdi32 \ -lgdiplus -lopengl32 -lglu32 -ld3d8 -ld3d9 -ld3dx9 -lole32 -lshell32 -lmsvcrt \ ../../libs/port/libwine_port.a And the resulting function looks like 00014f8e <initLightAndMaterial>: 14f8e: 55 push ebp 14f8f: 89 e5 mov ebp,esp 14f91: 53 push ebx 14f92: 83 ec 24 sub esp,0x24 14f95: e8 8d c9 ff ff call 11927 <__i686.get_pc_thunk.bx> 14f9a: 81 c3 be 42 00 00 add ebx,0x42be 14fa0: b8 00 00 00 00 mov eax,0x0 14fa5: 89 45 e8 mov DWORD PTR [ebp-0x18],eax 14fa8: b8 00 00 00 00 mov eax,0x0 14fad: 89 45 ec mov DWORD PTR [ebp-0x14],eax 14fb0: b8 00 00 00 00 mov eax,0x0 14fb5: 89 45 f0 mov DWORD PTR [ebp-0x10],eax 14fb8: b8 00 00 80 3f mov eax,0x3f800000 14fbd: 89 45 f4 mov DWORD PTR [ebp-0xc],eax 14fc0: 8d 45 e8 lea eax,[ebp-0x18] 14fc3: 89 44 24 04 mov DWORD PTR [esp+0x4],eax 14fc7: c7 04 24 53 0b 00 00 mov DWORD PTR [esp],0xb53 14fce: e8 9d cb ff ff call 11b70 <glLightModelfv> 14fd3: 83 c4 24 add esp,0x24 14fd6: 5b pop ebx 14fd7: 5d pop ebp 14fd8: c3 ret The C code for the function looked like static void initLightAndMaterial(void) { const GLfloat globalAmbient[4]={0,0,0,1}; glLightModelfv(GL_LIGHT_MODEL_AMBIENT,globalAmbient); } And this is my Makefile.in (the function is defined in wgl.c): #--------------------------------------------- MODULE = 3d-demo.exe APPMODE = -mwindows -municode -mno-cygwin IMPORTS = user32 gdi32 gdiplus opengl32 glu32 d3d8 d3d9 d3dx9 ole32 shell32 msvcrt C_SRCS = \ d3d8.c \ d3d9.c \ wgl.c \ main.c \ common.c \ texture.c RC_SRCS = demo.rc INSTALL_LIB = 3d-demo.exe 3d-demo #--------------------------------------- Apparently in-tree compilation assumes another calling convention for glLightModelfv here... What could be the reason for this? How should I set up my Makefile.in so that it generated a result compatible with opengl32 calling convention? Thanks, Ruslan

2 7

Re: gdiplus: Reimplement metafile loading using gdi32 instead of IPicture.
by Nikolay Sivov 17 Aug '16

17 Aug '16

On 17.08.2016 11:26, Sebastian Lackner wrote: > +static GpStatus load_wmf(IStream *stream, GpMetafile **metafile) > +{ > + WmfPlaceableFileHeader pfh; > + GpStatus status = GenericError; > + BOOL is_placeable = FALSE; > + LARGE_INTEGER seek; > + METAHEADER mh; > + HMETAFILE hmf; > + HRESULT hr; > + UINT size; > + void *buf; > + > + hr = IStream_Read(stream, &mh, sizeof(mh), &size); > + if (hr != S_OK || size != sizeof(mh)) > + return GenericError; > + > + if (mh.mtType == 0xcdd7 && mh.mtHeaderSize == 0x9ac6) It'd be more readable to test this as UINT32 it's supposed to be, and having this constant defined to GDIP_WMF_PLACEABLEKEY (locally in gdiplus, it's only mentioned in comment in SDK) will help looking it up. > + { > + is_placeable = TRUE; > + > + seek.QuadPart = 0; > + hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); > + if (FAILED(hr)) return hresult_to_status(hr); > + > + hr = IStream_Read(stream, &pfh, sizeof(pfh), &size); > + if (hr != S_OK || size != sizeof(pfh)) > + return GenericError; > + > + hr = IStream_Read(stream, &mh, sizeof(mh), &size); > + if (hr != S_OK || size != sizeof(mh)) > + return GenericError; > + } > + > + seek.QuadPart = is_placeable ? sizeof(pfh) : 0; > + hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); > + if (FAILED(hr)) return hresult_to_status(hr); > + > + buf = heap_alloc(mh.mtSize * 2); > + if (!buf) return OutOfMemory; > + > + hr = IStream_Read(stream, buf, mh.mtSize * 2, &size); > + if (hr == S_OK && size == mh.mtSize * 2) > + { > + hmf = SetMetaFileBitsEx(mh.mtSize * 2, buf); > + if (hmf) > + { > + status = GdipCreateMetafileFromWmf(hmf, TRUE, is_placeable ? &pfh : NULL, metafile); > + if (status != Ok) > + DeleteMetaFile(hmf); > + } > + } > + > + heap_free(buf); > + return status; > +} > + > +static GpStatus decode_image_wmf(IStream *stream, GpImage **image) > { > - IPicture *pic; > + GpMetafile *metafile; > + GpStatus status; > > TRACE("%p %p\n", stream, image); > > - if(!stream || !image) > + if (!stream || !image) > return InvalidParameter; > > - if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, > - (LPVOID*) &pic) != S_OK){ > - TRACE("Could not load picture\n"); > + status = load_wmf(stream, &metafile); > + if (status != Ok) > + { > + TRACE("Could not load metafile\n"); > + return status; > + } > + > + *image = (GpImage *)metafile; > + TRACE("<-- %p\n", *image); > + > + return Ok; > +} > + > +static GpStatus load_emf(IStream *stream, GpMetafile **metafile) > +{ > + GpStatus status = GenericError; > + LARGE_INTEGER seek; > + ENHMETAHEADER emh; > + HENHMETAFILE hemf; > + HRESULT hr; > + UINT size; > + void *buf; > + > + hr = IStream_Read(stream, &emh, sizeof(emh), &size); > + if (hr != S_OK || size != sizeof(emh) || emh.dSignature != ENHMETA_SIGNATURE) > return GenericError; > + > + seek.QuadPart = 0; > + hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); > + if (FAILED(hr)) return hresult_to_status(hr); > + > + buf = heap_alloc(emh.nBytes); > + if (!buf) return OutOfMemory; > + > + hr = IStream_Read(stream, buf, emh.nBytes, &size); > + if (hr == S_OK && size == emh.nBytes) > + { > + hemf = SetEnhMetaFileBits(emh.nBytes, buf); > + if (hemf) > + { > + status = GdipCreateMetafileFromEmf(hemf, TRUE, metafile); > + if (status != Ok) > + DeleteEnhMetaFile(hemf); > + } > } > > - /* FIXME: missing initialization code */ > - *image = heap_alloc_zero(sizeof(GpMetafile)); > - if(!*image) return OutOfMemory; > - (*image)->type = ImageTypeMetafile; > - (*image)->decoder = NULL; > - (*image)->picture = pic; > - (*image)->flags = ImageFlagsNone; > - (*image)->frame_count = 1; > - (*image)->current_frame = 0; > - (*image)->palette = NULL; > - list_init(&(*(GpMetafile**)image)->containers); > + heap_free(buf); > + return status; > +} > + > +static GpStatus decode_image_emf(IStream *stream, GpImage **image) > +{ > + GpMetafile *metafile; > + GpStatus status; > + > + TRACE("%p %p\n", stream, image); > + > + if (!stream || !image) > + return InvalidParameter; > + > + status = load_emf(stream, &metafile); > + if (status != Ok) > + { > + TRACE("Could not load metafile\n"); > + return status; > + } > > + *image = (GpImage *)metafile; > TRACE("<-- %p\n", *image); > > return Ok; > @@ -4721,7 +4750,7 @@ static const struct image_codec codecs[NUM_CODECS] = { > /* SigMask */ emf_sig_mask, > }, > NULL, > - decode_image_olepicture_metafile, > + decode_image_emf, > NULL > }, > { > @@ -4741,7 +4770,7 @@ static const struct image_codec codecs[NUM_CODECS] = { > /* SigMask */ wmf_sig_mask, > }, > NULL, > - decode_image_olepicture_metafile, > + decode_image_wmf, > NULL > }, > { > diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c > index a854e55..8b93e81 100644 > --- a/dlls/gdiplus/metafile.c > +++ b/dlls/gdiplus/metafile.c > @@ -317,7 +317,6 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF > } > > (*metafile)->image.type = ImageTypeMetafile; > - (*metafile)->image.picture = NULL; > (*metafile)->image.flags = ImageFlagsNone; > (*metafile)->image.palette = NULL; > (*metafile)->image.xres = dpix; > diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c > index ad84feb..cabd2fce 100644 > --- a/dlls/gdiplus/tests/image.c > +++ b/dlls/gdiplus/tests/image.c > @@ -1446,19 +1446,19 @@ static void test_loadwmf(void) > > stat = GdipGetImageBounds(img, &bounds, &unit); > expect(Ok, stat); > - todo_wine expect(UnitPixel, unit); > + expect(UnitPixel, unit); > expectf(0.0, bounds.X); > expectf(0.0, bounds.Y); > - todo_wine expectf(320.0, bounds.Width); > - todo_wine expectf(320.0, bounds.Height); > + expectf(320.0, bounds.Width); > + expectf(320.0, bounds.Height); > > stat = GdipGetImageHorizontalResolution(img, &res); > expect(Ok, stat); > - todo_wine expectf(1440.0, res); > + expectf(1440.0, res); > > stat = GdipGetImageVerticalResolution(img, &res); > expect(Ok, stat); > - todo_wine expectf(1440.0, res); > + expectf(1440.0, res); > > memset(&header, 0, sizeof(header)); > stat = GdipGetMetafileHeaderFromMetafile((GpMetafile*)img, &header); >

2 1

Re: [PATCH 1/2] user32/tests: Add more tests for setting window styles.
by Marvin 17 Aug '16

17 Aug '16

2 1

Re: [PATCH] d3d11: Support D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS in ID3D11Device CheckFeatureSupport
by Marvin 17 Aug '16

17 Aug '16

3 2

Re: [PATCH] d3d11: Support D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS in ID3D11Device CheckFeatureSupport
by Józef Kucia 17 Aug '16

17 Aug '16

This patch is probably fine because I don't expect that we will expose compute shaders in SM4 (at least initially). On Wed, Aug 17, 2016 at 8:52 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3d11/device.c | 12 ++++++++++++ > dlls/d3d11/tests/d3d11.c | 18 ++++++++++++++++++ > include/d3d11.idl | 5 +++++ > 3 files changed, 35 insertions(+) > > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index df5a4ac..6142ac0 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -3463,6 +3463,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * > threading_data->DriverCommandLists = FALSE; > return S_OK; > } > + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: > + { > + D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; > + if (feature_support_data_size != sizeof(*options)) > + { > + WARN("Invalid data size.\n"); > + return E_INVALIDARG; > + } > + > + options->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = FALSE; > + return S_OK; > + } > > default: > FIXME("Unhandled feature %#x.\n", feature); > diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c > index 330a960..962682d 100644 > --- a/dlls/d3d11/tests/d3d11.c > +++ b/dlls/d3d11/tests/d3d11.c > @@ -9188,6 +9188,7 @@ static void test_null_sampler(void) > static void test_check_feature_support(void) > { > D3D11_FEATURE_DATA_THREADING threading[2]; > + D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS hwopts; This is not important but I would name it d3d10_hw_opts or d3d10_opts. > ID3D11Device *device; > ULONG refcount; > HRESULT hr; > @@ -9229,6 +9230,23 @@ static void test_check_feature_support(void) > ok(threading->DriverCommandLists == TRUE || threading->DriverCommandLists == FALSE, > "Got unexpected command lists %#x.\n", threading->DriverCommandLists); > > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, NULL, 0); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, 0); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) - 1); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) / 2); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) + 1); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) * 2); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts)); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + trace("Shader support %#x.\n", hwopts.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4); It should be "ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x". Besides, the trace() message could more clear, e.g. "Compute shader support via SM4". > + > refcount = ID3D11Device_Release(device); > ok(!refcount, "Device has %u references left.\n", refcount); > } > diff --git a/include/d3d11.idl b/include/d3d11.idl > index cd177c2..767321b 100644 > --- a/include/d3d11.idl > +++ b/include/d3d11.idl > @@ -445,6 +445,11 @@ typedef struct D3D11_FEATURE_DATA_THREADING > BOOL DriverCommandLists; > } D3D11_FEATURE_DATA_THREADING; > > +typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS > +{ > + BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; > +} D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS; > + > typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS > { > BOOL OutputMergerLogicOp; > -- > 2.8.1 > > >

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2016