wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Hans Leidekker : winhttp: Reset the content read counter.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 7a69d4dbfea97be2e92787983850f648776d1656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a69d4dbfea97be2e92787983… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 30 11:31:30 2013 +0200 winhttp: Reset the content read counter. --- dlls/winhttp/request.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f14f22b..bab576e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1494,6 +1494,7 @@ static DWORD set_content_length( request_t *request ) request->content_length = ~0u; request->read_chunked = TRUE; } + request->content_read = 0; return request->content_length; }

1 0

Nikolay Sivov : netstat: No need to allocate fixed length stats structs.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 423d5f29e8d3cb9906d0663047c4dd51ed581f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d5f29e8d3cb9906d066304… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:26:43 2013 +0400 netstat: No need to allocate fixed length stats structs. --- programs/netstat/netstat.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index b7fee0e..23f2b40 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -274,25 +274,21 @@ static void NETSTAT_tcp_table(void) static void NETSTAT_tcp_stats(void) { - PMIB_TCPSTATS stats; + MIB_TCPSTATS stats; - stats = (PMIB_TCPSTATS)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_TCPSTATS)); - - if (GetTcpStatistics(stats) == NO_ERROR) + if (GetTcpStatistics(&stats) == NO_ERROR) { NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_STAT)); NETSTAT_wprintf(fmtn); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_ACTIVE_OPEN), stats->dwActiveOpens); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_PASSIV_OPEN), stats->dwPassiveOpens); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_FAILED_CONN), stats->dwAttemptFails); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_RESET_CONN), stats->dwEstabResets); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_CURR_CONN), stats->dwCurrEstab); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RECV), stats->dwInSegs); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_SENT), stats->dwOutSegs); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RETRAN), stats->dwRetransSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_ACTIVE_OPEN), stats.dwActiveOpens); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_PASSIV_OPEN), stats.dwPassiveOpens); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_FAILED_CONN), stats.dwAttemptFails); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_RESET_CONN), stats.dwEstabResets); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_CURR_CONN), stats.dwCurrEstab); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RECV), stats.dwInSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_SENT), stats.dwOutSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RETRAN), stats.dwRetransSegs); } - - HeapFree(GetProcessHeap(), 0, stats); } static void NETSTAT_udp_table(void) @@ -325,21 +321,17 @@ static void NETSTAT_udp_table(void) static void NETSTAT_udp_stats(void) { - PMIB_UDPSTATS stats; + MIB_UDPSTATS stats; - stats = (PMIB_UDPSTATS)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_UDPSTATS)); - - if (GetUdpStatistics(stats) == NO_ERROR) + if (GetUdpStatistics(&stats) == NO_ERROR) { NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_UDP_STAT)); NETSTAT_wprintf(fmtn); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_RECV), stats->dwInDatagrams); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_NO_PORTS), stats->dwNoPorts); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_RECV_ERRORS), stats->dwInErrors); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_SENT), stats->dwOutDatagrams); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_RECV), stats.dwInDatagrams); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_NO_PORTS), stats.dwNoPorts); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_RECV_ERRORS), stats.dwInErrors); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_SENT), stats.dwOutDatagrams); } - - HeapFree(GetProcessHeap(), 0, stats); } static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[])

1 0

Nikolay Sivov : po: Updated Russian translation.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: bfe4d799f2777349c6a07dd0639a71899da87741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe4d799f2777349c6a07dd06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:18:15 2013 +0400 po: Updated Russian translation. --- po/ru.po | 44 +++++++++++++------------------------------- 1 files changed, 13 insertions(+), 31 deletions(-) diff --git a/po/ru.po b/po/ru.po index a1b068c..08890f1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10435,77 +10435,59 @@ msgstr "Неизвестные протоколы" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "Статистика TCP для IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" msgstr "Активные подключения" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Пассивные подключения" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Активные подключения" +msgstr "Сбоев при подключении" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Активные подключения" +msgstr "Сброшено подключений" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Активные подключения" +msgstr "Текущих подключений" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Сегмент заблокирован.\n" +msgstr "Получено сегментов" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Сегмент заблокирован.\n" +msgstr "Отправлено сегментов" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Повторно отправлено сегментов" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "Статистика UDP для IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Сегмент заблокирован.\n" +msgstr "Получено датаграмм" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Локальный порт" +msgstr "Порт не указан" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Ошибка декодирования" +msgstr "Ошибок приема" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Отправлено датаграмм" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Detlef Riekenberg : kernel32/tests: Avoid IOCTL_DVD_READ_STRUCTURE test failures.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 71cbd277e7cceeb125e4a607bb3ed962f14e57be URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cbd277e7cceeb125e4a607b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 30 00:32:44 2013 +0200 kernel32/tests: Avoid IOCTL_DVD_READ_STRUCTURE test failures. --- dlls/kernel32/tests/volume.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index d788c81..f7879c8 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -775,17 +775,12 @@ static void test_dvd_read_structure(HANDLE handle) /* Test whether this ioctl is supported */ ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), &completeDvdLayerDescriptor, sizeof(struct COMPLETE_DVD_LAYER_DESCRIPTOR), &nbBytes, NULL); - if ((!ret && GetLastError() == ERROR_INVALID_FUNCTION) - || (!ret && GetLastError() == ERROR_NOT_SUPPORTED)) - { - skip("IOCTL_DVD_READ_STRUCTURE not supported\n"); - return; - } - ok(ret || broken(GetLastError() == ERROR_NOT_READY) || broken(GetLastError() == ERROR_INVALID_PARAMETER), - "IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) failed, last error = %u\n", GetLastError()); if(!ret) + { + skip("IOCTL_DVD_READ_STRUCTURE not supported: %u\n", GetLastError()); return; + } /* Confirm there is always a header before the actual data */ ok( completeDvdLayerDescriptor.Header.Length == 0x0802, "Length is 0x%04x instead of 0x0802\n", completeDvdLayerDescriptor.Header.Length);

1 0

Detlef Riekenberg : dwrite/tests: Avoid refcount test failures.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 03101b06c95b8677ad46d5470b02dcc7202a4429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03101b06c95b8677ad46d5470… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 30 00:13:55 2013 +0200 dwrite/tests: Avoid refcount test failures. --- dlls/dwrite/tests/font.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9138061..8404c22 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -444,19 +444,12 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(font, 1); - EXPECT_REF(fontface, 2); hr = IDWriteFont_CreateFontFace(font, &fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); - EXPECT_REF(fontface, 3); - EXPECT_REF(font, 1); + /* the fontface refcount is increased here */ - IDWriteFontFace_AddRef(fontface); - EXPECT_REF(font, 1); - EXPECT_REF(fontface, 4); - IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface);

1 0

Qian Hong : kernel32: Fixed string comparision for non-canonical locale identifiers such as zh_CN VS zh-Hans on OS X .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 32e5314250db3cbf37d414849f63a5a5df0ca9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e5314250db3cbf37d414849… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Apr 30 04:41:16 2013 +0800 kernel32: Fixed string comparision for non-canonical locale identifiers such as zh_CN VS zh-Hans on OS X. --- dlls/kernel32/locale.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 04fb6e8..86720ff 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -33,7 +33,6 @@ #include <stdlib.h> #ifdef __APPLE__ -# include <CoreFoundation/CFBundle.h> # include <CoreFoundation/CFLocale.h> # include <CoreFoundation/CFString.h> #endif @@ -3197,16 +3196,16 @@ void LOCALE_Init(void) if (user_locale_country_ref) { - user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@.UTF-8"), + user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@"), user_locale_lang_ref, user_locale_country_ref); } else { - user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.UTF-8"), - user_locale_lang_ref); + user_locale_string_ref = CFStringCreateCopy(NULL, user_locale_lang_ref); } CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); + strcat(user_locale, ".UTF-8"); unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); @@ -3225,12 +3224,13 @@ void LOCALE_Init(void) /* Retrieve the preferred language as chosen in System Preferences. */ /* If language is a less specific variant of locale (e.g. 'en' vs. 'en_US'), leave things be. */ - CFArrayRef all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); - CFArrayRef preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); + CFArrayRef preferred_langs = CFLocaleCopyPreferredLanguages(); + CFStringRef canonical_lang_string_ref = CFLocaleCreateCanonicalLanguageIdentifierFromString(NULL, user_locale_string_ref); CFStringRef user_language_string_ref; - if (preferred_locales && CFArrayGetCount( preferred_locales ) && - (user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 )) && - !CFEqual(user_language_string_ref, user_locale_lang_ref)) + if (preferred_langs && canonical_lang_string_ref && CFArrayGetCount( preferred_langs ) && + (user_language_string_ref = CFArrayGetValueAtIndex( preferred_langs, 0 )) && + !CFEqual(user_language_string_ref, user_locale_lang_ref) && + !CFEqual(user_language_string_ref, canonical_lang_string_ref)) { struct locale_name locale_name; WCHAR buffer[128]; @@ -3238,11 +3238,12 @@ void LOCALE_Init(void) strcpynAtoW( buffer, user_locale, sizeof(buffer)/sizeof(WCHAR) ); parse_locale_name( buffer, &locale_name ); lcid_LC_MESSAGES = locale_name.lcid; - TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); + TRACE( "setting lcid_LC_MESSAGES to '%s' %04x\n", user_locale, lcid_LC_MESSAGES ); } - CFRelease( all_locales ); - if (preferred_locales) - CFRelease( preferred_locales ); + if (preferred_langs) + CFRelease( preferred_langs ); + if (canonical_lang_string_ref) + CFRelease( canonical_lang_string_ref ); } CFRelease( user_locale_ref );

1 0

Marcus Meissner : d3dx9_36: Use correct loop index (Coverity).
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 563f3cbc9212a2b4bf9f1a080469fdf8b8d2dadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=563f3cbc9212a2b4bf9f1a080… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 29 22:11:58 2013 +0200 d3dx9_36: Use correct loop index (Coverity). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3295020..c4afbe5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -560,7 +560,7 @@ static struct d3dx_parameter *get_valid_parameter(struct ID3DXBaseEffectImpl *ba for (m = 0; m < pass->annotation_count; ++m) { - if (pass->annotation_handles[i] == parameter) + if (pass->annotation_handles[m] == parameter) { return get_parameter_struct(parameter); }

1 0

Dmitry Timoshkov : include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 10476af6268de52f98112d47264ac4f4f7f5dc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10476af6268de52f98112d472… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 18:12:47 2013 +0900 include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition. --- dlls/ntdll/rtl.c | 1 + dlls/ntdll/signal_x86_64.c | 2 +- include/winnt.h | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 34869e7..bbcd454 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -34,6 +34,7 @@ #include <netinet/in.h> #endif #include "ntstatus.h" +#define NONAMELESSUNION #define NONAMELESSSTRUCT #define WIN32_NO_STATUS #define USE_WS_PREFIX diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7d2b8d5..f5a8ec9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2574,7 +2574,7 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A val ) { *(&context->u.s.Xmm0 + reg) = val; - if (ctx_ptr) ctx_ptr->u1.FloatingContext[reg] = &context->u.s.Xmm0 + reg; + if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = &context->u.s.Xmm0 + reg; } static int get_opcode_size( struct opcode op ) diff --git a/include/winnt.h b/include/winnt.h index bdfa464..6911f1c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1158,8 +1158,8 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PM128A Xmm13; PM128A Xmm14; PM128A Xmm15; - } DUMMYSTRUCTNAME1; - } DUMMYUNIONNAME1; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; union { @@ -1182,7 +1182,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PULONG64 R13; PULONG64 R14; PULONG64 R15; - } DUMMYSTRUCTNAME2; + } DUMMYSTRUCTNAME; } DUMMYUNIONNAME2; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS;

1 0

Dmitry Timoshkov : kernel32: Add some tests for PEB and loader locks.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 3de37fefce2196029e1935acf2a1767f997e74b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de37fefce2196029e1935acf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 17:20:24 2013 +0900 kernel32: Add some tests for PEB and loader locks. --- dlls/kernel32/tests/loader.c | 170 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 161 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3de37fefce2196029e193…

1 0

Roderick Colenbrander : opengl32: Add a test for WGL_EXT_swap_control.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 074d89a078b945410cae62479dfc451b17f9125e URL: http://source.winehq.org/git/wine.git/?a=commit;h=074d89a078b945410cae62479… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Apr 28 16:39:28 2013 -0700 opengl32: Add a test for WGL_EXT_swap_control. --- dlls/opengl32/tests/opengl.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 02a72c8..066b026 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -86,6 +86,10 @@ static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const i static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); +/* WGL_EXT_swap_control */ +static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); +static int (WINAPI *pwglGetSwapIntervalEXT)(void); + static const char* wgl_extensions = NULL; static void init_functions(void) @@ -114,6 +118,10 @@ static void init_functions(void) GET_PROC(wglGetPbufferDCARB) GET_PROC(wglReleasePbufferDCARB) + /* WGL_EXT_swap_control */ + GET_PROC(wglSwapIntervalEXT) + GET_PROC(wglGetSwapIntervalEXT) + #undef GET_PROC } @@ -1478,6 +1486,116 @@ static void test_destroy_read(HDC oldhdc) wglMakeCurrent(oldhdc, oldctx); } +static void test_swap_control(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window1, window2; + HGLRC ctx1, ctx2, oldctx; + BOOL ret; + HDC dc1, dc2; + int interval; + + oldctx = wglGetCurrentContext(); + ok(!!oldctx, "Expected to find a valid current context.\n"); + + window1 = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window1, "Failed to create window1, last error %#x.\n", GetLastError()); + + dc1 = GetDC(window1); + ok(!!dc1, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc1, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window1, dc1); + DestroyWindow(window1); + return; + } + + ret = SetPixelFormat(dc1, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx1 = wglCreateContext(dc1); + ok(!!ctx1, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc1, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 1, "Expected default swap interval 1, got %d\n", interval); + + ret = pwglSwapIntervalEXT(0); + ok(ret, "Failed to set swap interval to 0, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected default swap interval 0, got %d\n", interval); + + /* Check what interval we get on a second context on the same drawable.*/ + ctx2 = wglCreateContext(dc1); + ok(!!ctx2, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc1, ctx2); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); + + /* A second window is created to see whether its swap interval was affected + * by previous calls. + */ + window2 = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window2, "Failed to create window2, last error %#x.\n", GetLastError()); + + dc2 = GetDC(window2); + ok(!!dc2, "Failed to get DC.\n"); + + ret = SetPixelFormat(dc2, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc2, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + /* Since the second window lacks the swap interval, this proves that the interval + * is not global or shared among contexts. + */ + interval = pwglGetSwapIntervalEXT(); + todo_wine ok(interval == 1, "Expected swap interval 1, got %d\n", interval); + + ret = wglDeleteContext(ctx1); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + ret = wglDeleteContext(ctx2); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window1, dc1); + DestroyWindow(window1); + ReleaseDC(window2, dc2); + DestroyWindow(window2); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -1595,6 +1713,11 @@ START_TEST(opengl) else skip("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); + if(strstr(wgl_extensions, "WGL_EXT_swap_control")) + test_swap_control(hdc); + else + skip("WGL_EXT_swap_control not supported, skipping test\n"); + cleanup: ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

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 April 2013