January 2006 - Wine-Commits

Vitaliy Margolen : user: Add missing WIN_ReleasePtr.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: e383143f183bc8c045e5717d1ae0b75a32c4e405 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e383143f183bc8c045e5717… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Jan 23 11:24:16 2006 +0100 user: Add missing WIN_ReleasePtr. --- dlls/user/scroll.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user/scroll.c b/dlls/user/scroll.c index 0f40feb..8774a88 100644 --- a/dlls/user/scroll.c +++ b/dlls/user/scroll.c @@ -260,6 +260,7 @@ static BOOL SCROLL_GetScrollBarRect( HWN if (!info) { WARN("called for missing scroll bar"); + WIN_ReleasePtr( wndPtr ); return FALSE; } *arrowSize = GetSystemMetrics(SM_CXVSCROLL);

1 0

Dmitry Timoshkov : ICCompressorChoose should initialize fccType and fccHandler fields
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 2a93c2f23defc6a4aec7a7335a5a792dd808011f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a93c2f23defc6a4aec7a73… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 23 11:24:08 2006 +0100 ICCompressorChoose should initialize fccType and fccHandler fields for the full frames case as well. --- dlls/avifil32/avifile_private.h | 4 ---- dlls/msvideo/msvideo_main.c | 12 ++++++++++-- include/vfw.h | 4 ++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index d29c00c..4393264 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -23,10 +23,6 @@ #define MAX_AVISTREAMS 8 #endif -#ifndef comptypeDIB -#define comptypeDIB mmioFOURCC('D','I','B',' ') -#endif - #ifndef DIBWIDTHBYTES #define WIDTHBYTES(i) (((i+31)&(~31))/8) #define DIBWIDTHBYTES(bi) WIDTHBYTES((bi).biWidth * (bi).biBitCount) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 753632f..3059243 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -749,6 +749,7 @@ static INT_PTR CALLBACK icm_choose_compr { case WM_INITDIALOG: { + ICINFO *ic; WCHAR buf[128]; struct choose_compressor *choose_comp = (struct choose_compressor *)lparam; @@ -758,6 +759,11 @@ static INT_PTR CALLBACK icm_choose_compr LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); + ic = HeapAlloc(GetProcessHeap(), 0, sizeof(ICINFO)); + ic->fccType = streamtypeVIDEO; + ic->fccHandler = comptypeDIB; + SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETITEMDATA, 0, (LPARAM)ic); + enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST)); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETCURSEL, 0, 0); @@ -782,8 +788,10 @@ static INT_PTR CALLBACK icm_choose_compr { struct choose_compressor *choose_comp = (struct choose_compressor *)GetWindowLongPtrW(hdlg, DWLP_USER); - choose_comp->cv.hic = ICOpen(ic->fccType, ic->fccHandler, ICMODE_COMPRESS); - if (choose_comp->cv.hic) + if (ic->fccHandler != comptypeDIB) + choose_comp->cv.hic = ICOpen(ic->fccType, ic->fccHandler, ICMODE_COMPRESS); + + if (ic->fccHandler == comptypeDIB || choose_comp->cv.hic) { choose_comp->cv.fccType = ic->fccType; choose_comp->cv.fccHandler = ic->fccHandler; diff --git a/include/vfw.h b/include/vfw.h index 760de96..6338fd7 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -143,6 +143,10 @@ DECLARE_HANDLE(HIC); #define ICM_COMPRESS_FRAMES_INFO (ICM_USER+70) #define ICM_SET_STATUS_PROC (ICM_USER+72) +#ifndef comptypeDIB +#define comptypeDIB mmioFOURCC('D','I','B',' ') +#endif + /* structs */ /* NOTE: Only the 16 bit structs are packed. Structs that are packed anyway

1 0

Detlef Riekenberg : kernel/tests: Integer atoms return different results on WinNT 3.51.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 4cfc3874dfd3e9660f40c35de7eb7e836920a8ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cfc3874dfd3e9660f40c35… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 23 11:23:50 2006 +0100 kernel/tests: Integer atoms return different results on WinNT 3.51. --- dlls/kernel/tests/atom.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/atom.c b/dlls/kernel/tests/atom.c index 2fbce32..45288ac 100644 --- a/dlls/kernel/tests/atom.c +++ b/dlls/kernel/tests/atom.c @@ -271,10 +271,14 @@ static void test_get_atom_name(void) ok( !len, "bad length %d\n", len ); memset(outW, '.', sizeof(outW)); + SetLastError(0xdeadbeef); len = GlobalGetAtomNameW( (ATOM)i, outW, 1); if (i) { - ok(len == 1, "succeed (got %u instead of 1)\n", len); + /* len == 0 with ERROR_MORE_DATA is on NT3.51 */ + ok(len == 1 || (len == 0 && GetLastError() == ERROR_MORE_DATA), + "0x%04x: got %u with %ld (excepted '1' or '0' with " \ + "ERROR_MORE_DATA)\n", i, len, GetLastError()); ok(outW[1] == DOUBLE('.'), "buffer overwrite\n"); } else ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "0 badly handled\n");

1 0

Kai Blin : secur32: Added DeleteSecurityContext.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 0605cf01136ec04217e3289f28a89541ba0600f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0605cf01136ec04217e3289… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Jan 23 11:23:21 2006 +0100 secur32: Added DeleteSecurityContext. --- dlls/secur32/ntlm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index feaef9b..86aa0b6 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1005,7 +1005,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_De TRACE("%p\n", phContext); if (phContext) { - ret = SEC_E_UNSUPPORTED_FUNCTION; + phContext->dwUpper = 0; + phContext->dwLower = 0; + ret = SEC_E_OK; } else {

1 0

Mike McCormack : shell32: Export DllGetClassObject by ordinal as grpconv.exe requires it.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 4b17a9faaea83da55181696a9b65f262e6c33919 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b17a9faaea83da55181696… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 23 11:23:33 2006 +0100 shell32: Export DllGetClassObject by ordinal as grpconv.exe requires it. --- dlls/shell32/shell32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index eee3cef..4e6b7ae 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -117,6 +117,7 @@ 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) 127 stdcall -noname SHWinHelp(long long long long) + 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject 129 stdcall -noname DAD_AutoScroll(long ptr ptr) 130 stdcall -noname DAD_DragEnter(long) 131 stdcall -noname DAD_DragEnterEx(long double)

1 0

Dmitry Timoshkov : x11drv: Update Swiss German keyboard layout to better match the X11 one.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: cf2561b111f5f1a5f733621bc7ffea947c188bda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf2561b111f5f1a5f733621… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 23 11:23:13 2006 +0100 x11drv: Update Swiss German keyboard layout to better match the X11 one. --- dlls/x11drv/keyboard.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 9cbe5fc..3df4162 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -341,14 +341,14 @@ static const char main_key_DE_nodead_105 "<>|","yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", }; -/*** Swiss German keyboard layout (contributed by Jonathan Naylor) */ +/*** Swiss German keyboard layout (setxkbmap ch -variant de) */ static const char main_key_SG[MAIN_LEN][4] = { - "��","1+|","2\"@","3*#","4�","5%","6&�","7/�","8(�","9)","0=","'?�","^`~", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��[","�!]", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��{","$�}", + "��","1+","2\"","3*","4�","5%","6&","7/","8(","9)","0=","'?","^`", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","�!", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","$�", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", - "<>\\" + "<>" }; /*** Swiss French keyboard layout (contributed by Philippe Froidevaux) */

1 0

James Hawkins : shell32: Reimplement a factored SHFileOperation.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 1be970d48572d6f988eeedb6e39bf57b141b555e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1be970d48572d6f988eeedb… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 23 11:22:59 2006 +0100 shell32: Reimplement a factored SHFileOperation. --- dlls/shell32/shlfileop.c | 1138 +++++++++++++++++++--------------------- dlls/shell32/tests/shlfileop.c | 119 ---- 2 files changed, 548 insertions(+), 709 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1be970d48572d6f988e…

1 0

lostwages/ news/2006012201.xml wwn/wn20060122_ ...
by WineHQ Jan. 23, 2006

Jan. 23, 2006

ChangeSet ID: 22448 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/01/22 22:59:12 Added files: news : 2006012201.xml wwn : wn20060122_303.xml Log message: WWN #303 Patch: http://cvs.winehq.org/patch.py?id=22448 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006012201.xml Added 1.1 +0 -0 lostwages/wwn/wn20060122_303.xml

1 0

appdb/admin adminMaintainerQueue.php
by WineHQ Jan. 23, 2006

Jan. 23, 2006

ChangeSet ID: 22447 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/22 20:56:31 Modified files: admin : adminMaintainerQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix maintainer queue display to correctly display the version of applications Patch: http://cvs.winehq.org/patch.py?id=22447 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/admin/adminMaintainerQueue.php Index: appdb/admin/adminMaintainerQueue.php diff -u -p appdb/admin/adminMaintainerQueue.php:1.19 appdb/admin/adminMaintainerQueue.php:1.20 --- appdb/admin/adminMaintainerQueue.php:1.19 23 Jan 2006 2:56:31 -0000 +++ appdb/admin/adminMaintainerQueue.php 23 Jan 2006 2:56:31 -0000 @@ -113,7 +113,7 @@ if ($_REQUEST['sub']) while(list($index, list($appIdOther, $versionIdOther, $superMaintainerOther)) = each($other_apps)) { $oApp = new Application($appIdOther); - $oVersion = new Application($versionIdOther); + $oVersion = new Version($versionIdOther); if($firstDisplay) { $firstDisplay = false;

1 0

appdb/include bugs.php
by WineHQ Jan. 23, 2006

Jan. 23, 2006

ChangeSet ID: 22446 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/22 20:13:47 Modified files: include : bugs.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add bug number to bug link emails. Fixes bug 4358. Patch: http://cvs.winehq.org/patch.py?id=22446 Old revision New revision Changes Path 1.5 1.6 +3 -3 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.5 appdb/include/bugs.php:1.6 --- appdb/include/bugs.php:1.5 23 Jan 2006 2:13:47 -0000 +++ appdb/include/bugs.php 23 Jan 2006 2:13:47 -0000 @@ -216,7 +216,7 @@ class Bug { { if(!$this->bQueued) { - $sSubject = "Bug Link for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." added by ".$_SESSION['current']->sRealname; + $sSubject = "Link between Bug ".$this->iBug_id." and ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." added by ".$_SESSION['current']->sRealname; $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; if($this->iSubmitterId) { @@ -227,7 +227,7 @@ class Bug { addmsg("The Bug Link was successfully added into the database.", "green"); } else // Bug Link queued. { - $sSubject = "Bug Link for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." submitted by ".$_SESSION['current']->sRealname; + $sSubject = "Link between Bug ".$this->iBug_id." and ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." submitted by ".$_SESSION['current']->sRealname; $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; $sMsg .= "This Bug Link has been queued."; $sMsg .= "\n"; @@ -235,7 +235,7 @@ class Bug { } } else // Bug Link deleted. { - $sSubject = "Bug Link for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname; + $sSubject = "Link between Bug ".$this->iBug_id." and ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname; $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; addmsg("Bug Link deleted.", "green"); }

1 0