wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Nikolay Sivov : dwrite: Use gdi-compatible placements in case of gdi-compatible layouts.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 13083dcd523b4edcb275d0cfa7619558e386ee5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13083dcd523b4edcb275d0cfa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 9 01:07:33 2015 +0300 dwrite: Use gdi-compatible placements in case of gdi-compatible layouts. --- dlls/dwrite/layout.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ad8ac44..beb97b3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -441,10 +441,18 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) goto memerr; /* now set advances and offsets */ - hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, text_props, - run->descr.stringLength, run->run.glyphIndices, glyph_props, run->run.glyphCount, run->run.fontFace, - run->run.fontEmSize, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, - NULL, NULL, 0, run->advances, run->offsets); + if (layout->gdicompatible) + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, + text_props, run->descr.stringLength, run->run.glyphIndices, glyph_props, run->run.glyphCount, + run->run.fontFace, run->run.fontEmSize, layout->pixels_per_dip, &layout->transform, layout->use_gdi_natural, + FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, NULL, NULL, 0, + run->advances, run->offsets); + else + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, text_props, + run->descr.stringLength, run->run.glyphIndices, glyph_props, run->run.glyphCount, run->run.fontFace, + run->run.fontEmSize, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, + NULL, NULL, 0, run->advances, run->offsets); + heap_free(text_props); heap_free(glyph_props); if (FAILED(hr))

1 0

Nikolay Sivov : dwrite: Store additional properties for gdi-compatible layouts.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 05fd95e5e4603665eae1317e73ffaf08dbbf3cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fd95e5e4603665eae1317e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 9 00:35:14 2015 +0300 dwrite: Store additional properties for gdi-compatible layouts. --- dlls/dwrite/dwrite_private.h | 8 +++++ dlls/dwrite/gdiinterop.c | 7 ----- dlls/dwrite/layout.c | 72 +++++++++++++++++++++++++++++++++++--------- dlls/dwrite/main.c | 6 ++-- 4 files changed, 70 insertions(+), 23 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5227762..f5c986e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -22,6 +22,13 @@ #include "wine/debug.h" #include "wine/unicode.h" +static const DWRITE_MATRIX identity = +{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f +}; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -95,6 +102,7 @@ extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_gdicompat_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT,const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory2*,IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 4e2870d..bead01d 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -31,13 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -static const DWRITE_MATRIX identity = -{ - 1.0f, 0.0f, - 0.0f, 1.0f, - 0.0f, 0.0f -}; - struct gdiinterop { IDWriteGdiInterop IDWriteGdiInterop_iface; IDWriteFactory2 *factory; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ea35bfa..ad8ac44 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -133,6 +133,12 @@ struct dwrite_textlayout { DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; + + /* gdi-compatible layout specifics */ + BOOL gdicompatible; + FLOAT pixels_per_dip; + BOOL use_gdi_natural; + DWRITE_MATRIX transform; }; struct dwrite_textformat { @@ -2097,18 +2103,12 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } -HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) +static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { - struct dwrite_textlayout *layout; - struct layout_range *range; DWRITE_TEXT_RANGE r = { 0, len }; + struct layout_range *range; HRESULT hr; - *ret = NULL; - - layout = heap_alloc(sizeof(struct dwrite_textlayout)); - if (!layout) return E_OUTOFMEMORY; - layout->IDWriteTextLayout2_iface.lpVtbl = &dwritetextlayoutvtbl; layout->IDWriteTextAnalysisSink_iface.lpVtbl = &dwritetextlayoutsinkvtbl; layout->IDWriteTextAnalysisSource_iface.lpVtbl = &dwritetextlayoutsourcevtbl; @@ -2123,6 +2123,11 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); + layout->gdicompatible = FALSE; + layout->pixels_per_dip = 0.0; + layout->use_gdi_natural = FALSE; + memset(&layout->transform, 0, sizeof(layout->transform)); + layout->str = heap_strdupnW(str, len); if (len && !layout->str) { hr = E_OUTOFMEMORY; @@ -2134,13 +2139,10 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma goto fail; range = alloc_layout_range(layout, &r); - if (!range) { - hr = E_OUTOFMEMORY; - goto fail; - } - list_add_head(&layout->ranges, &range->entry); + if (!range) + return E_OUTOFMEMORY; - *ret = (IDWriteTextLayout*)&layout->IDWriteTextLayout2_iface; + list_add_head(&layout->ranges, &range->entry); return S_OK; fail: @@ -2148,6 +2150,48 @@ fail: return hr; } +HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) +{ + struct dwrite_textlayout *layout; + HRESULT hr; + + *ret = NULL; + + layout = heap_alloc(sizeof(struct dwrite_textlayout)); + if (!layout) return E_OUTOFMEMORY; + + hr = init_textlayout(str, len, format, maxwidth, maxheight, layout); + if (hr == S_OK) + *ret = (IDWriteTextLayout*)&layout->IDWriteTextLayout2_iface; + + return hr; +} + +HRESULT create_gdicompat_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, + FLOAT pixels_per_dip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, IDWriteTextLayout **ret) +{ + struct dwrite_textlayout *layout; + HRESULT hr; + + *ret = NULL; + + layout = heap_alloc(sizeof(struct dwrite_textlayout)); + if (!layout) return E_OUTOFMEMORY; + + hr = init_textlayout(str, len, format, maxwidth, maxheight, layout); + if (hr == S_OK) { + /* set gdi-specific properties */ + layout->gdicompatible = TRUE; + layout->pixels_per_dip = pixels_per_dip; + layout->use_gdi_natural = use_gdi_natural; + layout->transform = transform ? *transform : identity; + + *ret = (IDWriteTextLayout*)&layout->IDWriteTextLayout2_iface; + } + + return hr; +} + static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *iface, REFIID riid, void **obj) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a63f48f..58273fe 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -985,11 +985,13 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory DWRITE_MATRIX const* transform, BOOL use_gdi_natural, IDWriteTextLayout **layout) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%s:%u %p %f %f %f %p %d %p): semi-stub\n", This, debugstr_wn(string, len), len, format, layout_width, layout_height, + + TRACE("(%p)->(%s:%u %p %f %f %f %p %d %p)\n", This, debugstr_wn(string, len), len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); if (!format) return E_INVALIDARG; - return create_textlayout(string, len, format, layout_width, layout_height, layout); + return create_gdicompat_textlayout(string, len, format, layout_width, layout_height, pixels_per_dip, transform, + use_gdi_natural, layout); } static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory2 *iface, IDWriteTextFormat *format,

1 0

Piotr Caban : msvcp: Fix format parsing in time_put_wchar_put_format.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 998472d1eb80e11bc573360a98589ececad99a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998472d1eb80e11bc573360a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 9 08:29:16 2015 +0100 msvcp: Fix format parsing in time_put_wchar_put_format. --- dlls/msvcp60/locale.c | 7 ++++--- dlls/msvcp90/locale.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 027c529..7aa09c5 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -7589,15 +7589,16 @@ ostreambuf_iterator_wchar* __thiscall time_put_wchar_put_format(const time_put * ostreambuf_iterator_wchar_put(&dest, *pat++); }else if(++pat == pat_end) { ostreambuf_iterator_wchar_put(&dest, percent); - }else if(!_Wcrtomb(c, *pat, NULL, &this->cvt) || (*c=='#' && pat+1==pat_end)) { + }else if(_Wcrtomb(c, *pat, NULL, &this->cvt)!=1 || (*c=='#' && pat+1==pat_end)) { ostreambuf_iterator_wchar_put(&dest, percent); ostreambuf_iterator_wchar_put(&dest, *pat++); }else { + pat++; if(*c == '#') { - if(!_Wcrtomb(c, *pat++, NULL, &this->cvt)) { + if(_Wcrtomb(c, *pat++, NULL, &this->cvt) != 1) { ostreambuf_iterator_wchar_put(&dest, percent); + ostreambuf_iterator_wchar_put(&dest, *(pat-2)); ostreambuf_iterator_wchar_put(&dest, *(pat-1)); - ostreambuf_iterator_wchar_put(&dest, *pat); }else { time_put_wchar_put(this, &dest, dest, base, t, *c, '#'); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9dedcc6..568585c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9249,15 +9249,16 @@ ostreambuf_iterator_wchar* __thiscall time_put_wchar_put_format(const time_put * ostreambuf_iterator_wchar_put(&dest, *pat++); }else if(++pat == pat_end) { ostreambuf_iterator_wchar_put(&dest, percent); - }else if(!_Wcrtomb(c, *pat, NULL, &this->cvt) || (*c=='#' && pat+1==pat_end)) { + }else if(_Wcrtomb(c, *pat, NULL, &this->cvt)!=1 || (*c=='#' && pat+1==pat_end)) { ostreambuf_iterator_wchar_put(&dest, percent); ostreambuf_iterator_wchar_put(&dest, *pat++); }else { + pat++; if(*c == '#') { - if(!_Wcrtomb(c, *pat++, NULL, &this->cvt)) { + if(_Wcrtomb(c, *pat++, NULL, &this->cvt) != 1) { ostreambuf_iterator_wchar_put(&dest, percent); + ostreambuf_iterator_wchar_put(&dest, *(pat-2)); ostreambuf_iterator_wchar_put(&dest, *(pat-1)); - ostreambuf_iterator_wchar_put(&dest, *pat); }else { time_put_wchar_put(this, &dest, dest, base, fill, t, *c, '#'); }

1 0

Bruno Jesus : ws2_32/tests: Show that send/ recv functions set last error to zero on success.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 35a887acc5d8988358b48ac162649e19671c00ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a887acc5d8988358b48ac16… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 9 01:19:20 2015 -0200 ws2_32/tests: Show that send/recv functions set last error to zero on success. --- dlls/ws2_32/tests/sock.c | 71 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d87f326..ce47712 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1769,8 +1769,10 @@ static void test_ip_pktinfo(void) * Send a packet from the client to the server and test for specifying * a short control header. */ + SetLastError(0xdeadbeef); rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); hdr.Control.len = 1; rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); err=WSAGetLastError(); @@ -1783,8 +1785,10 @@ static void test_ip_pktinfo(void) rc=pWSARecvMsg(s1, &hdr, NULL, &ov, NULL); err=WSAGetLastError(); ok(rc != 0 && err == WSA_IO_PENDING, "WSARecvMsg() failed error: %d\n", err); + SetLastError(0xdeadbeef); rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) { skip("Server side did not receive packet, some tests skipped.\n"); @@ -5123,16 +5127,24 @@ static void test_events(int useMessages) /* broken on all windows - FD_CONNECT error is garbage */ /* Test simple send/recv */ + SetLastError(0xdeadbeef); ret = send(dst, buffer, 100, 0); ok(ret == 100, "Failed to send buffer %d err %d\n", ret, GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); + SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, MSG_PEEK); ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); + SetLastError(0xdeadbeef); ret = recv(src, buffer, 50, 0); ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); ret = recv(src, buffer, 50, 0); @@ -5156,8 +5168,11 @@ static void test_events(int useMessages) else ok_event_seq(src, hEvent, empty_seq, NULL, 0); + SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, 0); ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError()); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, empty_seq, NULL, 0); /* Interaction with overlapped */ @@ -5199,8 +5214,10 @@ static void test_events(int useMessages) ok(buffer[1] == '2', "Got %c instead of 2\n", buffer[1]); } + SetLastError(0xdeadbeef); ret = send(dst, "1", 1, 0); ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); ret = recv(src, buffer, 1, 0); @@ -5571,17 +5588,23 @@ static void test_WSASendMsg(void) set_blocking(sock, TRUE); bytesSent = 0; + SetLastError(0xdeadbeef); ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(!ret, "WSASendMsg should have worked\n"); + ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef) /* Win <= 2008 */, + "Expected 0, got %d\n", GetLastError()); ok(bytesSent == iovec[0].len, "incorret bytes sent, expected %d, sent %d\n", iovec[0].len, bytesSent); /* receive data */ addrlen = sizeof(sockaddr); memset(buffer, 0, sizeof(buffer)); + SetLastError(0xdeadbeef); ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); /* A successful call to WSASendMsg must have bound the socket */ addrlen = sizeof(sockaddr); @@ -5596,17 +5619,23 @@ static void test_WSASendMsg(void) msg.dwBufferCount = 2; /* send both buffers */ bytesSent = 0; + SetLastError(0xdeadbeef); ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(!ret, "WSASendMsg should have worked\n"); ok(bytesSent == iovec[0].len + iovec[1].len, "incorret bytes sent, expected %d, sent %d\n", iovec[0].len + iovec[1].len, bytesSent); + ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef) /* Win <= 2008 */, + "Expected 0, got %d\n", GetLastError()); /* receive data */ addrlen = sizeof(sockaddr); memset(buffer, 0, sizeof(buffer)); + SetLastError(0xdeadbeef); ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); closesocket(sock); closesocket(dst); @@ -5719,8 +5748,6 @@ static void test_WSARecv(void) BOOL bret; HANDLE thread; - memset(&ov, 0, sizeof(ov)); - tcp_socketpair(&src, &dest); if (src == INVALID_SOCKET || dest == INVALID_SOCKET) { @@ -5728,9 +5755,45 @@ static void test_WSARecv(void) goto end; } - bufs.len = sizeof(buf); - bufs.buf = buf; + memset(&ov, 0, sizeof(ov)); flags = 0; + bufs.len = 2; + bufs.buf = buf; + + /* Send 4 bytes and receive in two calls of 2 */ + SetLastError(0xdeadbeef); + iret = send(src, "test", 4, 0); + ok(iret == 4, "Expected 4, got %d\n", iret); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + bytesReturned = 0xdeadbeef; + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + ok(!iret, "Expected 0, got %d\n", iret); + ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + bytesReturned = 0xdeadbeef; + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + ok(!iret, "Expected 0, got %d\n", iret); + ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + + bufs.len = 4; + SetLastError(0xdeadbeef); + iret = send(src, "test", 4, 0); + ok(iret == 4, "Expected 4, got %d\n", iret); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + bytesReturned = 0xdeadbeef; + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + ok(!iret, "Expected 0, got %d\n", iret); + ok(bytesReturned, "Expected 4, got %d\n", bytesReturned); +todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + + bufs.len = sizeof(buf); ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError());

1 0

Bruno Jesus : ws2_32: Print the correct variable.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: ed281c743cb81130dedf072b918872f073776d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed281c743cb81130dedf072b9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 8 21:48:11 2015 -0200 ws2_32: Print the correct variable. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4c8d705..e1b2a05 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6368,7 +6368,7 @@ int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set) break; } - TRACE("(socket %04lx, fd_set %p, count %i) <- %d\n", s, set, i, ret); + TRACE("(socket %04lx, fd_set %p, count %i) <- %d\n", s, set, set->fd_count, ret); return ret; }

1 0

Matteo Bruni : wined3d: Use the core version of the glBlend* functions.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 3ccb66f47214e885044ac055b44068075ea0e999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccb66f47214e885044ac055b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 8 17:20:22 2015 +0100 wined3d: Use the core version of the glBlend* functions. --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/state.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97dc6c9..f42769b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2876,6 +2876,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* Newer core functions */ USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */ + USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ + USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ + USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */ #undef USE_GL_FUNC #ifndef USE_WIN32_OPENGL @@ -2892,6 +2896,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) } while (0) MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB); + MAP_GL_FUNCTION(glBlendColor, glBlendColorEXT); + MAP_GL_FUNCTION(glBlendEquation, glBlendEquationEXT); + MAP_GL_FUNCTION(glBlendEquationSeparate, glBlendEquationSeparateEXT); + MAP_GL_FUNCTION(glBlendFuncSeparate, glBlendFuncSeparateEXT); #undef MAP_GL_FUNCTION } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 700db84..048ec13 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -317,7 +317,7 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ if (state->render_states[WINED3D_RS_BLENDOPALPHA] && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) { - WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparateEXT\n"); + WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparate.\n"); return; } @@ -327,12 +327,12 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { - GL_EXTCALL(glBlendEquationSeparateEXT(blend_equation, blend_equation_alpha)); - checkGLcall("glBlendEquationSeparateEXT"); + GL_EXTCALL(glBlendEquationSeparate(blend_equation, blend_equation_alpha)); + checkGLcall("glBlendEquationSeparate"); } else { - GL_EXTCALL(glBlendEquationEXT(blend_equation)); + GL_EXTCALL(glBlendEquation(blend_equation)); checkGLcall("glBlendEquation"); } } @@ -462,7 +462,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st /* Separate alpha blending requires GL_EXT_blend_function_separate, so make sure it is around */ if (!context->gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) { - WARN("Unsupported in local OpenGL implementation: glBlendFuncSeparateEXT\n"); + WARN("Unsupported in local OpenGL implementation: glBlendFuncSeparate.\n"); return; } @@ -486,8 +486,8 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st dstBlendAlpha = gl_blend_factor(state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); } - GL_EXTCALL(glBlendFuncSeparateEXT(srcBlend, dstBlend, srcBlendAlpha, dstBlendAlpha)); - checkGLcall("glBlendFuncSeparateEXT"); + GL_EXTCALL(glBlendFuncSeparate(srcBlend, dstBlend, srcBlendAlpha, dstBlendAlpha)); + checkGLcall("glBlendFuncSeparate"); } else { @@ -504,7 +504,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st static void state_blendfactor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n"); + WARN("Unsupported in local OpenGL implementation: glBlendColor.\n"); } static void state_blendfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -515,7 +515,7 @@ static void state_blendfactor(struct wined3d_context *context, const struct wine TRACE("Setting blend factor to %#x.\n", state->render_states[WINED3D_RS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_BLENDFACTOR], col); - GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3])); + GL_EXTCALL(glBlendColor(col[0], col[1], col[2], col[3])); checkGLcall("glBlendColor"); }

1 0

Matteo Bruni : wined3d: Prefer the core glActiveTexture function.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 993075cdb36e95a9143fb3b7d20b3c9365e8e9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993075cdb36e95a9143fb3b7d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 8 17:20:21 2015 +0100 wined3d: Prefer the core glActiveTexture function. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/gl_compat.c | 5 +++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bc66c4a..a7babda 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7294,7 +7294,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE1)); + GL_EXTCALL(glActiveTexture(GL_TEXTURE1)); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, priv->palette_texture); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4da8c7d..ead7e1b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc for (i = 0; i < count; ++i) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); + GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i)); + checkGLcall("glActiveTexture"); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]); checkGLcall("glBindTexture"); @@ -2115,8 +2115,8 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) /* Context activation is done by the caller. */ void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0 + unit)); - checkGLcall("glActiveTextureARB"); + GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); + checkGLcall("glActiveTexture"); context->active_texture = unit; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4266a7..97dc6c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2873,6 +2873,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(wglGetPixelFormatAttribivARB) USE_GL_FUNC(wglSetPixelFormatWINE) USE_GL_FUNC(wglSwapIntervalEXT) + + /* Newer core functions */ + USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */ #undef USE_GL_FUNC #ifndef USE_WIN32_OPENGL @@ -2880,6 +2883,16 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* note that we still need the above wglGetProcAddress calls to initialize the table */ gl_info->gl_ops.ext = ((struct opengl_funcs *)NtCurrentTeb()->glTable)->ext; #endif + +#define MAP_GL_FUNCTION(core_func, ext_func) \ + do \ + { \ + if (!gl_info->gl_ops.ext.p_##core_func) \ + gl_info->gl_ops.ext.p_##core_func = gl_info->gl_ops.ext.p_##ext_func; \ + } while (0) + + MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB); +#undef MAP_GL_FUNCTION } static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 4dd9062..a50d5c4 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -112,7 +112,8 @@ static void WINE_GLAPI wine_glMultiTexCoord4svARB(GLenum target, const GLshort * context_get_current()->gl_info->gl_ops.gl.p_glTexCoord4sv(v); } -static void WINE_GLAPI wine_glActiveTextureARB(GLenum texture) { +static void WINE_GLAPI wine_glActiveTexture(GLenum texture) +{ if(texture != GL_TEXTURE0) { ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); return; @@ -351,7 +352,7 @@ void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) if (!gl_info->supported[ARB_MULTITEXTURE]) { TRACE("Applying GL_ARB_multitexture emulation hooks\n"); - gl_info->gl_ops.ext.p_glActiveTextureARB = wine_glActiveTextureARB; + gl_info->gl_ops.ext.p_glActiveTexture = wine_glActiveTexture; gl_info->gl_ops.ext.p_glClientActiveTextureARB = wine_glClientActiveTextureARB; gl_info->gl_ops.ext.p_glMultiTexCoord1fARB = wine_glMultiTexCoord1fARB; gl_info->gl_ops.ext.p_glMultiTexCoord1fvARB = wine_glMultiTexCoord1fvARB;

1 0

Matteo Bruni : wined3d: Inline GL_EXT_FUNCS_GEN in load_gl_funcs.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: c603e47986e45180c3a2ef983a4288f3491928b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c603e47986e45180c3a2ef983… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 8 17:20:20 2015 +0100 wined3d: Inline GL_EXT_FUNCS_GEN in load_gl_funcs. --- dlls/wined3d/directx.c | 431 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_gl.h | 436 +--------------------------------------------- 2 files changed, 431 insertions(+), 436 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c603e47986e45180c3a2e…

1 0

Piotr Caban : msvcp: Fix setting decimal point and thousands separator in numpunct_wchar__Init.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: e899bd82491a3eb5b73f716b89c4a3c702cb060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e899bd82491a3eb5b73f716b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 8 18:19:41 2015 +0100 msvcp: Fix setting decimal point and thousands separator in numpunct_wchar__Init. --- dlls/msvcp60/locale.c | 20 ++++++++++---------- dlls/msvcp90/locale.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 53de64c..027c529 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -1997,6 +1997,14 @@ int __cdecl _Mbrtowc(wchar_t *out, const char *in, MSVCP_size_t len, int *state, return 1; } +static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) +{ + int state = 0; + wchar_t ret; + + return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; +} + /* ?_Dowiden@?$ctype@_W@std@@IBE_WD@Z */ /* ?_Dowiden@?$ctype@_W@std@@IEBA_WD@Z */ /* ?_Dowiden@?$ctype@G@std@@IBEGD@Z */ @@ -3454,8 +3462,8 @@ static void numpunct_wchar__Init(numpunct_wchar *this, if(this->grouping) memcpy((char*)this->grouping, lc->grouping, len); - this->dp = lc->decimal_point[0]; - this->sep = lc->thousands_sep[0]; + this->dp = mb_to_wc(lc->decimal_point[0], &cvt); + this->sep = mb_to_wc(lc->thousands_sep[0], &cvt); } if(!this->false_name || !this->true_name || !this->grouping) { @@ -4083,14 +4091,6 @@ num_get* num_get_short_use_facet(const locale *loc) return obj; } -static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) -{ - int state = 0; - wchar_t ret; - - return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; -} - static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, istreambuf_iterator_wchar *last, const locale *loc, numpunct_wchar *numpunct) { diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 097dad8..9dedcc6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2394,6 +2394,14 @@ int __cdecl _Mbrtowc(wchar_t *out, const char *in, MSVCP_size_t len, int *state, return 1; } +static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) +{ + int state = 0; + wchar_t ret; + + return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; +} + /* ?_Dowiden@?$ctype@_W@std@@IBE_WD@Z */ /* ?_Dowiden@?$ctype@_W@std@@IEBA_WD@Z */ /* ?_Dowiden@?$ctype@G@std@@IBEGD@Z */ @@ -4167,8 +4175,8 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this, if(this->grouping) memcpy((char*)this->grouping, lc->grouping, len); - this->dp = lc->decimal_point[0]; - this->sep = lc->thousands_sep[0]; + this->dp = mb_to_wc(lc->decimal_point[0], &cvt); + this->sep = mb_to_wc(lc->thousands_sep[0], &cvt); } if(!this->false_name || !this->true_name || !this->grouping) { @@ -4896,14 +4904,6 @@ num_get* num_get_short_use_facet(const locale *loc) return obj; } -static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) -{ - int state = 0; - wchar_t ret; - - return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; -} - static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, istreambuf_iterator_wchar *last, const locale *loc, numpunct_wchar *numpunct) {

1 0

Matteo Bruni : winemac: Implement wglCreateContextAttribsARB.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: d5846519603b2177ea9ee8582860928059714fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5846519603b2177ea9ee8582… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 8 15:07:48 2015 +0100 winemac: Implement wglCreateContextAttribsARB. It also allows to create core profile contexts. --- dlls/winemac.drv/opengl.c | 544 +++++++++++++++++++++++++++++++--------------- 1 file changed, 366 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5846519603b2177ea9ee…

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
31
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-commits January 2015