February 2020 - Wine-commits

Michael Stefaniuc : winhttp/tests: Get rid of strcmp_wa().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: a1e7371dfd10dfc0702b9121a6a9302821073532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e7371dfd10dfc0702b9121… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:17 2020 +0200 winhttp/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b73c57a41d..83f7809a3c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -43,22 +43,6 @@ static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q', static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; -static WCHAR *a2w(const char *str) -{ - int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - -static int strcmp_wa(const WCHAR *str1, const char *stra) -{ - WCHAR *str2 = a2w(stra); - int r = lstrcmpW(str1, str2); - heap_free(str2); - return r; -} - static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2869,7 +2853,7 @@ static void test_multi_authentication(int port) size = sizeof(buf); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, buf, &size, &index); ok(ret, "expected success\n"); - ok(!strcmp_wa(buf, "Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, L"Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); ok(index == 1, "index = %u\n", index);

1 0

Michael Stefaniuc : winmm/tests: Get rid of strcmp_wa().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: cdec2413e2a679e6eae1f4e055413d908292b5da URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdec2413e2a679e6eae1f4e0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:18 2020 +0200 winmm/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 7c8aee8273..f8bb4c56ac 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -163,13 +163,6 @@ static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, i else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static void test_mciParser(HWND hwnd) { MCIERROR err; @@ -464,7 +457,7 @@ static void test_openCloseWAVE(HWND hwnd) /* MCI_..._PARMSA and PARMSW share the same layout, use one for both tests. */ err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(!err || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open buffer[8]: %s\n", dbg_mcierr(err)); - if(!err) ok(!strcmp_wa((LPWSTR)buf,"mysound"), "sysinfo name 1 open contents\n"); + if (!err) ok(!lstrcmpW((LPWSTR)buf, L"mysound"), "sysinfo name 1 open contents\n"); memset(buf, 0, sizeof(buf)); buf[0] = 'Y';

1 0

Alexandre Julliard : wmc: Always output resource strings in Unicode format.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: f504135e387b8fdbe955f4bbf6e4b542aab1ce1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f504135e387b8fdbe955f4bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 18:08:52 2020 +0100 wmc: Always output resource strings in Unicode format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 18 ----- tools/wmc/lang.h | 1 - tools/wmc/mcy.y | 2 +- tools/wmc/wmc.c | 9 +-- tools/wmc/wmc.h | 1 - tools/wmc/wmc.man.in | 6 +- tools/wmc/write.c | 190 +++++++++++++++++---------------------------------- 7 files changed, 66 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f504135e387b8fdbe955…

1 0

Alexandre Julliard : winegcc: Make the WINEBUILD variable take precedence over the bin directory.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: d96a0acf296d45538cb8c95e965e06f173039fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96a0acf296d45538cb8c95e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 21:12:25 2020 +0100 winegcc: Make the WINEBUILD variable take precedence over the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c6bd444fa3..bee81edcc3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -865,10 +865,12 @@ static strarray *get_winebuild_args(struct options *opts) binary = opts->winebuild; else if (opts->wine_objdir) binary = strmake( "%s/tools/winebuild/winebuild%s", opts->wine_objdir, EXEEXT ); + else if (winebuild) + binary = find_binary( opts->prefix, winebuild ); else if (bindir) binary = strmake( "%s/winebuild%s", bindir, EXEEXT ); else - binary = find_binary( opts->prefix, winebuild ? winebuild : "winebuild" ); + binary = find_binary( opts->prefix, "winebuild" ); strarray_add( spec_args, binary ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" );

1 0

Jacek Caban : atl: Allow only ASCII digit for registrar binary values.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: ffbb1c4eb44c569a4c27ef69d2f4b787dc5e6566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffbb1c4eb44c569a4c27ef69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:13:21 2020 +0100 atl: Allow only ASCII digit for registrar binary values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/registrar.c | 17 +++++++++++------ dlls/atl/tests/registrar.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 612274d1a9..586cce3201 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -99,6 +99,14 @@ static void strbuf_write(LPCOLESTR str, strbuf *buf, int len) buf->str[buf->len] = '\0'; } +static int xdigit_to_int(WCHAR c) +{ + if('0' <= c && c <= '9') return c - '0'; + if('a' <= c && c <= 'f') return c - 'a' + 10; + if('A' <= c && c <= 'F') return c - 'A' + 10; + return -1; +} + static HRESULT get_word(LPCOLESTR *str, strbuf *buf) { LPCOLESTR iter, iter2 = *str; @@ -303,15 +311,12 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO break; } for(i = 0; i < count && buf->str[2*i]; i++) { - WCHAR digits[3]; - if(!iswxdigit(buf->str[2*i]) || !iswxdigit(buf->str[2*i + 1])) { + int d1, d2; + if((d1 = xdigit_to_int(buf->str[2*i])) == -1 || (d2 = xdigit_to_int(buf->str[2*i + 1])) == -1) { hres = E_FAIL; break; } - digits[0] = buf->str[2*i]; - digits[1] = buf->str[2*i + 1]; - digits[2] = 0; - bytes[i] = (BYTE) wcstoul(digits, NULL, 16); + bytes[i] = (d1 << 4) | d2; } if(SUCCEEDED(hres)) { lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_BINARY, diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 4ecb092fd6..f9ec9529dd 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -48,7 +48,7 @@ static const char textA[] = " val 'dword_quoted_hex' = d '0xA' \n" " val 'dword_unquoted_hex' = d 0xA \n" " val 'binary_quoted' = b 'deadbeef' \n" -" val 'binary_unquoted' = b deadbeef \n" +" val 'binary_unquoted' = b dead0123 \n" " } \n" "}"; @@ -124,7 +124,7 @@ static void test_registrar(void) size = 4; lret = RegQueryValueExA(key, "binary_unquoted", NULL, NULL, bytes, &size); ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); - ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0x01 && bytes[3] == 0x23, "binary unquoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]);

1 0

Jacek Caban : crypt32: Allow only ASCII digits in CRYPT_AsnEncodeNumericString.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 275f6ca3df976628152a637f8b9d32e3908dedc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=275f6ca3df976628152a637f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:20 2020 +0100 crypt32: Allow only ASCII digits in CRYPT_AsnEncodeNumericString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 45eeea8e9d..91735eb53d 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2060,7 +2060,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, ptr += lenBytes; for (i = 0; ret && i < encodedLen; i++) { - if (isdigitW(str[i])) + if ('0' <= str[i] && str[i] <= '9') *ptr++ = (BYTE)str[i]; else {

1 0

Jacek Caban : propsys: Allow only ASCII digits in PSPropertyKeyFromString.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 6e8c2d836e637e1fbd83c231cfd846ecb9333964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8c2d836e637e1fbd83c231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:25 2020 +0100 propsys: Allow only ASCII digits in PSPropertyKeyFromString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys_main.c | 2 +- dlls/propsys/tests/propsys.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7ae3870efb..75963d7b6c 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -495,7 +495,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) } /* Overflow is not checked. */ - while (iswdigit(*pszString)) + while ('0' <= *pszString && *pszString <= '9') { pkey->pid *= 10; pkey->pid += (*pszString - '0'); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 191a154744..ccd075a959 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -346,6 +346,9 @@ static void test_PSPropertyKeyFromString(void) static const WCHAR fmtid_normalpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-','1','2','3','4','-', '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',0}; + static const WCHAR fmtid_udigitW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','2','3',0x661,'5','7','9',0}; PROPERTYKEY out_init = {GUID_MEMBERS(dummy_guid), 0xdeadbeef}; PROPERTYKEY out; HRESULT ret; @@ -422,6 +425,7 @@ static void test_PSPropertyKeyFromString(void) {fmtid_commanegspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0U}}, {fmtid_negcommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, {fmtid_normalpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_udigitW, &out, S_OK, {GUID_MEMBERS(expect_guid), 123}}, }; int i;

1 0

Jacek Caban : quartz: Fix hex digit checks in process_pattern_string.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: bf95bccfafd7ea8faf5acf414a4806cbd001358f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf95bccfafd7ea8faf5acf41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:29 2020 +0100 quartz: Fix hex digit checks in process_pattern_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 4855f9834c..11cc438be2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -87,37 +87,19 @@ static inline AsyncReader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) static const IFileSourceFilterVtbl FileSource_Vtbl; static const IAsyncReaderVtbl FileAsyncReader_Vtbl; -static unsigned char byte_from_hex_char(WCHAR wHex) +static int byte_from_hex_char(WCHAR c) { - switch (towlower(wHex)) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - return (wHex - '0') & 0xf; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - return (wHex - 'a' + 10) & 0xf; - default: - return 0; - } + if ('0' <= c && c <= '9') return c - '0'; + if ('a' <= c && c <= 'f') return c - 'a' + 10; + if ('A' <= c && c <= 'F') return c - 'A' + 10; + return -1; } static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) { ULONG size, offset, i, ret_size; BYTE *mask, *expect, *actual; + int d; BOOL ret = TRUE; /* format: "offset, size, mask, value" */ @@ -140,15 +122,15 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) return FALSE; } pattern++; - while (!iswxdigit(*pattern) && (*pattern != ',')) + while (byte_from_hex_char(*pattern) == -1 && (*pattern != ',')) pattern++; - for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++) + for (i = 0; (d = byte_from_hex_char(*pattern)) != -1 && (i/2 < size); pattern++, i++) { if (i % 2) - mask[i / 2] |= byte_from_hex_char(*pattern); + mask[i / 2] |= d; else - mask[i / 2] = byte_from_hex_char(*pattern) << 4; + mask[i / 2] = d << 4; } if (!(pattern = wcschr(pattern, ','))) @@ -158,15 +140,15 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) return FALSE; } pattern++; - while (!iswxdigit(*pattern) && (*pattern != ',')) + while (byte_from_hex_char(*pattern) == -1 && (*pattern != ',')) pattern++; - for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++) + for (i = 0; (d = byte_from_hex_char(*pattern)) != -1 && (i/2 < size); pattern++, i++) { if (i % 2) - expect[i / 2] |= byte_from_hex_char(*pattern); + expect[i / 2] |= d; else - expect[i / 2] = byte_from_hex_char(*pattern) << 4; + expect[i / 2] = d << 4; } actual = heap_alloc(size);

1 0

Jacek Caban : setupapi: Fix hex digit check in SetupGetBinaryField.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: d580d2c2fdad7f6f00dd12923e475298c019b660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d580d2c2fdad7f6f00dd1292… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 14:00:33 2020 +0100 setupapi: Fix hex digit check in SetupGetBinaryField. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 193e5e1f97..560c2401b8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1803,6 +1803,15 @@ BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ) } +static int xdigit_to_int(WCHAR c) +{ + if ('0' <= c && c <= '9') return c - '0'; + if ('a' <= c && c <= 'f') return c - 'a' + 10; + if ('A' <= c && c <= 'F') return c - 'A' + 10; + return -1; +} + + /*********************************************************************** * SetupGetBinaryField (SETUPAPI.@) */ @@ -1837,15 +1846,15 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, { const WCHAR *p; DWORD value = 0; - for (p = field->text; *p && iswxdigit(*p); p++) + int d; + for (p = field->text; *p && (d = xdigit_to_int(*p)) != -1; p++) { if ((value <<= 4) > 255) { SetLastError( ERROR_INVALID_DATA ); return FALSE; } - if (*p <= '9') value |= (*p - '0'); - else value |= (towlower(*p) - 'a' + 10); + value |= d; } buffer[i - index] = value; }

1 0

Zebediah Figura : ddraw: Apply the device state before executing a draw call.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 92dd6dd150089e0674dfb080fa22dc31eebb2a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92dd6dd150089e0674dfb080… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:26:05 2020 -0600 ddraw: Apply the device state before executing a draw call. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 12 ++++++++++-- dlls/ddraw/executebuffer.c | 4 ++++ dlls/ddraw/surface.c | 2 ++ dlls/ddraw/vertexbuffer.c | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 725a935022..6cd8948f56 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3520,6 +3520,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, size = vertex_count * stride; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3713,6 +3714,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -4057,6 +4059,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, dst_size); if (FAILED(hr)) goto done; @@ -4173,6 +4176,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_dst_size); if (FAILED(hr)) goto done; @@ -4330,6 +4334,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wined3d_buffer, 0, stride))) @@ -4452,6 +4457,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); @@ -5251,6 +5257,7 @@ static HRESULT d3d_device7_ValidateDevice(IDirect3DDevice7 *iface, DWORD *pass_c TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -5313,7 +5320,7 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, (color & 0xff) / 255.0f, ((color >> 24) & 0xff) / 255.0f, }; - struct d3d_device *This = impl_from_IDirect3DDevice7(iface); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); HRESULT hr; TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", @@ -5326,7 +5333,8 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, } wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + hr = wined3d_device_clear(device->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 9f0fdb85e5..0d1726ed7f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -74,6 +74,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DOP_POINT: { const D3DPOINT *p = (D3DPOINT *)instr; + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST, 0); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); @@ -106,6 +107,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d primitive_size = 3; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + index_count = count * primitive_size; if (buffer->index_size < index_count) { @@ -300,6 +303,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d { case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fda42f2982..03546e17f1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1472,6 +1472,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, &colour, 0.0f, 0); @@ -1487,6 +1488,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, NULL, colour.r, 0); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9df386d1a0..1e3d25f6cb 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -277,6 +277,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to

1 0