September 2006 - Wine-commits

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 699f4cc703116cdae8b9bb68e044cc05bd28ff4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=699f4cc703116cdae8b9bb6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 28 23:13:35 2006 +0100 shell32: Cast-qual warnings fix. --- dlls/shell32/brsfolder.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 2d73d9b..30ee718 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -713,7 +713,8 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA ( BROWSEINFOW bi; LPITEMIDLIST lpid; INT len; - + LPWSTR title; + TRACE("%p\n", lpbi); bi.hwndOwner = lpbi->hwndOwner; @@ -729,12 +730,13 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA ( if (lpbi->lpszTitle) { len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 ); - bi.lpszTitle = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, (LPWSTR)bi.lpszTitle, len ); + title = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, title, len ); } else - bi.lpszTitle = NULL; + title = NULL; + bi.lpszTitle = title; bi.ulFlags = lpbi->ulFlags; bi.lpfn = lpbi->lpfn; bi.lParam = lpbi->lParam; @@ -746,7 +748,7 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA ( lpbi->pszDisplayName, MAX_PATH, 0, NULL); HeapFree( GetProcessHeap(), 0, bi.pszDisplayName ); } - HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); + HeapFree(GetProcessHeap(), 0, title); lpbi->iImage = bi.iImage; return lpid; }

1 0

Alexandre Julliard : winex11.drv: Fix typo that confuses winapi_check.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: cf47c3afbb8a83c1383328eb89b8d54969fa4078 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf47c3afbb8a83c1383328e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 14:43:59 2006 +0200 winex11.drv: Fix typo that confuses winapi_check. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b772468..c6f5a18 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1478,7 +1478,7 @@ BOOL WINAPI X11DRV_wglShareLists(HGLRC h return FALSE; } -static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD listBase, DWORD (WINAPI GetGlyphOutline_ptr)(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*)) +static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD listBase, DWORD (WINAPI *GetGlyphOutline_ptr)(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*)) { /* We are running using client-side rendering fonts... */ GLYPHMETRICS gm;

1 0

Juan Lang : winex11.drv: Don't deadlock if GL init fails.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: ec1ef77b267b2197fbf9b380713debd06a742c13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec1ef77b267b2197fbf9b38… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Sep 28 17:02:42 2006 -0700 winex11.drv: Don't deadlock if GL init fails. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b90f760..b772468 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -278,6 +278,7 @@ BOOL X11DRV_WineGL_InitOpenglInfo() pglXMakeCurrent(gdi_display, win, ctx); } else { ERR(" couldn't initialize OpenGL, expect problems\n"); + wine_tsx11_unlock(); return FALSE; } @@ -302,12 +303,12 @@ BOOL X11DRV_WineGL_InitOpenglInfo() TRACE("Client GLX version : %s.\n", WineGLInfo.glxClientVersion); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); - wine_tsx11_unlock(); if(vis) XFree(vis); if(ctx) { pglXMakeCurrent(gdi_display, None, NULL); pglXDestroyContext(gdi_display, ctx); } + wine_tsx11_unlock(); return TRUE; }

1 0

Mikołaj Zalewski : msvfw32: Add Polish translation.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: bfaa34c0d6202334a4da00d22ea1720acb05ef5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfaa34c0d6202334a4da00d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Sep 28 20:53:05 2006 +0200 msvfw32: Add Polish translation. --- dlls/msvfw32/msvfw32_Pl.rc | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Pl.rc b/dlls/msvfw32/msvfw32_Pl.rc new file mode 100644 index 0000000..8c48182 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Pl.rc @@ -0,0 +1,52 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 207, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kompresja wideo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&OK",IDOK,146,2,52,14 + PUSHBUTTON "&Anuluj",IDCANCEL,146,18,52,14 + + LTEXT "Typ &kompresji:",-1,9,6,128,8 + COMBOBOX 880,9,16,128,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Kon&figuruj...",882,146,36,52,14 + PUSHBUTTON "&Informacje...",883,146,52,52,14 + + SCROLLBAR 884,9,44,128,9,WS_TABSTOP + + LTEXT "&Jako�� kompresji:",886,9,34,97,8 + + CONTROL "&Ramka kluczowa co",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,81,12 + EDITTEXT 888,88,60,22,12 + LTEXT "ramek",889,114,62,31,10 + + CONTROL "&Strumie�",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,81,12 + EDITTEXT 895,88,76,22,12 + LTEXT "KB/sec",896,114,78,31,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Pe�ne ramki (bez kompresji)" +} diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index 1524da6..f0471f3 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -26,4 +26,5 @@ #include "msvfw32_Fr.rc" #include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc" #include "msvfw32_No.rc" +#include "msvfw32_Pl.rc" #include "msvfw32_Tr.rc"

1 0

Mikołaj Zalewski : comctl32: toolbar: Set correcly hwndTrack in TrackMouseEvent call.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 764c5b3b35a6a05c734ea7799a335423ffec7ed0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=764c5b3b35a6a05c734ea77… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Sep 28 20:56:08 2006 +0200 comctl32: toolbar: Set correcly hwndTrack in TrackMouseEvent call. --- dlls/comctl32/toolbar.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9de8e76..4f725ed 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6226,15 +6226,14 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wPa /* fill in the TRACKMOUSEEVENT struct */ trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; - trackinfo.hwndTrack = hwnd; - trackinfo.dwHoverTime = HOVER_DEFAULT; /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */ _TrackMouseEvent(&trackinfo); /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */ - if(!(trackinfo.dwFlags & TME_LEAVE)) { + if(trackinfo.hwndTrack != hwnd || !(trackinfo.dwFlags & TME_LEAVE)) { trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */ + trackinfo.hwndTrack = hwnd; /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ /* and can properly deactivate the hot toolbar button */

1 0

Mikołaj Zalewski : comctl32: toolbar: Small fix in TOOLBAR_StyleChanged.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: c7d034219e2602e558b10ce976314ba82c5da33b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7d034219e2602e558b10ce… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Sep 28 20:58:19 2006 +0200 comctl32: toolbar: Small fix in TOOLBAR_StyleChanged. --- dlls/comctl32/toolbar.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4f725ed..945b40b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6741,6 +6741,8 @@ TOOLBAR_StyleChanged (HWND hwnd, INT nTy if (nType == GWL_STYLE) { + DWORD dwOldStyle = infoPtr->dwStyle; + if (lpStyle->styleNew & TBSTYLE_LIST) infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS; else @@ -6753,7 +6755,7 @@ TOOLBAR_StyleChanged (HWND hwnd, INT nTy infoPtr->dwStyle = lpStyle->styleNew; /* only resize if one of the CCS_* styles was changed */ - if ((infoPtr->dwStyle ^ lpStyle->styleNew) & COMMON_STYLES) + if ((dwOldStyle ^ lpStyle->styleNew) & COMMON_STYLES) { TOOLBAR_AutoSize (hwnd);

1 0

Detlef Riekenberg : winedump: Remove the shell script reference from the man-page.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 32378f7c83a11092c9100244ec92c59f25070b9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32378f7c83a11092c910024… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 28 21:15:15 2006 +0200 winedump: Remove the shell script reference from the man-page. --- tools/winedump/winedump.man.in | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/winedump/winedump.man.in b/tools/winedump/winedump.man.in index f1b2e9e..f4fa04d 100644 --- a/tools/winedump/winedump.man.in +++ b/tools/winedump/winedump.man.in @@ -207,12 +207,6 @@ present). This is a template for 'configure' to produce a makefile. It is designed for a DLL that will be inserted into the Wine source tree. -.RE -.I foo_install -.RS -A shell script for adding -.I foo -to the Wine source tree. .SH BUGS C++ name demangling is currently under development. Since the algorithm used is not documented, it must be decoded. Many simple

1 0

Juan Lang : rsaenh: Correct signature checking.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 51f24d41701af461b4ed3a9042a6d761e6141a65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51f24d41701af461b4ed3a9… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Sep 28 10:50:50 2006 -0700 rsaenh: Correct signature checking. - pass desired key to encrypt_block_impl - don't change the alg id of imported keys - add a few traces --- dlls/rsaenh/implglue.c | 17 +++-------------- dlls/rsaenh/implglue.h | 3 ++- dlls/rsaenh/rsaenh.c | 33 +++++++++++++++++---------------- 3 files changed, 22 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=51f24d41701af461b4e…

1 0

Juan Lang : wincrypt.h: Fix a typo.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 3fdd3398a2bde63c46f09f5f5ac1259ad48b22cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fdd3398a2bde63c46f09f5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Sep 28 10:57:01 2006 -0700 wincrypt.h: Fix a typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index bfe9ac2..7b84570 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1322,7 +1322,7 @@ #define ALG_SID_MD2 #define ALG_SID_MD4 2 #define ALG_SID_MD5 3 #define ALG_SID_SHA 4 -#define ALG_SID_SHA1 CALG_SHA +#define ALG_SID_SHA1 ALG_SID_SHA #define ALG_SID_MAC 5 #define ALG_SID_RIPEMD 6 #define ALG_SID_RIPEMD160 7

1 0

Mikołaj Zalewski : sane.ds: Add Polish translation.
by Alexandre Julliard 29 Sep '06

29 Sep '06

Module: wine Branch: master Commit: 5543877f8163a538199e9f6284661b337b093ce5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5543877f8163a538199e9f6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Sep 28 20:41:10 2006 +0200 sane.ds: Add Polish translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Pl.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index 7b2b975..037d2c5 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -32,3 +32,4 @@ #include "sane_Fr.rc" #include "sane_Ko.rc" #include "sane_Nl.rc" #include "sane_No.rc" +#include "sane_Pl.rc" diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc new file mode 100644 index 0000000..65a9a31 --- /dev/null +++ b/dlls/sane.ds/sane_Pl.rc @@ -0,0 +1,41 @@ +/* + * Polish resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Skanowanie" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "TRWA SKANOWANIE.... Prosz� czeka�",IDC_STATIC,5,19,181,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0