February 2019 - Wine-Commits

Zebediah Figura : user32: Reimplement ArrangeIconicWindows() using minimized metrics.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 73684e84b60f0cfab685a64e2fd8f95f07fd55ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=73684e84b60f0cfab685a64e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 12:17:40 2019 -0600 user32: Reimplement ArrangeIconicWindows() using minimized metrics. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 8 ---- dlls/user32/winpos.c | 103 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 77 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9540496..5f101b3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11386,7 +11386,6 @@ static void test_arrange_iconic_windows(void) SetLastError(0xdeadbeef); ret = ArrangeIconicWindows(parent); -todo_wine ok(!ret, "wrong ret %u\n", ret); ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); @@ -11400,7 +11399,6 @@ todo_wine SetLastError(0xdeadbeef); ret = ArrangeIconicWindows(parent); -todo_wine ok(!ret, "wrong ret %u\n", ret); ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); @@ -11423,14 +11421,12 @@ todo_wine } ret = ArrangeIconicWindows(parent); -todo_wine ok(ret == 1, "wrong ret %u\n", ret); GetWindowRect(hwnds[0], &rect); SetRect(&expect, 0, 0, GetSystemMetrics(SM_CXMINIMIZED), GetSystemMetrics(SM_CYMINIMIZED)); OffsetRect(&expect, mm.iHorzGap, mm.iVertGap); OffsetRect(&expect, pt.x, pt.y); -todo_wine ok(EqualRect(&rect, &expect), "expected rect %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); @@ -11452,7 +11448,6 @@ todo_wine } ret = ArrangeIconicWindows(parent); -todo_wine ok(ret == 10, "wrong ret %u\n", ret); col = mm.iHorzGap; @@ -11469,7 +11464,6 @@ todo_wine SetRect(&expect, col, row, col + GetSystemMetrics(SM_CXMINIMIZED), row + GetSystemMetrics(SM_CYMINIMIZED)); OffsetRect(&expect, pt.x, pt.y); -todo_wine ok(EqualRect(&rect, &expect), "hwnd %u: expected rect %s, got %s\n", i, wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); @@ -11489,7 +11483,6 @@ todo_wine } ret = ArrangeIconicWindows(parent); -todo_wine ok(ret == 10, "wrong ret %u\n", ret); col = parent_rect.right - mm.iHorzGap; @@ -11506,7 +11499,6 @@ todo_wine SetRect(&expect, col - GetSystemMetrics(SM_CXMINIMIZED), row - GetSystemMetrics(SM_CYMINIMIZED), col, row); OffsetRect(&expect, pt.x, pt.y); -todo_wine ok(EqualRect(&rect, &expect), "hwnd %u: expected rect %s, got %s\n", i, wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bca50ca..6d137d7 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -852,6 +852,75 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) return MinMax; } +static POINT get_first_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, + int width, int height ) +{ + POINT ret; + + if (mm->iArrange & ARW_STARTRIGHT) + ret.x = parent->right - mm->iHorzGap - width; + else + ret.x = parent->left + mm->iHorzGap; + if (mm->iArrange & ARW_STARTTOP) + ret.y = parent->top + mm->iVertGap; + else + ret.y = parent->bottom - mm->iVertGap - height; + + return ret; +} + +static void get_next_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, + int width, int height, POINT *pos ) +{ + BOOL next; + + if (mm->iArrange & ARW_UP) /* == ARW_DOWN */ + { + if (mm->iArrange & ARW_STARTTOP) + { + pos->y += height + mm->iVertGap; + if ((next = pos->y + height > parent->bottom)) + pos->y = parent->top + mm->iVertGap; + } + else + { + pos->y -= height + mm->iVertGap; + if ((next = pos->y < parent->top)) + pos->y = parent->bottom - mm->iVertGap - height; + } + + if (next) + { + if (mm->iArrange & ARW_STARTRIGHT) + pos->x -= width + mm->iHorzGap; + else + pos->x += width + mm->iHorzGap; + } + } + else + { + if (mm->iArrange & ARW_STARTRIGHT) + { + pos->x -= width + mm->iHorzGap; + if ((next = pos->x < parent->left)) + pos->x = parent->right - mm->iHorzGap - width; + } + else + { + pos->x += width + mm->iHorzGap; + if ((next = pos->x + width > parent->right)) + pos->x = parent->left + mm->iHorzGap; + } + + if (next) + { + if (mm->iArrange & ARW_STARTTOP) + pos->y += height + mm->iVertGap; + else + pos->y -= height + mm->iVertGap; + } + } +} /*********************************************************************** * WINPOS_FindIconPos @@ -2567,14 +2636,16 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) */ UINT WINAPI ArrangeIconicWindows( HWND parent ) { + int width, height, count = 0; RECT rectParent; HWND hwndChild; - INT x, y, xspacing, yspacing; POINT pt; MINIMIZEDMETRICS metrics; metrics.cbSize = sizeof(metrics); SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); + width = GetSystemMetrics( SM_CXMINIMIZED ); + height = GetSystemMetrics( SM_CYMINIMIZED ); if (parent == GetDesktopWindow()) { @@ -2587,41 +2658,21 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) } else GetClientRect( parent, &rectParent ); - x = y = 0; - xspacing = GetSystemMetrics(SM_CXICONSPACING); - yspacing = GetSystemMetrics(SM_CYICONSPACING); + pt = get_first_minimized_child_pos( &rectParent, &metrics, width, height ); hwndChild = GetWindow( parent, GW_CHILD ); while (hwndChild) { if( IsIconic( hwndChild ) ) { - WINPOS_ShowIconTitle( hwndChild, FALSE ); - - if (metrics.iArrange & ARW_STARTRIGHT) - pt.x = rectParent.right - (x + 1) * xspacing; - else - pt.x = rectParent.left + x * xspacing; - if (metrics.iArrange & ARW_STARTTOP) - pt.y = rectParent.top + y * yspacing; - else - pt.y = rectParent.bottom - (y + 1) * yspacing; - - SetWindowPos( hwndChild, 0, pt.x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, - pt.y + (yspacing - GetSystemMetrics(SM_CYICON)) / 2, 0, 0, + SetWindowPos( hwndChild, 0, pt.x, pt.y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); - if( IsWindow(hwndChild) ) - WINPOS_ShowIconTitle(hwndChild , TRUE ); - - if (++x >= (rectParent.right - rectParent.left) / xspacing) - { - x = 0; - y++; - } + get_next_minimized_child_pos( &rectParent, &metrics, width, height, &pt ); + count++; } hwndChild = GetWindow( hwndChild, GW_HWNDNEXT ); } - return yspacing; + return count; }

1 0

Zebediah Figura : user32: SetWindowPos() shouldn' t change the client rect of a minimized window.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 119e215e3ea7ff4396245f70a9fa3322625a3c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=119e215e3ea7ff4396245f70… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 12:17:36 2019 -0600 user32: SetWindowPos() shouldn't change the client rect of a minimized window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 ++++++++++++ dlls/user32/winpos.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 50dbf49..ceb4b82 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6550,6 +6550,18 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); + /* SetWindowPos shouldn't affect the client rect */ + ret = SetWindowPos(hwnd, 0, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "not expected ret: %lu\n", ret); + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4b39d0a..38444b2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1699,7 +1699,7 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC WIN_GetRectangles( pWinpos->hwnd, COORDS_PARENT, old_window_rect, old_client_rect ); *new_window_rect = *old_window_rect; - *new_client_rect = (wndPtr->dwStyle & WS_MINIMIZE) ? *old_window_rect : *old_client_rect; + *new_client_rect = *old_client_rect; if (!(pWinpos->flags & SWP_NOSIZE)) {

1 0

Nikolay Sivov : mfplat: Add trivial implementation of MFCopyImage().
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 9fdb1fd96e6165f806f2a400cf1586387c0ff614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fdb1fd96e6165f806f2a400… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:06 2019 +0300 mfplat: Add trivial implementation of MFCopyImage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 15 +++++++++++++-- dlls/mfplat/tests/mfplat.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 94d5ab0..21240df 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -476,10 +476,21 @@ HRESULT WINAPI MFUnlockPlatform(void) return S_OK; } +/*********************************************************************** + * MFCopyImage (mfplat.@) + */ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) { - FIXME("(%p, %d, %p, %d, %d, %d) stub\n", dest, deststride, src, srcstride, width, lines); - return E_NOTIMPL; + TRACE("(%p, %d, %p, %d, %u, %u)\n", dest, deststride, src, srcstride, width, lines); + + while (lines--) + { + memcpy(dest, src, width); + dest += deststride; + src += srcstride; + } + + return S_OK; } typedef struct _mfattributes diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8b06e23..a7b5620 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -36,6 +36,8 @@ #include "wine/test.h" +static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, + DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); @@ -308,6 +310,7 @@ static void init_functions(void) HMODULE mod = GetModuleHandleA("mfplat.dll"); #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; + X(MFCopyImage); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFCreateMemoryBuffer); @@ -877,6 +880,39 @@ static void test_allocate_queue(void) ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); } +static void test_MFCopyImage(void) +{ + BYTE dest[16], src[16]; + HRESULT hr; + + if (!pMFCopyImage) + { + win_skip("MFCopyImage() is not available.\n"); + return; + } + + memset(dest, 0xaa, sizeof(dest)); + memset(src, 0x11, sizeof(src)); + + hr = pMFCopyImage(dest, 8, src, 8, 4, 1); + ok(hr == S_OK, "Failed to copy image %#x.\n", hr); + ok(!memcmp(dest, src, 4) && dest[4] == 0xaa, "Unexpected buffer contents.\n"); + + memset(dest, 0xaa, sizeof(dest)); + memset(src, 0x11, sizeof(src)); + + hr = pMFCopyImage(dest, 8, src, 8, 16, 1); + ok(hr == S_OK, "Failed to copy image %#x.\n", hr); + ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); + + memset(dest, 0xaa, sizeof(dest)); + memset(src, 0x11, sizeof(src)); + + hr = pMFCopyImage(dest, 8, src, 8, 8, 2); + ok(hr == S_OK, "Failed to copy image %#x.\n", hr); + ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -895,6 +931,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateAsyncResult(); test_allocate_queue(); + test_MFCopyImage(); CoUninitialize(); }

1 0

Michael Stefaniuc : winmm/tests: Floating point numeric constants are by default doubles.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 0388828edf1891af68985f1cc2e786917ec5608c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0388828edf1891af68985f1c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:03 2019 +0100 winmm/tests: Floating point numeric constants are by default doubles. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c106594..9c114c8 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -102,11 +102,11 @@ static char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size) for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { - unsigned char sample=(unsigned char)((double)127.5*(y+1.0)); + unsigned char sample=(unsigned char)(127.5*(y+1.0)); for (j = 0; j < wfx->nChannels; j++) *b++=sample; } else if (wfx->wBitsPerSample==16) { - signed short sample=(signed short)((double)32767.5*y-0.5); + signed short sample=(signed short)(32767.5*y-0.5); for (j = 0; j < wfx->nChannels; j++) { b[0]=sample & 0xff; b[1]=sample >> 8;

1 0

Nikolay Sivov : mfplat: Hold platform lock for async results lifetime.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 3d463b8ff581aa6348b84471fa32448127b7bb5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d463b8ff581aa6348b84471… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:04 2019 +0300 mfplat: Hold platform lock for async results lifetime. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 23 +++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- dlls/mfplat/queue.c | 4 ++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7e1736c..94d5ab0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static LONG platform_lock; + static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', 'T','r','a','n','s','f','o','r','m','s',0}; static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', @@ -450,6 +452,27 @@ HRESULT WINAPI MFStartup(ULONG version, DWORD flags) HRESULT WINAPI MFShutdown(void) { FIXME("(): stub\n"); + + return S_OK; +} + +/*********************************************************************** + * MFLockPlatform (mfplat.@) + */ +HRESULT WINAPI MFLockPlatform(void) +{ + InterlockedIncrement(&platform_lock); + + return S_OK; +} + +/*********************************************************************** + * MFUnlockPlatform (mfplat.@) + */ +HRESULT WINAPI MFUnlockPlatform(void) +{ + InterlockedDecrement(&platform_lock); + return S_OK; } diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index b4e6c77..9813789 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -118,7 +118,7 @@ @ stub MFInitVideoFormat_RGB @ stub MFInvokeCallback @ stub MFJoinIoPort -@ stub MFLockPlatform +@ stdcall MFLockPlatform() @ stub MFLockWorkQueue @ stub MFPutWorkItem @ stub MFPutWorkItemEx @@ -146,7 +146,7 @@ @ stub MFTraceError @ stub MFTraceFuncEnter @ stub MFUnblockThread -@ stub MFUnlockPlatform +@ stdcall MFUnlockPlatform() @ stub MFUnlockWorkQueue @ stub MFUnwrapMediaType @ stub MFValidateMediaTypeSize diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 762af24..32c7a6c 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -83,6 +83,8 @@ static ULONG WINAPI async_result_Release(IMFAsyncResult *iface) if (result->state) IUnknown_Release(result->state); heap_free(result); + + MFUnlockPlatform(); } return refcount; @@ -172,6 +174,8 @@ HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, if (!result) return E_OUTOFMEMORY; + MFLockPlatform(); + result->result.AsyncResult.lpVtbl = &async_result_vtbl; result->refcount = 1; result->object = object;

1 0

Paul Gofman : ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 7ce2a8e0ae3d107f7dbeeeebb4b1189d34d27827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce2a8e0ae3d107f7dbeeeeb… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:39 2019 +0300 ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31954 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ++-- dlls/ntdll/file.c | 3 ++- dlls/ntdll/tests/file.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c9c2dd2..18cd18d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5177,9 +5177,9 @@ static void test_overlapped_read(void) bytes_count = 0xffffffff; ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); - todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); - todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); ok(ret, "Unexpected error %u.\n", GetLastError()); ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a43fe71..1cf3ae2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1014,7 +1014,8 @@ err: } if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total ); - + if (async_read && (options & FILE_NO_INTERMEDIATE_BUFFERING) && status == STATUS_SUCCESS) + return STATUS_PENDING; return status; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7b35569..e210a6e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -742,7 +742,7 @@ static void read_file_test(void) ResetEvent(event); status = pNtReadFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - todo_wine ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + ok(status == STATUS_PENDING, "Wrong status %x.\n", status); WaitForSingleObject(event, 1000); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information);

1 0

Andrey Gusev : ext-ms-win-gdi-font-l1-1-0: Add dll.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 5de4a5bc2ff0001680521863ef0c3200137bee04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de4a5bc2ff0001680521863… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:52 2019 +0200 ext-ms-win-gdi-font-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-font-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 2217ebd..9f9f438 100755 --- a/configure +++ b/configure @@ -1268,6 +1268,7 @@ enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 +enable_ext_ms_win_gdi_font_l1_1_0 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 @@ -19573,6 +19574,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-0 enable_ext_ms_win_gdi_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-0 enable_ext_ms_win_gdi_font_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 diff --git a/configure.ac b/configure.ac index 6c6e708..f8cce37 100644 --- a/configure.ac +++ b/configure.ac @@ -3306,6 +3306,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in new file mode 100644 index 0000000..2361294 --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-font-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-font-l1-1-0/ext-ms-win-gdi-font-l1-1-0.spec b/dlls/ext-ms-win-gdi-font-l1-1-0/ext-ms-win-gdi-font-l1-1-0.spec new file mode 100644 index 0000000..8b7c518 --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-0/ext-ms-win-gdi-font-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall CreateFontIndirectA(ptr) gdi32.CreateFontIndirectA +@ stdcall CreateFontIndirectW(ptr) gdi32.CreateFontIndirectW +@ stdcall EnumFontFamiliesA(long str ptr long) gdi32.EnumFontFamiliesA +@ stdcall EnumFontFamiliesExA(long ptr ptr long long) gdi32.EnumFontFamiliesExA +@ stdcall EnumFontFamiliesExW(long ptr ptr long long) gdi32.EnumFontFamiliesExW +@ stdcall GetFontData(long long long ptr long) gdi32.GetFontData +@ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData +@ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo +@ stdcall GetFontRealizationInfo(long ptr) gdi32.GetFontRealizationInfo +@ stdcall GetTextFaceA(long long ptr) gdi32.GetTextFaceA +@ stdcall GetTextMetricsW(long ptr) gdi32.GetTextMetricsW +@ stdcall TranslateCharsetInfo(ptr ptr long) gdi32.TranslateCharsetInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 9fe4dd1..9201be4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -438,6 +438,7 @@ my @dll_groups = "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", + "ext-ms-win-gdi-font-l1-1-0", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-gdi-font-l1-1-1: Add dll.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: a21448a663dea82a6200587d8e5983d941d9f974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21448a663dea82a6200587d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:53 2019 +0200 ext-ms-win-gdi-font-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in | 1 + .../ext-ms-win-gdi-font-l1-1-1.spec | 30 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 35 insertions(+) diff --git a/configure b/configure index 9f9f438..2dded71 100755 --- a/configure +++ b/configure @@ -1269,6 +1269,7 @@ enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_gdi_font_l1_1_0 +enable_ext_ms_win_gdi_font_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 @@ -19575,6 +19576,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-0 enable_ext_ms_win_gdi_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-0 enable_ext_ms_win_gdi_font_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-1 enable_ext_ms_win_gdi_font_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 diff --git a/configure.ac b/configure.ac index f8cce37..29be1d0 100644 --- a/configure.ac +++ b/configure.ac @@ -3307,6 +3307,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in b/dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in new file mode 100644 index 0000000..eb60e7a --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-font-l1-1-1.dll diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec new file mode 100644 index 0000000..c1b0679 --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec @@ -0,0 +1,30 @@ +@ stdcall CreateFontIndirectA(ptr) gdi32.CreateFontIndirectA +@ stdcall CreateFontIndirectW(ptr) gdi32.CreateFontIndirectW +@ stdcall EnumFontFamiliesA(long str ptr long) gdi32.EnumFontFamiliesA +@ stdcall EnumFontFamiliesExA(long ptr ptr long long) gdi32.EnumFontFamiliesExA +@ stdcall EnumFontFamiliesExW(long ptr ptr long long) gdi32.EnumFontFamiliesExW +@ stdcall ExtTextOutA(long long long long ptr str long ptr) gdi32.ExtTextOutA +@ stdcall ExtTextOutW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW +@ stdcall GetCharABCWidthsW(long long long ptr) gdi32.GetCharABCWidthsW +@ stdcall GetCharWidth32A(long long long long) gdi32.GetCharWidth32A +@ stdcall GetCharWidthA(long long long long) gdi32.GetCharWidthA +@ stdcall GetCharWidthW(long long long long) gdi32.GetCharWidthW +@ stdcall GetFontData(long long long ptr long) gdi32.GetFontData +@ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData +@ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo +@ stdcall GetFontRealizationInfo(long ptr) gdi32.GetFontRealizationInfo +@ stdcall GetGlyphIndicesW(long ptr long ptr long) gdi32.GetGlyphIndicesW +@ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) gdi32.GetGlyphOutlineW +@ stdcall GetKerningPairsA(long long ptr) gdi32.GetKerningPairsA +@ stdcall GetKerningPairsW(long long ptr) gdi32.GetKerningPairsW +@ stdcall GetOutlineTextMetricsA(long long ptr) gdi32.GetOutlineTextMetricsA +@ stdcall GetOutlineTextMetricsW(long long ptr) gdi32.GetOutlineTextMetricsW +@ stdcall GetTextCharsetInfo(long ptr long) gdi32.GetTextCharsetInfo +@ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) gdi32.GetTextExtentExPointW +@ stdcall GetTextFaceA(long long ptr) gdi32.GetTextFaceA +@ stdcall GetTextFaceW(long long ptr) gdi32.GetTextFaceW +@ stdcall GetTextMetricsW(long ptr) gdi32.GetTextMetricsW +@ stdcall SetTextAlign(long long) gdi32.SetTextAlign +@ stdcall SetTextColor(long long) gdi32.SetTextColor +@ stdcall TextOutW(long long long wstr long) gdi32.TextOutW +@ stdcall TranslateCharsetInfo(ptr ptr long) gdi32.TranslateCharsetInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 9201be4..8933ae4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -439,6 +439,7 @@ my @dll_groups = "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-font-l1-1-0", + "ext-ms-win-gdi-font-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-gui-l1-1-0: Add dll.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 2764f8c12bc8873bca0b1ed5fd598ea94cc6249e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2764f8c12bc8873bca0b1ed5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:51 2019 +0200 ext-ms-win-ntuser-gui-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-gui-l1-1-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index 2161c57..2217ebd 100755 --- a/configure +++ b/configure @@ -1272,6 +1272,7 @@ enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_draw_l1_1_0 +enable_ext_ms_win_ntuser_gui_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 @@ -19576,6 +19577,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_ wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-1-0 enable_ext_ms_win_ntuser_gui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 diff --git a/configure.ac b/configure.ac index 300c4e2..6c6e708 100644 --- a/configure.ac +++ b/configure.ac @@ -3310,6 +3310,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in new file mode 100644 index 0000000..919be10 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-gui-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-gui-l1-1-0/ext-ms-win-ntuser-gui-l1-1-0.spec b/dlls/ext-ms-win-ntuser-gui-l1-1-0/ext-ms-win-ntuser-gui-l1-1-0.spec new file mode 100644 index 0000000..212f509 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-gui-l1-1-0/ext-ms-win-ntuser-gui-l1-1-0.spec @@ -0,0 +1,16 @@ +@ stdcall ClientToScreen(long ptr) user32.ClientToScreen +@ stdcall DestroyCursor(long) user32.DestroyCursor +@ stdcall DestroyIcon(long) user32.DestroyIcon +@ stdcall DrawIconEx(long long long long long long long long long) user32.DrawIconEx +@ stdcall FillRect(long ptr long) user32.FillRect +@ stdcall GetCursor() user32.GetCursor +@ stdcall GetCursorInfo(ptr) user32.GetCursorInfo +@ stdcall GetIconInfo(long ptr) user32.GetIconInfo +@ stdcall LoadCursorW(long wstr) user32.LoadCursorW +@ stdcall LoadIconA(long str) user32.LoadIconA +@ stdcall LoadIconW(long wstr) user32.LoadIconW +@ stdcall LoadImageA(long str long long long long) user32.LoadImageA +@ stdcall LoadImageW(long wstr long long long long) user32.LoadImageW +@ stdcall MapWindowPoints(long long ptr long) user32.MapWindowPoints +@ stdcall ScreenToClient(long ptr) user32.ScreenToClient +@ stdcall SetCursor(long) user32.SetCursor diff --git a/tools/make_specfiles b/tools/make_specfiles index c00f3bf..9fe4dd1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -377,6 +377,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-draw-l1-1-0", + "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1",

1 0

Andrey Gusev : ext-ms-win-gdi-draw-l1-1-0: Add dll.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: c62db16787d62cf38af79aee8646ee18b902f737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c62db16787d62cf38af79aee… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:50 2019 +0200 ext-ms-win-gdi-draw-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-draw-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index f3739a4..2161c57 100755 --- a/configure +++ b/configure @@ -1266,6 +1266,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +enable_ext_ms_win_gdi_draw_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 @@ -19569,6 +19570,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-0 enable_ext_ms_win_g wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-0 enable_ext_ms_win_gdi_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 diff --git a/configure.ac b/configure.ac index f7eb42b..300c4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3304,6 +3304,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..1a0efdf --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-draw-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec new file mode 100644 index 0000000..6f1f587 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall BitBlt(long long long long long long long long long) gdi32.BitBlt +@ stdcall CreateBitmap(long long long long ptr) gdi32.CreateBitmap +@ stdcall CreateCompatibleBitmap(long long long) gdi32.CreateCompatibleBitmap +@ stdcall CreateDIBSection(long ptr long ptr long long) gdi32.CreateDIBSection +@ stdcall CreateSolidBrush(long) gdi32.CreateSolidBrush +@ stdcall GdiFlush() gdi32.GdiFlush +@ stdcall GetBitmapBits(long long ptr) gdi32.GetBitmapBits +@ stdcall GetDIBits(long long long long ptr ptr long) gdi32.GetDIBits +@ stdcall GetWorldTransform(long ptr) gdi32.GetWorldTransform +@ stdcall LineTo(long long long) gdi32.LineTo +@ stdcall MoveToEx(long long long ptr) gdi32.MoveToEx +@ stdcall PolyBezierTo(long ptr long) gdi32.PolyBezierTo +@ stdcall SetDIBits(long long long long ptr ptr long) gdi32.SetDIBits +@ stdcall SetGraphicsMode(long long) gdi32.SetGraphicsMode +@ stdcall SetLayout(long long) gdi32.SetLayout +@ stdcall SetWorldTransform(long ptr) gdi32.SetWorldTransform +@ stdcall StretchBlt(long long long long long long long long long long long) gdi32.StretchBlt +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) gdi32.StretchDIBits diff --git a/tools/make_specfiles b/tools/make_specfiles index d93723d..c00f3bf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -435,6 +435,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", + "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0",

1 0