October 2015 - Wine-commits

Sebastian Lackner : kernel32/tests: Add tests for GetPhysicallyInstalledSystemMemory.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 16a97953c0a3961fd03d8c9f0dcafd2e7824abcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a97953c0a3961fd03d8c9f0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 19 12:41:36 2015 +0200 kernel32/tests: Add tests for GetPhysicallyInstalledSystemMemory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index d8768da..136d618 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -39,6 +39,7 @@ #define HEAP_VALIDATE_PARAMS 0x40000000 static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); +static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); struct heap_layout @@ -1145,6 +1146,38 @@ static void test_child_heap( const char *arg ) test_heap_checks( expect_heap ); } +static void test_GetPhysicallyInstalledSystemMemory(void) +{ + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + MEMORYSTATUSEX memstatus; + ULONGLONG total_memory; + BOOL ret; + + pGetPhysicallyInstalledSystemMemory = (void *)GetProcAddress(kernel32, "GetPhysicallyInstalledSystemMemory"); + if (!pGetPhysicallyInstalledSystemMemory) + { + skip("GetPhysicallyInstalledSystemMemory is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetPhysicallyInstalledSystemMemory(NULL); + ok(!ret, "GetPhysicallyInstalledSystemMemory should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + total_memory = 0; + ret = pGetPhysicallyInstalledSystemMemory(&total_memory); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed\n"); + ok(total_memory != 0, "expected total_memory != 0\n"); + + memstatus.dwLength = sizeof(memstatus); + ret = GlobalMemoryStatusEx(&memstatus); + ok(ret, "GlobalMemoryStatusEx unexpectedly failed\n"); + ok(total_memory >= memstatus.ullTotalPhys / 1024, + "expected total_memory >= memstatus.ullTotalPhys / 1024\n"); +} + START_TEST(heap) { int argc; @@ -1172,7 +1205,9 @@ START_TEST(heap) test_sized_HeapReAlloc(1, (1 << 20)); test_sized_HeapReAlloc((1 << 20), (2 << 20)); test_sized_HeapReAlloc((1 << 20), 1); + test_HeapQueryInformation(); + test_GetPhysicallyInstalledSystemMemory(); if (pRtlGetNtGlobalFlags) {

1 0

Sebastian Lackner : kernel32: Implement stub for GetPhysicallyInstalledSystemMemory.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 966827bbc1fc49980a0367ea1a4908294fafe4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=966827bbc1fc49980a0367ea1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 19 12:41:48 2015 +0200 kernel32: Implement stub for GetPhysicallyInstalledSystemMemory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dlls/kernel32/heap.c | 21 +++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/heap.c | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec index 018ab05..6da2f25 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -7,7 +7,7 @@ @ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx @ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo @ stub GetOsSafeBootMode -@ stub GetPhysicallyInstalledSystemMemory +@ stdcall GetPhysicallyInstalledSystemMemory(ptr) kernel32.GetPhysicallyInstalledSystemMemory @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo @ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA @ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index cac73ec..0286d82 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1449,6 +1449,27 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual ); } +/*********************************************************************** + * GetPhysicallyInstalledSystemMemory (KERNEL32.@) + */ +BOOL WINAPI GetPhysicallyInstalledSystemMemory(ULONGLONG *total_memory) +{ + MEMORYSTATUSEX memstatus; + + FIXME("stub: %p\n", total_memory); + + if (!total_memory) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + memstatus.dwLength = sizeof(memstatus); + GlobalMemoryStatusEx(&memstatus); + *total_memory = memstatus.ullTotalPhys / 1024; + return TRUE; +} + BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD flags) { FIXME("stub: %p %p %p\n", mincache, maxcache, flags); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index dfc305b..d7eab83 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -759,7 +759,7 @@ @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) -# @ stub GetPhysicallyInstalledSystemMemory +@ stdcall GetPhysicallyInstalledSystemMemory(ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) @ stdcall GetPrivateProfileIntW(wstr wstr long wstr) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 136d618..b656dc2 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1156,7 +1156,7 @@ static void test_GetPhysicallyInstalledSystemMemory(void) pGetPhysicallyInstalledSystemMemory = (void *)GetProcAddress(kernel32, "GetPhysicallyInstalledSystemMemory"); if (!pGetPhysicallyInstalledSystemMemory) { - skip("GetPhysicallyInstalledSystemMemory is not available\n"); + win_skip("GetPhysicallyInstalledSystemMemory is not available\n"); return; }

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 31cfefd3ae9a73c9d270bdf3fdcaf3cc03334298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31cfefd3ae9a73c9d270bdf3f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 17 15:38:23 2015 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/po/uk.po b/po/uk.po index 9778f18..3b9de9e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-08-19 13:56+0200\n" +"PO-Revision-Date: 2015-10-17 15:42+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -4846,7 +4846,7 @@ msgstr "Забагато посилань.\n" #: winerror.mc:1476 msgid "Newer windows version needed.\n" -msgstr "Необхідна новіша версія windows.\n" +msgstr "Необхідна новіша версія Windows.\n" #: winerror.mc:1481 msgid "Wrong operating system.\n" @@ -7535,16 +7535,12 @@ msgid "&Convert..." msgstr "&Конвертувати..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Об'єкт" +msgstr "&Об'єкт %1 %2" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Об'єкт" +msgstr "&Об'єкт %1" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8983,10 +8979,6 @@ msgstr "" "вільного місця, або що комп'ютер ще підключений до мережі." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -11991,7 +11983,7 @@ msgid "" msgstr "" "Утиліта реєстрації DLL у Wine\n" "\n" -"Слугує сервісом для реєстрації DLL\n" +"Слугує сервісом для реєстрації DLL.\n" "\n" #: regsvr32.rc:40 @@ -12032,7 +12024,7 @@ msgstr "regsvr32: Не вдалося завантажити DLL '%1'\n" #: regsvr32.rc:43 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "regsvr32: %1 не реалізовано у DLL '%2'\n" +msgstr "regsvr32: '%1!S!' не реалізовано у DLL '%2'\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" @@ -14357,7 +14349,7 @@ msgstr "&Формат символів" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "Формат символів &за замовч." +msgstr "Формат символів &за замовчуванням" #: wordpad.rc:65 msgid "Paragrap&h format"

1 0

Nikolay Sivov : include: Add a couple of documented Toolbar messages definitions.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 83a652a9d4549a54afffe019fe1ef2696050522b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a652a9d4549a54afffe019f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 18 09:49:29 2015 +0300 include: Add a couple of documented Toolbar messages definitions. Thanks to Alan Feldman for pointing this out. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 9 +++------ dlls/user32/spy.c | 3 ++- include/commctrl.h | 9 +++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 558bfa1..9121266 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5155,16 +5155,13 @@ TOOLBAR_GetStringW (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPWSTR str) return ret; } -/* UNDOCUMENTED MESSAGE: This appears to set some kind of size. Perhaps it - * is the maximum size of the toolbar? */ -static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { SIZE * pSize = (SIZE*)lParam; FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy); return 0; } - /* This is an extended version of the TB_SETHOTITEM message. It allows the * caller to specify a reason why the hot item changed (rather than just the * HICF_OTHER that TB_SETHOTITEM sends). */ @@ -6734,8 +6731,8 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case TB_SETUNICODEFORMAT: return TOOLBAR_SetUnicodeFormat (infoPtr, wParam); - case TB_UNKWN45D: - return TOOLBAR_Unkwn45D(hwnd, wParam, lParam); + case TB_SETBOUNDINGSIZE: + return TOOLBAR_SetBoundingSize(hwnd, wParam, lParam); case TB_SETHOTITEM2: return TOOLBAR_SetHotItem2 (infoPtr, wParam, lParam); diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index c0acd82..4f8e56f 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1559,8 +1559,9 @@ static const USER_MSG toolbar_array[] = { USM(TB_MAPACCELERATORW ,0), USM(TB_GETSTRINGW ,0), USM(TB_GETSTRINGA ,0), - USM(TB_UNKWN45D ,8), + USM(TB_SETBOUNDINGSIZE ,8), USM(TB_SETHOTITEM2 ,0), + USM(TB_HASACCELERATOR ,0), USM(TB_SETLISTGAP ,0), USM(TB_GETIMAGELISTCOUNT ,0), USM(TB_GETIDEALSIZE ,8), diff --git a/include/commctrl.h b/include/commctrl.h index 5029e77..aa33cab 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1213,14 +1213,15 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', #define TB_GETSTRINGW (WM_USER+91) #define TB_GETSTRINGA (WM_USER+92) #define TB_GETSTRING WINELIB_NAME_AW(TB_GETSTRING) - -/* undocumented messages in Toolbar */ -#ifdef __WINESRC__ -#define TB_UNKWN45D (WM_USER+93) +#define TB_SETBOUNDINGSIZE (WM_USER+93) #define TB_SETHOTITEM2 (WM_USER+94) +#define TB_HASACCELERATOR (WM_USER+95) #define TB_SETLISTGAP (WM_USER+96) #define TB_GETIMAGELISTCOUNT (WM_USER+98) #define TB_GETIDEALSIZE (WM_USER+99) + +/* undocumented messages in Toolbar */ +#ifdef __WINESRC__ #define TB_UNKWN464 (WM_USER+100) #endif

1 0

Nikolay Sivov : shell32: Remove recurring return value check (PVS-Studio).
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: e2275b0a2a584cfc871b93437e591ff9b8243e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2275b0a2a584cfc871b93437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 00:29:28 2015 +0300 shell32: Remove recurring return value check (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1a4528f..9440563 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5568,8 +5568,7 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI if(SUCCEEDED(hr)) { - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); if(SUCCEEDED(hr) && pKFD->dwAttributes != 0) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szAttributes, 0, REG_DWORD, (LPBYTE)&pKFD->dwAttributes, sizeof(pKFD->dwAttributes)));

1 0

Nikolay Sivov : mshtml: Use VARIANT_TRUE instead of TRUE when appropriate (PVS-Studio).
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: f8e3c1f712f5bc453d4bd161f24967a77009d7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e3c1f712f5bc453d4bd161f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 00:50:22 2015 +0300 mshtml: Use VARIANT_TRUE instead of TRUE when appropriate (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/txtrange.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index debc5ed..b8103ce 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1207,7 +1207,7 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, if(!Count) { *ActualCount = 0; - return IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, TRUE); + return IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, VARIANT_TRUE); } switch(unit) { @@ -1219,7 +1219,7 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, *ActualCount = move_by_chars(&start, Count); set_start_point(This, &start); - IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, TRUE); + IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, VARIANT_TRUE); free_rangepoint(&start); break; } @@ -1232,7 +1232,7 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, *ActualCount = move_by_words(&start, Count); set_start_point(This, &start); - IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, TRUE); + IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, VARIANT_TRUE); free_rangepoint(&start); break; }

1 0

Frédéric Delanoy : French translation for release 1.7.53
by Jeremy Newman 19 Oct '15

19 Oct '15

Module: website Branch: master Commit: ee1887925174bc5bbb077b831a21916e9171ece4 URL: http://source.winehq.org/git/website.git/?a=commit;h=ee1887925174bc5bbb077b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 16 17:38:25 2015 +0200 French translation for release 1.7.53 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015101601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2015101601.xml b/news/fr/2015101601.xml new file mode 100644 index 0000000..1908ca9 --- /dev/null +++ b/news/fr/2015101601.xml @@ -0,0 +1,16 @@ +<news> +<date>16 octobre 2015</date> +<title>Sortie de Wine 1.7.53</title> +<body> + La version de développement 1.7.53 de Wine est disponible. + <a href="{$root}/announce/1.7.53">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des diverses versions de XAudio.</li> + <li>Avancement de l'implémentation de la DLL Web Services.</li> + <li>Incorporation d'objets OLE améliorée.</li> + <li>Divers nettoyages de code dans Direct3D.</li> + <li>Nouveau fichier MAINTAINERS et Signed-off-by prérequis pour améliorer le processus de révision des patchs.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.53.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.53
by Jeremy Newman 19 Oct '15

19 Oct '15

Module: website Branch: master Commit: d591cb2c4b65d6c9a22c0f2f3656af44120dc666 URL: http://source.winehq.org/git/website.git/?a=commit;h=d591cb2c4b65d6c9a22c0f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 17 07:47:18 2015 +0200 Polish translation for release 1.7.53 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015101601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015101601.xml b/news/pl/2015101601.xml new file mode 100644 index 0000000..d88d4d9 --- /dev/null +++ b/news/pl/2015101601.xml @@ -0,0 +1,17 @@ +<news> +<date>Październik 16, 2015</date> +<title>Wydano Wine 1.7.53</title> +<body> + Wydanie rozwojowe Wine 1.7.53 jest już dostępne. + <a href="{$root}/announce/1.7.53">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa różnych wersji XAudio.</li> + <li>Więcej implementacji biblioteki DLL Usług Sieciowych.</li> + <li>Ulepszono osadzanie obiektów OLE.</li> + <li>Różne porządki w kodzie Direct3D.</li> + <li>Nowe wymaganie obecności pliku MAINTAINERS (opiekunowie) oraz Signed-off-by (zatwierdzony przez) w celu poprawienia procesu oceny łatek.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.53.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.53
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: website Branch: master Commit: 26a75bcd45f1af0929cb3b96cf1d3eb93a95d0a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=26a75bcd45f1af0929cb3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 23:03:56 2015 +0900 Wine release 1.7.53 --- news/en/2015101601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015101601.xml b/news/en/2015101601.xml new file mode 100644 index 0000000..af7a75f --- /dev/null +++ b/news/en/2015101601.xml @@ -0,0 +1,17 @@ +<news> +<date>October 16, 2015</date> +<title>Wine 1.7.53 Released</title> +<body> + The Wine development release 1.7.53 is now available. + <a href="{$root}/announce/1.7.53">What's new</a> in this release: +<ul> + <li>Support for the various versions of XAudio.</li> + <li>More implementation of the Web Services DLL.</li> + <li>Improved OLE object embedding.</li> + <li>Various code cleanups in Direct3D.</li> + <li>New MAINTAINERS file and Signed-off-by requirement to improve the patch review process.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.53.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Matteo Bruni : wined3d: Use non-deprecated texture sample builtins in shaders on core profile.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 78bd9c9811a268fd805c88b6526c5f7a7c942998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bd9c9811a268fd805c88b65… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:06 2015 +0200 wined3d: Use non-deprecated texture sample builtins in shaders on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9373486..34abe5e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -66,6 +66,7 @@ struct glsl_sample_function struct wined3d_string_buffer *name; DWORD coord_mask; enum wined3d_data_type data_type; + BOOL output_single_component; }; enum heap_node_op @@ -2657,21 +2658,24 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) projected = FALSE; - if (shadow) - base = "shadow"; + if (needs_legacy_glsl_syntax(gl_info)) + { + if (shadow) + base = "shadow"; - type_part = resource_types[resource_type].type_part; - if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) - type_part = "2DRect"; - if (!type_part[0]) - FIXME("Unhandled resource type %#x.\n", resource_type); + type_part = resource_types[resource_type].type_part; + if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) + type_part = "2DRect"; + if (!type_part[0]) + FIXME("Unhandled resource type %#x.\n", resource_type); - if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) - { - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) - suffix = "ARB"; - else - FIXME("Unsupported grad function.\n"); + if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) + { + if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) + suffix = "ARB"; + else + FIXME("Unsupported grad function.\n"); + } } sample_function->name = string_buffer_get(priv->string_buffers); @@ -2682,6 +2686,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) ++coord_size; sample_function->coord_mask = (1u << coord_size) - 1; + sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); } static void shader_glsl_release_sample_function(const struct wined3d_shader_context *ctx, @@ -2828,6 +2833,9 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type); + if (sample_function->output_single_component) + shader_addline(ins->ctx->buffer, "vec4("); + shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name->buffer, shader_glsl_get_prefix(version->type), sampler); @@ -2874,6 +2882,9 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s else shader_addline(ins->ctx->buffer, ")"); + if (sample_function->output_single_component) + shader_addline(ins->ctx->buffer, ")"); + shader_addline(ins->ctx->buffer, "%s);\n", dst_swizzle); if (!is_identity_fixup(fixup))

1 0