January 2016 - Wine-commits

Rosanne DiMesio : Fix links in help.template
by Jeremy Newman 27 Jan '16

27 Jan '16

Module: website Branch: master Commit: 5226a86137ad81ed9e6ea1c5cd9adaff5ce4cca5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5226a86137ad81ed9e6ea1… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jan 27 10:08:55 2016 -0600 Fix links in help.template This fixes the two broken links mentioned in bug 40018 and a link to the wiki ("HowTo" is now "Wine Installation and Configuration"). Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/help.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/help.template b/templates/en/help.template index 1358d98..ede1f77 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -36,9 +36,9 @@ <a href="{$root}/documentation"><img src="{$root}/images/docs.png"><br>Docs</a> </div> <div class="col-xs-10 col-md-11"> - We recommend that you read our online <a href="{$root}/site/documentation">Documentation</a> + We recommend that you read our online <a href="{$root}/documentation">Documentation</a> to find the answer to your question. Also of interest is our - <a href="https://wiki.winehq.org/HowTo">HowTo</a> which contains some useful information for + <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Wine Installation and Configuration</a> wiki page, which contains some useful information for the first time user. </div> </div> @@ -58,10 +58,10 @@ <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"><br>Forum</a> </div> <div class="col-xs-10 col-md-11"> - We have a <a href="//forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email</a> based community for + We have a <a href="//forums.winehq.org/">web</a>/<a href="{$root}/forums">email</a> based community for Wine users, which is a place that Wine users can visit to ask questions and connect with each other. - You may also wish to explore the <a href="{$root}/site/forums">mailing lists</a> + You may also wish to explore the <a href="{$root}/forums">mailing lists</a> that make up that community as well. </div> </div>

1 0

Piotr Caban : server: Avoid infinite loop when we' re out of timers in set_win_timer server call.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: cefdbd59b7ff189f058782021b746c33a975b5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefdbd59b7ff189f058782021… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 09:59:46 2016 +0100 server: Avoid infinite loop when we're out of timers in set_win_timer server call. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 12 ++++++++++-- server/trace.c | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 7fe0d03..771a2e3 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2581,13 +2581,21 @@ DECL_HANDLER(set_win_timer) } else { + lparam_t end_id = queue->next_timer_id; + /* find a free id for it */ - do + while (1) { id = queue->next_timer_id; if (--queue->next_timer_id <= 0x100) queue->next_timer_id = 0x7fff; + + if (!find_timer( queue, 0, req->msg, id )) break; + if (queue->next_timer_id == end_id) + { + set_win32_error( ERROR_NO_MORE_USER_HANDLES ); + return; + } } - while (find_timer( queue, 0, req->msg, id )); } } diff --git a/server/trace.c b/server/trace.c index 1b63894..2a3aba9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5136,6 +5136,7 @@ static const struct { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, { "DISK_FULL", STATUS_DISK_FULL }, { "DLL_NOT_FOUND", STATUS_DLL_NOT_FOUND }, + { "ERROR_NO_MORE_USER_HANDLES", 0xc0010000 | ERROR_NO_MORE_USER_HANDLES }, { "ERROR_CLASS_ALREADY_EXISTS", 0xc0010000 | ERROR_CLASS_ALREADY_EXISTS }, { "ERROR_CLASS_DOES_NOT_EXIST", 0xc0010000 | ERROR_CLASS_DOES_NOT_EXIST }, { "ERROR_CLASS_HAS_WINDOWS", 0xc0010000 | ERROR_CLASS_HAS_WINDOWS },

1 0

Piotr Caban : user32: Test error returned in out of timers case.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: 7b3c7af8134506479498df8ef343e67fd2e9d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3c7af8134506479498df8ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 09:59:57 2016 +0100 user32: Test error returned in out of timers case. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7d6c99a..cdc0364 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8763,9 +8763,11 @@ static void test_timers(void) static void test_timers_no_wnd(void) { + static UINT_PTR ids[0xffff]; UINT_PTR id, id2; DWORD start; MSG msg; + int i; count = 0; id = SetTimer(NULL, 0, 100, callback_count); @@ -8800,6 +8802,18 @@ static void test_timers_no_wnd(void) count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ + + /* Check what happens when we're running out of timers */ + for (i=0; i<sizeof(ids)/sizeof(ids[0]); i++) + { + SetLastError(0xdeadbeef); + ids[i] = SetTimer(NULL, 0, USER_TIMER_MAXIMUM, tfunc); + if (!ids[i]) break; + } + ok(i != sizeof(ids)/sizeof(ids[0]), "all timers were created successfully\n"); + ok(GetLastError()==ERROR_NO_MORE_USER_HANDLES || broken(GetLastError()==0xdeadbeef), + "GetLastError() = %d\n", GetLastError()); + while (i > 0) KillTimer(NULL, ids[--i]); } static void test_timers_exception(DWORD code)

1 0

Hugh McMaster : wineconsole: Apply the new background colour to the visible screen buffer.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: 1948104cc93b545a1b2432283617ce72f21963c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1948104cc93b545a1b2432283… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jan 25 21:01:00 2016 +1100 wineconsole: Apply the new background colour to the visible screen buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 729416f..f9027a4 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -441,7 +441,12 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf } if (data->curcfg.def_attr != cfg->def_attr) { + DWORD screen_size, written; + COORD top_left = {0,0}; + data->curcfg.def_attr = cfg->def_attr; + screen_size = cfg->win_width * (cfg->win_height + 1); + FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); SetConsoleTextAttribute(data->hConOut, cfg->def_attr); } /* now let's look at the window / sb size changes...

1 0

Hugh McMaster : kernel32: Apply the new background colour to the active line.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: 0311c6adb2c73fc900850a81601c4384c4d95ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0311c6adb2c73fc900850a816… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jan 25 21:01:01 2016 +1100 kernel32: Apply the new background colour to the active line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 78ea789..b436a50 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -916,6 +916,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) void (*func)(struct WCEL_Context* ctx); DWORD mode, input_mode, ks; int use_emacs; + CONSOLE_SCREEN_BUFFER_INFO csbi; memset(&ctx, 0, sizeof(ctx)); ctx.hConIn = hConsoleIn; @@ -994,6 +995,10 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) if (ctx.insertkey) ctx.insert = !ctx.insert; + GetConsoleScreenBufferInfo(ctx.hConOut, &csbi); + if (ctx.csbi.wAttributes != csbi.wAttributes) + ctx.csbi.wAttributes = csbi.wAttributes; + if (func) (func)(&ctx); else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED))

1 0

Hugh McMaster : wineconsole: Apply the selected background colour to the entire font preview dialog.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: 969151755afa1e3889be7652c75d79c68b441250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969151755afa1e3889be7652c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jan 25 21:01:02 2016 +1100 wineconsole: Apply the selected background colour to the entire font preview dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 4f73a3a..cae02cb 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -190,12 +190,15 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, hFont = (HFONT)GetWindowLongPtrW(hWnd, 0); if (hFont) { + COLORREF bkcolor; WCHAR ascii[] = {'A','S','C','I','I',':',' ','a','b','c','X','Y','Z','\0'}; WCHAR buf[256]; int len; hOldFont = SelectObject(ps.hdc, hFont); - SetBkColor(ps.hdc, WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]); + bkcolor = WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]; + FillRect(ps.hdc, &ps.rcPaint, CreateSolidBrush(bkcolor)); + SetBkColor(ps.hdc, bkcolor); SetTextColor(ps.hdc, WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_FG), 0)]); len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, buf, sizeof(buf) / sizeof(buf[0]));

1 0

André Hentschel : wpcap: Forward pcap_strerror to msvcrt.strerror.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: b0140f8ee22ad0f4a627f396b760e4a7833e474a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0140f8ee22ad0f4a627f396b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 25 21:52:37 2016 +0100 wpcap: Forward pcap_strerror to msvcrt.strerror. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 0e1e208..66303b4 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -74,5 +74,5 @@ @ cdecl pcap_snapshot(ptr) wine_pcap_snapshot @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex -@ stub pcap_strerror +@ cdecl pcap_strerror(long) msvcrt.strerror @ cdecl wsockinit() wine_wsockinit

1 0

Alexandre Julliard : ntdll/tests: Add some more tests for kernel object names.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: abeb60f017bc568604d732f99746aa82d35436f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abeb60f017bc568604d732f99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 18:17:10 2016 +0900 ntdll/tests: Add some more tests for kernel object names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 58333d1..b957128 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -884,10 +884,13 @@ static void test_query_object(void) char buffer[1024]; NTSTATUS status; ULONG len, expected_len; - UNICODE_STRING *str; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING path, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; LARGE_INTEGER size; + InitializeObjectAttributes( &attr, &path, 0, 0, 0 ); + handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); len = 0; @@ -917,9 +920,12 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %u\n", len ); ok( str->Length >= sizeof(name), "unexpected len %u\n", str->Length ); + ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_event") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); /* there can be a \\Sessions prefix in the name */ ok( !memcmp( str->Buffer + (str->Length - sizeof(name)) / sizeof(WCHAR), name, sizeof(name) ), "wrong name %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); len -= sizeof(WCHAR); status = pNtQueryObject( handle, ObjectNameInformation, buffer, len, &len ); @@ -1053,6 +1059,64 @@ static void test_query_object(void) ok( str->Buffer && !memcmp( str->Buffer, type_section, sizeof(type_section) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); + + handle = CreateMailslotA( "\\\\.\\mailslot\\test_mailslot", 100, 1000, NULL ); + ok( handle != INVALID_HANDLE_VALUE, "CreateMailslot failed err %u\n", GetLastError() ); + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ + "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_mailslot") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); + + handle = CreateNamedPipeA( "\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, + 1, 1000, 1000, 1000, NULL ); + ok( handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed err %u\n", GetLastError() ); + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + todo_wine + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + todo_wine + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ + "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); + + pRtlCreateUnicodeStringFromAsciiz( &path, "\\REGISTRY\\Machine\\Software\\Classes" ); + status = pNtCreateKey( &handle, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( handle != 0, "NtCreateKey failed status %x\n", status ); + pRtlFreeUnicodeString( &path ); + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + todo_wine + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + todo_wine + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ + "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); } static void test_type_mismatch(void)

1 0

Józef Kucia : wined3d: Add ARB_texture_rgb10_a2ui extension.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: c9214309882f7086da944d63ab06938ce11db05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9214309882f7086da944d63a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 00:33:59 2016 +0100 wined3d: Add ARB_texture_rgb10_a2ui extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4928647..5041249 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -153,6 +153,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, + {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, @@ -3435,6 +3436,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, + {ARB_TEXTURE_RGB10_A2UI, MAKEDWORD_VERSION(3, 3)}, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b13c551..a8c0db1 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -89,6 +89,7 @@ enum wined3d_gl_extension ARB_TEXTURE_QUERY_LEVELS, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, + ARB_TEXTURE_RGB10_A2UI, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8G8B8A8_UINT textures.
by Alexandre Julliard 26 Jan '16

26 Jan '16

Module: wine Branch: master Commit: 4cec8df5eed4009eeeab067d2cd8647e3d2317cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cec8df5eed4009eeeab067d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 00:34:00 2016 +0100 wined3d: Add support for WINED3DFMT_R8G8B8A8_UINT textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f06affd..8f73e58 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -192,6 +192,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R16G16B16A16_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, + {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_FLAG_INTEGER}, }; struct wined3d_format_block_info @@ -1087,6 +1088,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE | WINED3DFMT_FLAG_VTF, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA8UI, 0, + GL_RGBA_INTEGER, GL_UNSIGNED_INT_8_8_8_8_REV, 0, + WINED3DFMT_FLAG_TEXTURE, + ARB_TEXTURE_RGB10_A2UI, NULL}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, @@ -1809,6 +1814,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (status == GL_FRAMEBUFFER_COMPLETE && ((format->flags[type] & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + && !(format->flags[type] & WINED3DFMT_FLAG_INTEGER) && format->id != WINED3DFMT_NULL && format->id != WINED3DFMT_P8_UINT && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA && (format->red_size || format->alpha_size)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3393d62..48074ba 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3210,6 +3210,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 #define WINED3DFMT_FLAG_TEXTURE 0x00080000 #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 +#define WINED3DFMT_FLAG_INTEGER 0x00200000 struct wined3d_rational {

1 0