wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Frédéric Delanoy : xmllite: Use BOOL type where appropriate.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 77a26de9759a85b0a8b9e68c6846080b8884105a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a26de9759a85b0a8b9e68c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:46 2013 +0200 xmllite: Use BOOL type where appropriate. --- dlls/xmllite/reader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0a4423c..a216951 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -726,7 +726,7 @@ static void readerinput_grow(xmlreaderinput *readerinput, int length) } } -static inline int readerinput_is_utf8(xmlreaderinput *readerinput) +static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) { static char startA[] = {'<','?'}; static char commentA[] = {'<','!'}; @@ -953,7 +953,7 @@ static void reader_skipn(xmlreader *reader, int n) } } -static inline int is_wchar_space(WCHAR ch) +static inline BOOL is_wchar_space(WCHAR ch) { return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; } @@ -1055,7 +1055,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) } /* ([A-Za-z0-9._] | '-') */ -static inline int is_wchar_encname(WCHAR ch) +static inline BOOL is_wchar_encname(WCHAR ch) { return ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || @@ -1269,7 +1269,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) } /* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ -static inline int is_char(WCHAR ch) +static inline BOOL is_char(WCHAR ch) { return (ch == '\t') || (ch == '\r') || (ch == '\n') || (ch >= 0x20 && ch <= 0xd7ff) || @@ -1279,7 +1279,7 @@ static inline int is_char(WCHAR ch) } /* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ -static inline int is_pubchar(WCHAR ch) +static inline BOOL is_pubchar(WCHAR ch) { return (ch == ' ') || (ch >= 'a' && ch <= 'z') || @@ -1292,7 +1292,7 @@ static inline int is_pubchar(WCHAR ch) (ch == '_') || (ch == '\r') || (ch == '\n'); } -static inline int is_namestartchar(WCHAR ch) +static inline BOOL is_namestartchar(WCHAR ch) { return (ch == ':') || (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1312,7 +1312,7 @@ static inline int is_namestartchar(WCHAR ch) } /* [4 NS] NCName ::= Name - (Char* ':' Char*) */ -static inline int is_ncnamechar(WCHAR ch) +static inline BOOL is_ncnamechar(WCHAR ch) { return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1336,7 +1336,7 @@ static inline int is_ncnamechar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline int is_namechar(WCHAR ch) +static inline BOOL is_namechar(WCHAR ch) { return (ch == ':') || is_ncnamechar(ch); }

1 0

Frédéric Delanoy : setupapi: Use BOOL type where appropriate.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: cef6b07372bb29cb491721f64d2c1017f960b45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef6b07372bb29cb491721f64… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:45 2013 +0200 setupapi: Use BOOL type where appropriate. --- dlls/setupapi/misc.c | 2 +- dlls/setupapi/parser.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index e7ccfe6..5f341cc 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1502,7 +1502,7 @@ static DWORD decompress_file_cab( LPCWSTR source, LPCWSTR target ) */ DWORD WINAPI SetupDecompressOrCopyFileA( PCSTR source, PCSTR target, PUINT type ) { - DWORD ret = FALSE; + DWORD ret = 0; WCHAR *sourceW = NULL, *targetW = NULL; if (source && !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 744ee4c..cd101b7 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -471,14 +471,14 @@ static inline enum parser_state set_state( struct parser *parser, enum parser_st /* check if the pointer points to an end of file */ -static inline int is_eof( const struct parser *parser, const WCHAR *ptr ) +static inline BOOL is_eof( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -static inline int is_eol( const struct parser *parser, const WCHAR *ptr ) +static inline BOOL is_eol( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n'); } @@ -528,7 +528,7 @@ static int add_section_from_token( struct parser *parser ) /* add a field containing the current token to the current line */ -static struct field *add_field_from_token( struct parser *parser, int is_key ) +static struct field *add_field_from_token( struct parser *parser, BOOL is_key ) { struct field *field; WCHAR *text; @@ -648,14 +648,14 @@ static const WCHAR *key_name_state( struct parser *parser, const WCHAR *pos ) case '=': push_token( parser, token_end ); - if (!add_field_from_token( parser, 1 )) return NULL; + if (!add_field_from_token( parser, TRUE )) return NULL; parser->start = p + 1; push_state( parser, VALUE_NAME ); set_state( parser, LEADING_SPACES ); return p + 1; case ';': push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; push_state( parser, LINE_START ); set_state( parser, COMMENT ); return p + 1; @@ -700,13 +700,13 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos ) { case ';': push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; push_state( parser, LINE_START ); set_state( parser, COMMENT ); return p + 1; case ',': push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; parser->start = p + 1; push_state( parser, VALUE_NAME ); set_state( parser, LEADING_SPACES ); @@ -736,7 +736,7 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos ) } } push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; set_state( parser, LINE_START ); return p; }

1 0

Frédéric Delanoy : urlmon/tests: Use BOOL type where appropriate.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 742c2563e5c6797d4718715ec3e8b2046a2fbb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=742c2563e5c6797d4718715ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:44 2013 +0200 urlmon/tests: Use BOOL type where appropriate. --- dlls/urlmon/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6c34f62..fcc4be6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1126,7 +1126,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - static int pending = TRUE; + static BOOL pending = TRUE; pending = !pending;

1 0

Nikolay Sivov : xmllite: Correct allocated destination buffer size.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 587398259e184ec7e7d7093ef6ee2564461ff66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=587398259e184ec7e7d7093ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:38:34 2013 +0400 xmllite: Correct allocated destination buffer size. --- dlls/xmllite/reader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ebea0b4..0a4423c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -711,11 +711,12 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) return hr; } -/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +/* grows UTF-16 buffer so it has at least 'length' WCHAR chars free on return */ static void readerinput_grow(xmlreaderinput *readerinput, int length) { encoded_buffer *buffer = &readerinput->buffer->utf16; + length *= sizeof(WCHAR); /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ if (buffer->allocated < buffer->written + length + 4) {

1 0

Nikolay Sivov : xmllite: Fix overwriting of dest buffer when pushing more data to it.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: feda40bbaab360edd09b1a36d75a52894b91bde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda40bbaab360edd09b1a36d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:38:02 2013 +0400 xmllite: Fix overwriting of dest buffer when pushing more data to it. --- dlls/xmllite/reader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ad6544b..ebea0b4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -703,7 +703,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); - TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -903,14 +903,14 @@ static HRESULT reader_more(xmlreader *reader) if (cp == ~0) { readerinput_grow(readerinput, len); - memcpy(dest->data, src->data + src->cur, len); + memcpy(dest->data + dest->written, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); return hr; } dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); - ptr = (WCHAR*)dest->data; + ptr = (WCHAR*)(dest->data + dest->written); MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); ptr[dest_len] = 0; dest->written += dest_len*sizeof(WCHAR); @@ -930,7 +930,7 @@ static inline WCHAR *reader_get_ptr(xmlreader *reader) encoded_buffer *buffer = &reader->input->buffer->utf16; WCHAR *ptr = (WCHAR*)buffer->data + buffer->cur; if (!*ptr) reader_more(reader); - return ptr; + return (WCHAR*)buffer->data + buffer->cur; } static int reader_cmp(xmlreader *reader, const WCHAR *str)

1 0

Nikolay Sivov : xmllite: Use buffer offset instead of pointers.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: ae341b9bd7bf0ff77a37ed894537d6316f949007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae341b9bd7bf0ff77a37ed894… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:37:08 2013 +0400 xmllite: Use buffer offset instead of pointers. --- dlls/xmllite/reader.c | 451 ++++++++++++++++++++++++------------------- dlls/xmllite/tests/reader.c | 1 + 2 files changed, 249 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae341b9bd7bf0ff77a37e…

1 0

Alexandre Julliard : ntdll: Add defines for the file position magic constants.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: ac519d0eeab3eeec3f95db8aaf62b82811ee2670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac519d0eeab3eeec3f95db8aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 9 16:13:41 2013 +0200 ntdll: Add defines for the file position magic constants. --- dlls/ntdll/file.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 94845fa..e747e8f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -95,6 +95,9 @@ mode_t FILE_umask = 0; #define SECSPERDAY 86400 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) +#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) + static const WCHAR ntfsW[] = {'N','T','F','S'}; /************************************************************************** @@ -614,7 +617,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { /* async I/O doesn't make sense on regular files */ while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1) @@ -816,7 +819,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap while (length) { - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, page_size - pos, offset->QuadPart + total ); else @@ -981,7 +984,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { if (async_write && - (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) { status = STATUS_INVALID_PARAMETER; goto done; @@ -989,15 +992,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (append_write) { - offset_eof.QuadPart = (LONGLONG)-1; /* FILE_WRITE_TO_END_OF_FILE */ + offset_eof.QuadPart = FILE_WRITE_TO_END_OF_FILE; offset = &offset_eof; } - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { off_t off = offset->QuadPart; - if (offset->QuadPart == (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */) + if (offset->QuadPart == FILE_WRITE_TO_END_OF_FILE) { struct stat st; @@ -1037,7 +1040,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, else if (type == FD_TYPE_SERIAL) { if (async_write && - (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) { status = STATUS_INVALID_PARAMETER; goto done; @@ -1200,7 +1203,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap while (length) { - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pwrite( unix_handle, (char *)segments->Buffer + pos, page_size - pos, offset->QuadPart + total ); else

1 0

Dmitry Timoshkov : ntdll: Offset -1 (FILE_WRITE_TO_END_OF_FILE) is supposed to work in NtWriteFile for disk files in overlapped mode.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 3cae528eef25e284aab89c60a2b1755f11dd059f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cae528eef25e284aab89c60a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 9 18:19:50 2013 +0900 ntdll: Offset -1 (FILE_WRITE_TO_END_OF_FILE) is supposed to work in NtWriteFile for disk files in overlapped mode. --- dlls/ntdll/file.c | 3 ++- dlls/ntdll/tests/file.c | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a8c25d6..94845fa 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -980,7 +980,8 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { - if (async_write && (!offset || offset->QuadPart < 0)) + if (async_write && + (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) { status = STATUS_INVALID_PARAMETER; goto done; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4fb5fec..66786ef 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2426,11 +2426,8 @@ todo_wine iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); -todo_wine ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); -todo_wine ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); -todo_wine ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); @@ -2448,7 +2445,6 @@ todo_wine status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); -todo_wine ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); @@ -2457,7 +2453,6 @@ todo_wine ret = WaitForSingleObject(hfile, 3000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); -todo_wine ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);

1 0

Stefan Dösinger : wined3d: Move sRGB_decode handling to the top of texture_bind / preload.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 86d63f1d5ac27a44c5b0a5ae8bf3799c2d75bc48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d63f1d5ac27a44c5b0a5ae8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 9 12:38:00 2013 +0200 wined3d: Move sRGB_decode handling to the top of texture_bind / preload. --- dlls/wined3d/texture.c | 27 ++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 ++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0f3c470..69e7010 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -154,13 +154,16 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, context %p, srgb %#x, set_surface_desc %p.\n", texture, context, srgb, set_surface_desc); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = FALSE; + /* sRGB mode cache for preload() calls outside drawprim. */ if (srgb) texture->flags |= WINED3D_TEXTURE_IS_SRGB; else texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; - gl_tex = wined3d_texture_get_gl_texture(texture, context->gl_info, srgb); + gl_tex = wined3d_texture_get_gl_texture(texture, srgb); target = texture->target; /* Generate a texture name if we don't already have one. */ @@ -282,8 +285,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, TRACE("texture %p, sampler_states %p.\n", texture, sampler_states); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, - texture->flags & WINED3D_TEXTURE_IS_SRGB); + gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); /* This function relies on the correct texture being bound and loaded. */ @@ -612,12 +614,11 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = texture->level_count * texture->layer_count; - BOOL srgb_tex = !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && (texture->flags & WINED3D_TEXTURE_IS_SRGB); + BOOL srgb_tex = texture->flags & WINED3D_TEXTURE_IS_SRGB; struct gl_texture *gl_tex; UINT i; - gl_tex = wined3d_texture_get_gl_texture(texture, context->gl_info, srgb_tex); + gl_tex = wined3d_texture_get_gl_texture(texture, srgb_tex); for (i = 0; i < sub_count; ++i) { @@ -658,7 +659,6 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) { - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; switch (srgb) { case SRGB_RGB: @@ -668,8 +668,7 @@ static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3 return TRUE; default: - return !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && texture->flags & WINED3D_TEXTURE_IS_SRGB; + return texture->flags & WINED3D_TEXTURE_IS_SRGB; } } @@ -685,8 +684,11 @@ static void texture2d_preload(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x.\n", texture, srgb); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = SRGB_RGB; + srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + if (srgb_mode) flag = WINED3D_TEXTURE_SRGB_VALID; else flag = WINED3D_TEXTURE_RGB_VALID; @@ -1058,8 +1060,11 @@ static void texture3d_preload(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x.\n", texture, srgb); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = SRGB_RGB; + srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + if (srgb_mode) flag = WINED3D_TEXTURE_SRGB_VALID; else flag = WINED3D_TEXTURE_RGB_VALID; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09aa7a4..14cc378 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2102,10 +2102,9 @@ static inline struct wined3d_texture *wined3d_texture_from_resource(struct wined } static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_texture *texture, - const struct wined3d_gl_info *gl_info, BOOL srgb) + BOOL srgb) { - return srgb && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - ? &texture->texture_srgb : &texture->texture_rgb; + return srgb ? &texture->texture_srgb : &texture->texture_rgb; } void wined3d_texture_apply_state_changes(struct wined3d_texture *texture,

1 0

Stefan Dösinger : wined3d: Remove sRGB_decode handling from surface_load_location.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: db852ff5b5d954308274d75bac670bfb46c4122f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db852ff5b5d954308274d75ba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 9 12:37:59 2013 +0200 wined3d: Remove sRGB_decode handling from surface_load_location. --- dlls/wined3d/surface.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 860296b..daa26e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5600,9 +5600,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c } } - if (location == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - location = SFLAG_INTEXTURE; - if (surface->flags & location) { TRACE("Location already up to date.\n"); @@ -5663,12 +5660,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c surface_evict_sysmem(surface); } - if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - { - surface->flags |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); - } - return WINED3D_OK; }

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
76
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 October 2013