January 2015 - Wine-Commits

Andrey Gusev : Ukrainian translation for release 1.7.27
by Jeremy Newman Jan. 19, 2015

Jan. 19, 2015

Module: website Branch: master Commit: 19c281ce8974c30a0527bbe3ce0088cefe2c0a0c URL: http://source.winehq.org/git/website.git/?a=commit;h=19c281ce8974c30a0527bb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 17 19:24:04 2015 +0200 Ukrainian translation for release 1.7.27 --- news/uk/2014091901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/uk/2014091901.xml b/news/uk/2014091901.xml new file mode 100644 index 0000000..30de9cc --- /dev/null +++ b/news/uk/2014091901.xml @@ -0,0 +1,15 @@ +<news> +<date>19 вересня 2014</date> +<title>Випущено Wine 1.7.27</title> +<body> + Розробницький реліз Wine 1.7.27 наразі доступний. + <a href="{$root}/announce/1.7.27">Що нового</a> в цьому релізі: +<ul> + <li>Збільшена підтримка Direct2D.</li> + <li>Різні покращення для інтерфейсів RichEdit.</li> + <li>Початкова підтримка ICMP 6-ої версії.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.27.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.23
by Jeremy Newman Jan. 19, 2015

Jan. 19, 2015

Module: website Branch: master Commit: 879492280165221570c961cd99fb108b8d8b0b99 URL: http://source.winehq.org/git/website.git/?a=commit;h=879492280165221570c961… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 17 19:18:15 2015 +0200 Ukrainian translation for release 1.7.23 --- news/uk/2014072501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2014072501.xml b/news/uk/2014072501.xml new file mode 100644 index 0000000..1008238 --- /dev/null +++ b/news/uk/2014072501.xml @@ -0,0 +1,16 @@ +<news> +<date>25 липня 2014</date> +<title>Випущено Wine 1.7.23</title> +<body> + Розробницький реліз Wine 1.7.23 наразі доступний. + <a href="{$root}/announce/1.7.23">Що нового</a> в цьому релізі: +<ul> + <li>Краща підтримка для drag & drop файлів.</li> + <li>Покращення управління HTTP cookie.</li> + <li>Початкова підтримка 64-бітних ОС Android побудов.</li> + <li>Виправлення управління сертифікатів crypto.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.23.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.20
by Jeremy Newman Jan. 19, 2015

Jan. 19, 2015

Module: website Branch: master Commit: bc4b559cfafc1d13ea0eecda1be6ad332decea44 URL: http://source.winehq.org/git/website.git/?a=commit;h=bc4b559cfafc1d13ea0eec… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 17 16:00:02 2015 +0200 Ukrainian translation for release 1.7.20 --- news/uk/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2014061301.xml b/news/uk/2014061301.xml new file mode 100644 index 0000000..67a529b --- /dev/null +++ b/news/uk/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>13 червня 2014</date> +<title>Випущено Wine 1.7.20</title> +<body> + Розробницький реліз Wine 1.7.20 наразі доступний. + <a href="{$root}/announce/1.7.20">Що нового</a> в цьому релізі: +<ul> + <li>Виправлення для X11 drag & drop.</li> + <li>Додаткові функції C/C++ runtime.</li> + <li>Виправлення різних проблем з пам'яттю знайдених за допомогою Valgrind.</li> + <li>Деякі виправлення для OLE.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.22
by Jeremy Newman Jan. 19, 2015

Jan. 19, 2015

Module: website Branch: master Commit: b7f4167dfedb9ecc5acc0ca238e9d63271e83d8a URL: http://source.winehq.org/git/website.git/?a=commit;h=b7f4167dfedb9ecc5acc0c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 17 16:35:46 2015 +0200 Ukrainian translation for release 1.7.22 --- news/uk/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2014071101.xml b/news/uk/2014071101.xml new file mode 100644 index 0000000..e1e1ea6 --- /dev/null +++ b/news/uk/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>11 липня 2014</date> +<title>Випущено Wine 1.7.22</title> +<body> + Розробницький реліз Wine 1.7.22 наразі доступний. + <a href="{$root}/announce/1.7.22">Що нового</a> в цьому релізі: +<ul> + <li>Підтримка пар символів Unicode.</li> + <li>Покращено підтримку cookie.</li> + <li>Драйвер OS X CoreAudio використовує AUHAL замість AudioQueue.</li> + <li>Початкова підтримка географічної інформації.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.21
by Jeremy Newman Jan. 19, 2015

Jan. 19, 2015

Module: website Branch: master Commit: 66dba9ad85c703337f4c9ca40b1a57129d3c7151 URL: http://source.winehq.org/git/website.git/?a=commit;h=66dba9ad85c703337f4c9c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 17 16:35:03 2015 +0200 Ukrainian translation for release 1.7.21 --- news/uk/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2014062701.xml b/news/uk/2014062701.xml new file mode 100644 index 0000000..7e37025 --- /dev/null +++ b/news/uk/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>27 червня 2014</date> +<title>Випущено Wine 1.7.21</title> +<body> + Розробницький реліз Wine 1.7.21 наразі доступний. + <a href="{$root}/announce/1.7.21">Що нового</a> в цьому релізі: +<ul> + <li>Підтримка критичних секцій в C runtime.</li> + <li>Оновлено дані юнікода до Unicode 7.0.</li> + <li>Підтримка черезрядкового кодування PNG.</li> + <li>Заглушка для бібліотеки пакувальника.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Bruno Jesus : dplayx: Cache GUID values so they persist after enumeration.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: 2d08038bac1beb29161143385642701190f8a4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08038bac1beb29161143385… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 14 21:09:49 2015 -0200 dplayx: Cache GUID values so they persist after enumeration. --- dlls/dplayx/dplay.c | 39 +++++++++++---- dlls/dplayx/tests/dplayx.c | 115 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 36e97a6..bae6a15 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5785,6 +5785,11 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, DWORD max_sizeOfDescriptionA = 0; WCHAR *descriptionW = NULL; DWORD max_sizeOfDescriptionW = 0; + DWORD sizeOfSubKeyName; + WCHAR subKeyName[255]; /* 255 is the maximum key size according to MSDN */ + LONG ret_value; + static GUID *guid_cache; + static int cache_count; if (!lpEnumCallbackA && !lpEnumCallbackW) { @@ -5799,19 +5804,37 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, ERR(": no service provider key in the registry - check your Wine installation !!!\n"); return DPERR_GENERIC; } - + + dwIndex = 0; + do + { + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName); + dwIndex++; + } + while (ret_value == ERROR_SUCCESS); + /* The game Swing from bug 37185 expects GUID values to persist after + * the end of the enumeration. */ + if (cache_count < dwIndex) + { + HeapFree(GetProcessHeap(), 0, guid_cache); + guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex); + if (!guid_cache) + { + ERR(": failed to alloc required memory.\n"); + return DPERR_EXCEPTION; + } + cache_count = dwIndex; + } /* Traverse all the service providers we have available */ dwIndex = 0; while (1) { - WCHAR subKeyName[255]; /* 255 is the maximum key size according to MSDN */ - DWORD sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); HKEY hkServiceProvider; - GUID serviceProviderGUID; WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ]; DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent); - LONG ret_value; + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, &filetime); if (ret_value == ERROR_NO_MORE_ITEMS) @@ -5842,7 +5865,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, ERR(": invalid format for the GUID registry data member for service provider %s (%s).\n", debugstr_w(subKeyName), debugstr_w(guidKeyContent)); continue; } - CLSIDFromString(guidKeyContent, &serviceProviderGUID ); + CLSIDFromString(guidKeyContent, &guid_cache[dwIndex]); /* The enumeration will return FALSE if we are not to continue. * @@ -5870,7 +5893,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, RegQueryValueExA(hkServiceProvider, "DescriptionA", NULL, NULL, (LPBYTE) descriptionA, &sizeOfDescription); - if (!lpEnumCallbackA(&serviceProviderGUID, descriptionA, 6, 0, lpContext)) + if (!lpEnumCallbackA(&guid_cache[dwIndex], descriptionA, 6, 0, lpContext)) goto end; } else @@ -5892,7 +5915,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, RegQueryValueExW(hkServiceProvider, descW, NULL, NULL, (LPBYTE) descriptionW, &sizeOfDescription); - if (!lpEnumCallbackW(&serviceProviderGUID, descriptionW, 6, 0, lpContext)) + if (!lpEnumCallbackW(&guid_cache[dwIndex], descriptionW, 6, 0, lpContext)) goto end; } diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index fb6646d..236e1a8 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -72,6 +72,13 @@ typedef struct tagCallbackData UINT dpidSize; } CallbackData, *lpCallbackData; +struct provider_data +{ + int call_count; + GUID *guid_ptr[10]; + GUID guid_data[10]; + BOOL ret_value; +}; static LPSTR get_temp_buffer(void) { @@ -749,6 +756,113 @@ static void test_DirectPlayCreate(void) } +static BOOL CALLBACK callback_providersA(GUID* guid, char *name, DWORD major, DWORD minor, void *arg) +{ + struct provider_data *prov = arg; + + if (!prov) return TRUE; + + if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + { + prov->guid_ptr[prov->call_count] = guid; + prov->guid_data[prov->call_count] = *guid; + + prov->call_count++; + } + + if (prov->ret_value) /* Only trace when looping all providers */ + trace("Provider #%d '%s' (%d.%d)\n", prov->call_count, name, major, minor); + return prov->ret_value; +} + +static BOOL CALLBACK callback_providersW(GUID* guid, WCHAR *name, DWORD major, DWORD minor, void *arg) +{ + struct provider_data *prov = arg; + + if (!prov) return TRUE; + + if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + { + prov->guid_ptr[prov->call_count] = guid; + prov->guid_data[prov->call_count] = *guid; + + prov->call_count++; + } + + return prov->ret_value; +} + +static void test_EnumerateProviders(void) +{ + HRESULT hr; + int i; + struct provider_data arg; + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = TRUE; + + hr = DirectPlayEnumerateA(callback_providersA, NULL); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateA(NULL, &arg); + ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateA(NULL, NULL); + ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + hr = DirectPlayEnumerateA(callback_providersA, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + ok(arg.call_count > 0, "Expected at least one valid provider\n"); + trace("Found %d providers\n", arg.call_count); + + /* The returned GUID values must have persisted after enumeration (bug 37185) */ + for(i = 0; i < arg.call_count; i++) + { + ok(IsEqualGUID(arg.guid_ptr[i], &arg.guid_data[i]), "#%d Expected equal GUID values\n", i); + } + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = FALSE; + hr = DirectPlayEnumerateA(callback_providersA, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); + + hr = DirectPlayEnumerateW(callback_providersW, NULL); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateW(NULL, &arg); + ok(FAILED(hr), "DirectPlayEnumerateW expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateW(NULL, NULL); + ok(FAILED(hr), "DirectPlayEnumerateW expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = TRUE; + hr = DirectPlayEnumerateW(callback_providersW, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + ok(arg.call_count > 0, "Expected at least one valid provider\n"); + + /* The returned GUID values must have persisted after enumeration (bug 37185) */ + for(i = 0; i < arg.call_count; i++) + { + ok(IsEqualGUID(arg.guid_ptr[i], &arg.guid_data[i]), "#%d Expected equal GUID values\n", i); + } + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = FALSE; + hr = DirectPlayEnumerateW(callback_providersW, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); +} + /* EnumConnections */ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, @@ -6544,6 +6658,7 @@ START_TEST(dplayx) test_COM(); test_COM_dplobby(); + test_EnumerateProviders(); if (!winetest_interactive) {

1 0

Qian Hong : kernel32: Fixed buffer size on 64bit in IsWow64Process.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: bfd088dbc6b4f397d9adfbc11a6f878ac0e8fd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd088dbc6b4f397d9adfbc11… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Jan 17 02:17:31 2015 +0800 kernel32: Fixed buffer size on 64bit in IsWow64Process. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/process.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0a087ab..396b7d4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3755,7 +3755,7 @@ DWORD WINAPI RegisterServiceProcess(DWORD dwProcessId, DWORD dwType) */ BOOL WINAPI IsWow64Process(HANDLE hProcess, PBOOL Wow64Process) { - ULONG pbi; + ULONG_PTR pbi; NTSTATUS status; status = NtQueryInformationProcess( hProcess, ProcessWow64Information, &pbi, sizeof(pbi), NULL ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 218a0d3..d7d3148 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1863,6 +1863,62 @@ static void test_Handles(void) SetStdHandle( STD_ERROR_HANDLE, handle ); } +static void test_IsWow64Process(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DWORD ret; + BOOL is_wow64; + static char cmdline[] = "C:\\Program Files\\Internet Explorer\\iexplore.exe"; + static char cmdline_wow64[] = "C:\\Program Files (x86)\\Internet Explorer\\iexplore.exe"; + + if (!pIsWow64Process) + { + skip("IsWow64Process is not available\n"); + return; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + ret = CreateProcessA(NULL, cmdline_wow64, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + if (ret) + { + trace("Created process %s\n", cmdline_wow64); + is_wow64 = FALSE; + ret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(ret, "IsWow64Process failed.\n"); + ok(is_wow64, "is_wow64 returned FALSE.\n"); + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + if (ret) + { + trace("Created process %s\n", cmdline); + is_wow64 = TRUE; + ret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(ret, "IsWow64Process failed.\n"); + ok(!is_wow64, "is_wow64 returned TRUE.\n"); + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } +} + static void test_SystemInfo(void) { SYSTEM_INFO si, nsi; @@ -2089,6 +2145,7 @@ START_TEST(process) test_QueryFullProcessImageNameA(); test_QueryFullProcessImageNameW(); test_Handles(); + test_IsWow64Process(); test_SystemInfo(); test_RegistryQuota(); test_DuplicateHandle();

1 0

Matteo Bruni : opengl32: Store the OpenGL context version in the handle value.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: cf92569cdd292fd8780bfafb7dafa01280aa9a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf92569cdd292fd8780bfafb7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 16 19:38:54 2015 +0100 opengl32: Store the OpenGL context version in the handle value. --- dlls/opengl32/wgl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3a5e148..32d241c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -51,8 +51,9 @@ extern struct opengl_funcs null_opengl_funcs; enum wgl_handle_type { - HANDLE_CONTEXT = 0 << 12, - HANDLE_PBUFFER = 1 << 12, + HANDLE_PBUFFER = 0 << 12, + HANDLE_CONTEXT = 1 << 12, + HANDLE_CONTEXT_V3 = 3 << 12, HANDLE_TYPE_MASK = 15 << 12 }; @@ -270,8 +271,24 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib { if ((context = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*context) ))) { + enum wgl_handle_type type = HANDLE_CONTEXT; + + if (attribs) + { + while (*attribs) + { + if (attribs[0] == WGL_CONTEXT_MAJOR_VERSION_ARB) + { + if (attribs[1] >= 3) + type = HANDLE_CONTEXT_V3; + break; + } + attribs += 2; + } + } + context->drv_ctx = drv_ctx; - if (!(ret = alloc_handle( HANDLE_CONTEXT, funcs, context ))) + if (!(ret = alloc_handle( type, funcs, context ))) HeapFree( GetProcessHeap(), 0, context ); } if (!ret) funcs->wgl.p_wglDeleteContext( drv_ctx );

1 0

Nikolay Sivov : vbscript: Support 'End If' for single line If statements.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: e584edd379f798a37c7c4a87eb8ffbc2660f1e4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e584edd379f798a37c7c4a87e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 15 09:26:26 2015 +0300 vbscript: Support 'End If' for single line If statements. --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 681a0c9..fb95dfb 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -246,10 +246,10 @@ Step_opt IfStatement : tIF Expression tTHEN tNL StatementsNl_opt ElseIfs_opt Else_opt tEND tIF - { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } - | tIF Expression tTHEN Statement { $$ = new_if_statement(ctx, $2, $4, NULL, NULL); CHECK_ERROR; } + { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } + | tIF Expression tTHEN Statement EndIf_opt { $$ = new_if_statement(ctx, $2, $4, NULL, NULL); CHECK_ERROR; } | tIF Expression tTHEN Statement tELSE Statement EndIf_opt - { $$ = new_if_statement(ctx, $2, $4, NULL, $6); CHECK_ERROR; } + { $$ = new_if_statement(ctx, $2, $4, NULL, $6); CHECK_ERROR; } EndIf_opt : /* empty */ diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3ee445c..b23b709 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -234,6 +234,7 @@ if false then : if false then x = y : if true then call ok(false, "embedded if called") if false then x=1 else x=2 end if +if true then x=1 end if x = false if false then x = true : x = true

1 0

Bruno Jesus : oleaut32: Fix copy & paste issue in VarFormatNumber.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Module: wine Branch: master Commit: ec05998be893611af111b420c09fe3cd7d1e1a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec05998be893611af111b420c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 15 12:36:27 2015 -0200 oleaut32: Fix copy & paste issue in VarFormatNumber. --- dlls/oleaut32/varformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 0e1c370..ec52a1e 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2326,7 +2326,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, sizeof(decimal)/sizeof(WCHAR)); numfmt.lpThousandSep = thousands; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, sizeof(thousands)/sizeof(WCHAR)); if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt,

1 0