May 2016 - Wine-Commits - list.winehq.org

Andrew Eikum : strmbase: Initialize QualityControl struct on allocation.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 97fea6d80e043b5411c82cbc0b53d236e4d6532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fea6d80e043b5411c82cbc0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 17 14:02:49 2016 -0500 strmbase: Initialize QualityControl struct on allocation. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index ce14c72..46e0193 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -43,7 +43,7 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl { QualityControlImpl *This; TRACE("%p, %p, %p\n", input, self, ppv); - *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(QualityControlImpl)); if (!*ppv) return E_OUTOFMEMORY; This = *ppv; @@ -51,6 +51,7 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl This->self = self; This->tonotify = NULL; This->clock = NULL; + This->current_rstart = This->current_rstop = -1; TRACE("-> %p\n", This); return S_OK; }

1 0

Andrew Eikum : quartz: Use correct scale for quality control proportion.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: b5f2833dbee16fa2881d7c9742b3dfb58958e18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f2833dbee16fa2881d7c974… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 17 13:43:32 2016 -0500 quartz: Use correct scale for quality control proportion. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8e34655..d6c4617 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -405,7 +405,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam else if (jitter < 0) jitter = 0; q.Type = (jitter > 0 ? Famine : Flood); - q.Proportion = 1.; + q.Proportion = 1000; q.Late = jitter; q.TimeStamp = tStart; IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q);

1 0

Nikolay Sivov : oledb32/tests: Simplify recount check.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: dc8f504b51663770cbf2d8ea5246762bd005bfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8f504b51663770cbf2d8ea5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:22:12 2016 +0300 oledb32/tests: Simplify recount check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 483454e..fdf4220 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -42,9 +42,10 @@ static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e' #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static void test_GetDataSource(WCHAR *initstring)

1 0

Maarten Lankhorst : dsound: Remove unconditional memory allocation in mixing thread.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: db316c124365ef73c03e6c8cb3e79a20c72ba856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db316c124365ef73c03e6c8cb… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:41:04 2016 -0500 dsound: Remove unconditional memory allocation in mixing thread. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 1 + dlls/dsound/dsound_private.h | 4 ++-- dlls/dsound/mixer.c | 24 ++++++++++++++++-------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7519951..fb9fd66 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -234,6 +234,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioStreamVolume_Release(device->volume); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); + HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 0ca8aec..d063046 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -87,8 +87,8 @@ struct DirectSoundDevice int speaker_num[DS_MAX_CHANNELS]; int num_speakers; int lfe_channel; - float *tmp_buffer; - DWORD tmp_buffer_len; + float *tmp_buffer, *cp_buffer; + DWORD tmp_buffer_len, cp_buffer_len; DSVOLUMEPAN volpan; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 727ceb8..217d4ce 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -292,18 +292,29 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * UINT fir_cachesize = (fir_len + dsbfirstep - 2) / dsbfirstep; UINT required_input = max_ipos + fir_cachesize; + float *intermediate, *fir_copy, *itmp; + + DWORD len = required_input * channels; + len += fir_cachesize; + len *= sizeof(float); + + if (!dsb->device->cp_buffer) { + dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len); + dsb->device->cp_buffer_len = len; + } else if (len > dsb->device->cp_buffer_len) { + dsb->device->cp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->cp_buffer, len); + dsb->device->cp_buffer_len = len; + } - float* intermediate = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * required_input * channels); + fir_copy = dsb->device->cp_buffer; + intermediate = fir_copy + fir_cachesize; - float* fir_copy = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * fir_cachesize); /* Important: this buffer MUST be non-interleaved * if you want -msse3 to have any effect. * This is good for CPU cache effects, too. */ - float* itmp = intermediate; + itmp = intermediate; for (channel = 0; channel < channels; channel++) for (i = 0; i < required_input; i++) *(itmp++) = get_current_sample(dsb, @@ -338,9 +349,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * *freqAccNum = freqAcc_end % dsb->freqAdjustDen; - HeapFree(GetProcessHeap(), 0, fir_copy); - HeapFree(GetProcessHeap(), 0, intermediate); - return max_ipos; }

1 0

Nikolay Sivov : comctl32/monthcal: Take into account day name width when setting calendar column width.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 2f2651a14eb4b5035b5ca19862ce7ca8cc0ee81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2651a14eb4b5035b5ca1986… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:08 2016 +0300 comctl32/monthcal: Take into account day name width when setting calendar column width. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 92e5367..36acb41 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -118,7 +118,6 @@ typedef struct HFONT hFont; HFONT hBoldFont; int textHeight; - int textWidth; int height_increment; int width_increment; INT delta; /* scroll rate; # of months that the */ @@ -2494,9 +2493,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy; WCHAR buff[80]; TEXTMETRICW tm; - SIZE size, sz; + INT day_width; RECT client; HFONT font; + SIZE size; HDC hdc; GetClientRect(infoPtr->hwndSelf, &client); @@ -2508,27 +2508,30 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) GetTextMetricsW(hdc, &tm); infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading; - /* find largest abbreviated day name for current locale */ - size.cx = sz.cx = 0; + /* find widest day name for current locale and font */ + day_width = 0; for (i = 0; i < 7; i++) { + SIZE sz; + if (get_localized_dayname(infoPtr, i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); - if (sz.cx > size.cx) size.cx = sz.cx; + if (sz.cx > day_width) day_width = sz.cx; } else /* locale independent fallback on failure */ { - static const WCHAR SunW[] = { 'S','u','n',0 }; - - GetTextExtentPoint32W(hdc, SunW, lstrlenW(SunW), &size); + static const WCHAR sunW[] = { 'S','u','n' }; + GetTextExtentPoint32W(hdc, sunW, countof(sunW), &sz); + day_width = sz.cx; break; } } - infoPtr->textWidth = size.cx + 2; + day_width += 2; /* recalculate the height and width increments and offsets */ + size.cx = 0; GetTextExtentPoint32W(hdc, O0W, 2, &size); /* restore the originally selected font */ @@ -2537,7 +2540,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; - infoPtr->width_increment = size.cx * 2 + 4; + infoPtr->width_increment = max(day_width, size.cx * 2 + 4); infoPtr->height_increment = infoPtr->textHeight; /* calculate title area */

1 0

Nikolay Sivov : comctl32/monthcal: Added support for MCS_SHORTDAYSOFWEEK style.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 7912acaab91d9ee5c88ac5bba6f45fc8b01a26b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7912acaab91d9ee5c88ac5bba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:07 2016 +0300 comctl32/monthcal: Added support for MCS_SHORTDAYSOFWEEK style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 19 +++++++++++++++---- include/commctrl.rh | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9d5b42e..92e5367 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1156,6 +1156,18 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, } } +static int get_localized_dayname(const MONTHCAL_INFO *infoPtr, unsigned int day, WCHAR *buff, unsigned int count) +{ + LCTYPE lctype; + + if (infoPtr->dwStyle & MCS_SHORTDAYSOFWEEK) + lctype = LOCALE_SSHORTESTDAYNAME1 + day; + else + lctype = LOCALE_SABBREVDAYNAME1 + day; + + return GetLocaleInfoW(LOCALE_USER_DEFAULT, lctype, buff, count); +} + /* paint a calendar area */ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { @@ -1196,7 +1208,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const i = infoPtr->firstDay; for(j = 0; j < 7; j++) { - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + (i+j+6)%7, buf, countof(buf)); + get_localized_dayname(infoPtr, (i + j + 6) % 7, buf, countof(buf)); DrawTextW(hdc, buf, strlenW(buf), &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE); OffsetRect(&r, infoPtr->width_increment, 0); } @@ -2500,8 +2512,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) size.cx = sz.cx = 0; for (i = 0; i < 7; i++) { - if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, - buff, countof(buff))) + if (get_localized_dayname(infoPtr, i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); if (sz.cx > size.cx) size.cx = sz.cx; @@ -2703,7 +2714,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; /* make room for week numbers */ - if ((lpss->styleNew ^ lpss->styleOld) & MCS_WEEKNUMBERS) + if ((lpss->styleNew ^ lpss->styleOld) & (MCS_WEEKNUMBERS | MCS_SHORTDAYSOFWEEK)) MONTHCAL_UpdateSize(infoPtr); return 0; diff --git a/include/commctrl.rh b/include/commctrl.rh index 863e141..b778ee7 100644 --- a/include/commctrl.rh +++ b/include/commctrl.rh @@ -186,6 +186,7 @@ #define MCS_NOTODAY 0x0010 #define MCS_NOTODAYCIRCLE 0x0008 #define MCS_NOTRAILINGDATES 0x0040 +#define MCS_SHORTDAYSOFWEEK 0x0080 /* Datetime Control */ #define DTS_SHORTDATEFORMAT 0x0000

1 0

Jacek Caban : wininet: Include config.h in internet.c for Mac configure macros.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 7d541b3fd3531e9edb334780f9ff3093fed6fd1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d541b3fd3531e9edb334780f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:15:49 2016 +0200 wininet: Include config.h in internet.c for Mac configure macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f7e974a..371c3d0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -26,15 +26,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "ws2tcpip.h" - -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> -#include <assert.h> +#include "config.h" #ifdef HAVE_CORESERVICES_CORESERVICES_H #define GetCurrentThread MacGetCurrentThread @@ -45,6 +37,16 @@ #undef DPRINTF #endif +#include "winsock2.h" +#include "ws2ipdef.h" + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <assert.h> + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -3370,7 +3372,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { struct sockaddr_storage saddr; - socklen_t sa_len = sizeof(saddr); + int sa_len = sizeof(saddr); WCHAR *host_z; int fd; BOOL b;

1 0

Jacek Caban : wininet: Initialize url_w in InternetCrackUrlA.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: e0e0b6b7c6c74a58f41cde96972c045b2e34e167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e0b6b7c6c74a58f41cde969… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:15:34 2016 +0200 wininet: Initialize url_w in InternetCrackUrlA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f012d96..f7e974a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1551,7 +1551,7 @@ BOOL WINAPI InternetCrackUrlA(const char *url, DWORD url_length, DWORD flags, UR { WCHAR *host = NULL, *user = NULL, *pass = NULL, *path = NULL, *scheme = NULL, *extra = NULL; URL_COMPONENTSW comp; - WCHAR *url_w; + WCHAR *url_w = NULL; BOOL ret; TRACE("(%s %u %x %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp);

1 0

Jacek Caban : wininet: Rewrite test_accept_encoding using more generic request.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: ce4bdcd0c1f619096631974d101eb4b95978671d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4bdcd0c1f619096631974d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:13:56 2016 +0200 wininet: Rewrite test_accept_encoding using more generic request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 78cec50..d42c3e7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -475,6 +475,18 @@ static void _close_request(unsigned line, test_request_t *req) ok_(__FILE__,line)(ret, "InternetCloseHandle(session) failed: %u\n", GetLastError()); } +#define receive_simple_request(a,b,c) _receive_simple_request(__LINE__,a,b,c) +static DWORD _receive_simple_request(unsigned line, HINTERNET req, char *buf, size_t buf_size) +{ + DWORD read = 0; + BOOL ret; + + ret = InternetReadFile(req, buf, buf_size, &read); + ok_(__FILE__,line)(ret, "InternetReadFile failed: %u\n", GetLastError()); + + return read; +} + static void close_async_handle(HINTERNET handle, HANDLE complete_event, int handle_cnt) { BOOL res; @@ -2055,7 +2067,8 @@ static DWORD CALLBACK server_thread(LPVOID param) int r, c = -1, i, on, count = 0; SOCKET s; struct sockaddr_in sa; - char buffer[0x100]; + char *buffer; + size_t buffer_size; WSADATA wsaData; int last_request = 0; char host_header[22]; @@ -2086,16 +2099,20 @@ static DWORD CALLBACK server_thread(LPVOID param) sprintf(host_header, "Host: localhost:%d", si->port); sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size = 1000); do { if(c == -1) c = accept(s, NULL, NULL); - memset(buffer, 0, sizeof buffer); - for(i=0; i<(sizeof buffer-1); i++) + memset(buffer, 0, buffer_size); + for(i=0;; i++) { - r = recv(c, &buffer[i], 1, 0); + if(i == buffer_size) + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, buffer_size *= 2); + + r = recv(c, buffer+i, 1, 0); if (r != 1) break; if (i<4) continue; @@ -2168,7 +2185,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "Content-Length: 100")) { if (strstr(buffer, "POST /test7b")) - recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); + recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } @@ -2259,7 +2276,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /testH")) { send(c, ok_with_length2, sizeof(ok_with_length2)-1, 0); - recvfrom(c, buffer, sizeof(buffer), 0, NULL, NULL); + recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, ok_with_length, sizeof(ok_with_length)-1, 0); } @@ -2341,13 +2358,6 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); - if (strstr(buffer, "/test_accept_encoding_http10")) - { - if (strstr(buffer, "Accept-Encoding: gzip")) - send(c, okmsg, sizeof okmsg-1, 0); - else - send(c, notokmsg, sizeof notokmsg-1, 0); - } if (strstr(buffer, "HEAD /upload.txt")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -2384,12 +2394,18 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(server_req_rec_event); WaitForSingleObject(conn_wait_event, INFINITE); } + if (strstr(buffer, "/echo_request")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, buffer, strlen(buffer), 0); + } shutdown(c, 2); closesocket(c); c = -1; } while (!last_request); closesocket(s); + HeapFree(GetProcessHeap(), 0, buffer); return 0; } @@ -4250,6 +4266,7 @@ static void test_request_content_length(int port) static void test_accept_encoding(int port) { HINTERNET ses, con, req; + char buf[1000]; BOOL ret; ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -4258,7 +4275,7 @@ static void test_accept_encoding(int port) con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequestA(con, "GET", "/echo_request", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(req, "Accept-Encoding: gzip\r\n", ~0u, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); @@ -4268,16 +4285,20 @@ static void test_accept_encoding(int port) ok(ret, "HttpSendRequestA failed\n"); test_status_code(req, 200); + receive_simple_request(req, buf, sizeof(buf)); + ok(strstr(buf, "Accept-Encoding: gzip") != NULL, "Accept-Encoding header not found in %s\n", buf); InternetCloseHandle(req); - req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequestA(con, "GET", "/echo_request", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, "Accept-Encoding: gzip", ~0u, NULL, 0); ok(ret, "HttpSendRequestA failed\n"); test_status_code(req, 200); + receive_simple_request(req, buf, sizeof(buf)); + ok(strstr(buf, "Accept-Encoding: gzip") != NULL, "Accept-Encoding header not found in %s\n", buf); InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Henri Verbeet : wined3d: Make wined3d_device_set_ps_consts_b() consistent with wined3d_device_set_ps_consts_f().
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 0a8951d99b2691f733188f01e2a7608cb1a76409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8951d99b2691f733188f01e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:59 2016 +0200 wined3d: Make wined3d_device_set_ps_consts_b() consistent with wined3d_device_set_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 24 ++++++++++++++---------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 25ed842..9fc49ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3174,7 +3174,7 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1761829..43ae2eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2607,24 +2607,28 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, const BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_b[start_register], constants, count * sizeof(BOOL)); - for (i = 0; i < count; ++i) - TRACE("Set BOOL constant %u to %s.\n", start_register + i, constants[i] ? "true" : "false"); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(&device->update_state->ps_consts_b[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.pixelShaderConstantsB |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d5a7c61..cb5a141 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -933,7 +933,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { wined3d_device_set_ps_consts_b(device, stateblock->contained_ps_consts_b[i], - stateblock->state.ps_consts_b + stateblock->contained_ps_consts_b[i], 1); + 1, &stateblock->state.ps_consts_b[stateblock->contained_ps_consts_b[i]]); } /* Render states. */ diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e7f7ca2..3d6a641 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,7 +129,7 @@ @ cdecl wined3d_device_set_predication(ptr ptr long) @ cdecl wined3d_device_set_primitive_type(ptr long) @ cdecl wined3d_device_set_ps_cb(ptr long ptr) -@ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) +@ cdecl wined3d_device_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9eb0f46..63550a1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,7 +2215,7 @@ void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology); void __cdecl wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device,

1 0