wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Alexander Lakhin : inetcpl.cpl: Add Russian translation resources.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 663ae47e00b886c1f75fd027d2fa31a9999b85e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663ae47e00b886c1f75fd027d… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Fri Feb 11 21:21:42 2011 +0300 inetcpl.cpl: Add Russian translation resources. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Ru.rc | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index ac6171b..0ff888d 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ cpl_Nl.rc \ cpl_Pl.rc \ cpl_Pt.rc \ + cpl_Ru.rc \ cpl_Sr.rc \ cpl_Sv.rc \ cpl_Uk.rc \ diff --git a/dlls/inetcpl.cpl/cpl_Ru.rc b/dlls/inetcpl.cpl/cpl_Ru.rc new file mode 100644 index 0000000..db99526 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Ru.rc @@ -0,0 +1,59 @@ +/* + * Russian resources for the Internet control panel applet + * + * Copyright 2011 Alexander Lakhin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Общие" +BEGIN + + GROUPBOX " Домашняя страница ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Укажите адрес для вашей домашней страницы:", + IDC_STATIC, 58, 14, 252, 8 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Текущая страница", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&По умолчанию", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Пу&стая страница", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Содержание" +BEGIN + + GROUPBOX " Сертификаты ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Сертификаты используются для идентификации личности, а также для проверки подлинности центров сертификации и издателей.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Сертификаты...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Издатели...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Alexander Lakhin : cryptui: Add Russian translation resources.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 09c006751d6d56e79938f28c6c01661d61689cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c006751d6d56e79938f28c6… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Fri Feb 11 20:59:37 2011 +0300 cryptui: Add Russian translation resources. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/cryptui_Ru.rc | 316 ++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 15 +- 3 files changed, 324 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09c006751d6d56e79938f…

1 0

Gerald Pfeifer : wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 7f6d6b835dc361eab32e939c2745bd37930de888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6d6b835dc361eab32e939c2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:54:05 2011 +0100 wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5a63494..5f1566e 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ui = v1.val.ui OP v2.val.si; \ + r.val.si = v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ul = v1.val.ul OP v2.val.sl; \ + r.val.sl = v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ull = v1.val.ull OP v2.val.sll; \ + r.val.sll = v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Gerald Pfeifer : comctl32/tests: Remove unused parameter from test_removeimage().
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: d698e226f6ed18cc452bf11482a7af2877314b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d698e226f6ed18cc452bf1148… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:54:25 2011 +0100 comctl32/tests: Remove unused parameter from test_removeimage(). --- dlls/comctl32/tests/tab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 03c4390..4c464e6 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1148,7 +1148,7 @@ static void test_delete_focus(HWND parent_wnd) DestroyWindow(hTab); } -static void test_removeimage(HWND parent_wnd) +static void test_removeimage(void) { static const BYTE bits[32]; HWND hwTab; @@ -1408,7 +1408,7 @@ START_TEST(tab) test_insert_focus(parent_wnd); test_delete_focus(parent_wnd); test_delete_selection(parent_wnd); - test_removeimage(parent_wnd); + test_removeimage(); test_TCM_SETITEMEXTRA(parent_wnd); test_TCS_OWNERDRAWFIXED(parent_wnd);

1 0

Gerald Pfeifer : wined3d: Remove an old hack around Mesa choking on protected memory from flush_to_framebuffer_drawpixels .
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 54d98ba791e0b020f13e2fabd1c83ce7fcd850e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d98ba791e0b020f13e2fabd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:46:19 2011 +0100 wined3d: Remove an old hack around Mesa choking on protected memory from flush_to_framebuffer_drawpixels. --- dlls/wined3d/surface.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4377f10..b7f4b1c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1960,23 +1960,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, glRasterPos3i(rect.left, rect.top, 1); checkGLcall("glRasterPos3i"); - /* Some drivers(radeon dri, others?) don't like exceptions during - * glDrawPixels. If the surface is a DIB section, it might be in GDIMode - * after ReleaseDC. Reading it will cause an exception, which x11drv will - * catch to put the dib section in InSync mode, which leads to a crash - * and a blocked x server on my radeon card. - * - * The following lines read the dib section so it is put in InSync mode - * before glDrawPixels is called and the crash is prevented. There won't - * be any interfering gdi accesses, because UnlockRect is called from - * ReleaseDC, and the app won't use the dc any more afterwards. - */ - if ((This->flags & SFLAG_DIBSECTION) && !(This->flags & SFLAG_PBO)) - { - volatile BYTE read; - read = This->resource.allocatedMemory[0]; - } - /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width);

1 0

Gerald Pfeifer : comctl32/tests: Avoid uninitialized variable warning in GetWidthBytes().
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 8c9abc1dd8db3c1621276c0cfeabc5107d2c4c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9abc1dd8db3c1621276c0cf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:43:30 2011 +0100 comctl32/tests: Avoid uninitialized variable warning in GetWidthBytes(). --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 28b21a4..cc98a17 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -753,7 +753,7 @@ static INT DIB_GetWidthBytes( int width, int bpp ) default: trace("Unknown depth %d, please report.\n", bpp ); assert(0); - break; + return -1; } return 4 * words; }

1 0

Austin English : gdi32: Add a stub for GdiDrawStream.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: e36370f04b036b6e0a4a5e5f6b60d3ca6cc0ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36370f04b036b6e0a4a5e5f6… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 12 15:13:14 2011 -0800 gdi32: Add a stub for GdiDrawStream. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/painting.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4901e13..79c6f3c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -171,7 +171,7 @@ # @ stub GdiDeleteSpoolFileHandle # @ stub GdiDescribePixelFormat @ stub GdiDllInitialize -# @ stub GdiDrawStream +@ stdcall GdiDrawStream(long long ptr) # @ stub GdiEndDocEMF # @ stub GdiEndPageEMF @ stdcall GdiEntry13() diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1bcdc23..991c326 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1383,3 +1383,13 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, return TRUE; } + +/****************************************************************************** + * GdiDrawStream (GDI32.@) + * + */ +BOOL WINAPI GdiDrawStream( HDC hdc, ULONG in, void * pvin ) +{ + FIXME("stub: %p, %d, %p\n", hdc, in, pvin); + return FALSE; +}

1 0

Jacek Caban : urlmon: Fixed Valgrind warnings.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 9896d41ced9fd2b1904cfa244300a7e3302f307a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9896d41ced9fd2b1904cfa244… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 12 18:58:09 2011 +0100 urlmon: Fixed Valgrind warnings. --- dlls/urlmon/tests/sec_mgr.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 72b6e8a..b88b37a 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -792,6 +792,10 @@ static void test_InternetGetSecurityUrl(void) CHECK_CALLED(ParseUrl_SECURITY_URL_input2); CHECK_CALLED(ParseUrl_SECURITY_URL_expected); CHECK_CALLED(ParseUrl_SECURITY_DOMAIN_expected); + + ok(!lstrcmpW(security_expectedW, sec), "Expected %s but got %s\n", + wine_dbgstr_w(security_expectedW), wine_dbgstr_w(sec)); + CoTaskMemFree(sec); } static HRESULT WINAPI InternetProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, @@ -872,7 +876,7 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface *pcchResult = lstrlenW(ret)+1; if(*pcchResult > cchResult) return S_FALSE; - memcpy(pwzResult, ret, (*pcchResult+1)*sizeof(WCHAR)); + memcpy(pwzResult, ret, (*pcchResult)*sizeof(WCHAR)); return S_OK; }

1 0

Austin English : shell32: Trace APPBARDATA struct members based on message type (Valgrind).
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 99d9e0f6b297ea19839997211cc466b906709d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d9e0f6b297ea19839997211… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 11 18:38:38 2011 -0800 shell32: Trace APPBARDATA struct members based on message type (Valgrind). --- dlls/shell32/appbar.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/appbar.c b/dlls/shell32/appbar.c index 212ee37..c5bd3d4 100644 --- a/dlls/shell32/appbar.c +++ b/dlls/shell32/appbar.c @@ -74,9 +74,36 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) UINT_PTR ret = 0; - TRACE("msg=%d, data={cb=%d, hwnd=%p, callback=%x, edge=%d, rc=%s, lparam=%lx}\n", - msg, data->cbSize, data->hWnd, data->uCallbackMessage, data->uEdge, - wine_dbgstr_rect(&data->rc), data->lParam); + TRACE("msg=%d, data={cb=%d, hwnd=%p}\n", msg, data->cbSize, data->hWnd); + + /* These members are message dependent */ + switch(msg) + { + case ABM_NEW: + TRACE("callback: %x\n", data->uCallbackMessage); + break; + + case ABM_GETAUTOHIDEBAR: + TRACE("edge: %d\n", data->uEdge); + break; + + case ABM_QUERYPOS: + case ABM_SETPOS: + TRACE("edge: %d, rc: %s\n", data->uEdge, wine_dbgstr_rect(&data->rc)); + break; + + case ABM_GETTASKBARPOS: + TRACE("rc: %s\n", wine_dbgstr_rect(&data->rc)); + break; + + case ABM_SETAUTOHIDEBAR: + TRACE("edge: %d, lParam: %lx\n", data->uEdge, data->lParam); + break; + + default: + FIXME("unknown msg: %d\n", msg); + break; + } if (data->cbSize < sizeof(APPBARDATA)) {

1 0

Ken Thomases : iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: d52f95cec83eb9da252df431fd93c4682ff4ec0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f95cec83eb9da252df431f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Feb 11 16:02:02 2011 -0600 iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X. --- dlls/iphlpapi/icmp.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index d8ee101..2b76041 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -153,6 +153,11 @@ HANDLE WINAPI IcmpCreateFile(VOID) icmp_t* icp; int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); + } if (sid < 0) { ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
68
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 February 2011