January 2007 - Wine-commits

Dmitry Timoshkov : user32: Using DIB APIs to convert a DDB to monochrome is wrong, do it differently.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 81a294f76d47fcacdfff185617f27c6872d578fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a294f76d47fcacdfff18561… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 23 16:46:53 2007 +0800 user32: Using DIB APIs to convert a DDB to monochrome is wrong, do it differently. --- dlls/user32/cursoricon.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 26adfde..a5e0d00 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1846,8 +1846,6 @@ HICON WINAPI CreateIconIndirect(PICONINF sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); if (hObj) { - HDC hdc; - BITMAPINFO bi; CURSORICONINFO *info; info = (CURSORICONINFO *)GlobalLock16( hObj ); @@ -1884,18 +1882,34 @@ HICON WINAPI CreateIconIndirect(PICONINF /* Transfer the bitmap bits to the CURSORICONINFO structure */ /* Some apps pass a color bitmap as a mask, convert it to b/w */ - hdc = GetDC( 0 ); - memset(&bi, 0, sizeof(bi) ); - bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi.bmiHeader.biWidth = bmpAnd.bmWidth; - bi.bmiHeader.biHeight = bmpAnd.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 1; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = sizeAnd; - GetDIBits( hdc, iconinfo->hbmMask, 0, bmpAnd.bmHeight, (char*)(info + 1), &bi, DIB_RGB_COLORS ); - ReleaseDC( 0, hdc ); + if (bmpAnd.bmBitsPixel == 1) + { + GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) ); + } + else + { + HDC hdc, hdc_mem; + HBITMAP hbmp_old, hbmp_mem_old, hbmp_mono; + + hdc = GetDC( 0 ); + hdc_mem = CreateCompatibleDC( hdc ); + hbmp_mono = CreateBitmap( bmpAnd.bmWidth, bmpAnd.bmHeight, 1, 1, NULL ); + + hbmp_old = SelectObject( hdc, iconinfo->hbmMask ); + hbmp_mem_old = SelectObject( hdc_mem, hbmp_mono ); + + BitBlt( hdc_mem, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, hdc, 0, 0, SRCCOPY ); + + SelectObject( hdc, hbmp_old ); + SelectObject( hdc_mem, hbmp_mem_old ); + + DeleteDC( hdc_mem ); + ReleaseDC( 0, hdc ); + + GetBitmapBits( hbmp_mono, sizeAnd, (char*)(info + 1) ); + DeleteObject( hbmp_mono ); + } if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd ); GlobalUnlock16( hObj ); }

1 0

docs/en winedev-testing.sgml
by Dimi Paun 24 Jan '07

24 Jan '07

ChangeSet ID: 1169619413142669370704429 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/01/23 22:16:53 Modified files: en : winedev-testing.sgml Log message: "Jeff Latimer" <lats(a)yless4u.com.au> Add info about getting the Windows DDK to provide libs that don't ship with Visual Studio Express. Old revision New revision Changes Path 1.4 1.5 +8 -1 docs/en/winedev-testing.sgml Index: docs/en/winedev-testing.sgml diff -u -p docs/en/winedev-testing.sgml:1.4 docs/en/winedev-testing.sgml:1.5 --- docs/en/winedev-testing.sgml 24 Jan 2007 6:16:53 -0000 +++ /dev/null 24 Jan 2007 6:16:53 -0000 @@ -275,7 +275,14 @@ thread.c: 86 tests executed, 5 marked as Service Pack 6. If you are using Visual Studio 7 or greater you do not need the processor pack. In either case it is recommended to the most recent compatible Visual Studio - <ulink url="http://msdn.microsoft.com/vstudio/downloads/updates/sp/">service pack</>. + <ulink url="http://msdn.microsoft.com/vstudio/downloads/updates/sp/">service pack</>. + If are using Visual Studio Express and you need specific libraries + like <filename>ntdll.lib</> that don't ship with Visual Studio + Express, you will need the + <ulink url="http://www.microsoft.com/whdc/devtools/ddk/default.mspx">Windows + Device Development Kit (DDK)</> which is part of the + <ulink url="http://www.microsoft.com/whdc/resources/downloads.mspx">Windows + Developer Kit</>. </para></listitem> <listitem><para> get the Wine sources

1 0

appdb/ include/maintainer.php unit_test/test_m ...
by WineHQ 24 Jan '07

24 Jan '07

ChangeSet ID: 30908 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/23 22:10:05 Modified files: include : maintainer.php unit_test : test_maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Disallowid of 0 in deleteMaintainersForVersion(). Add a unit test to ensure that deleteMaintainersForVersion() behaves properly. Patch: http://cvs.winehq.org/patch.py?id=30908 Old revision New revision Changes Path 1.24 1.25 +3 -0 appdb/include/maintainer.php 1.4 1.5 +37 -0 appdb/unit_test/test_maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.24 appdb/include/maintainer.php:1.25 --- appdb/include/maintainer.php:1.24 24 Jan 2007 4:10: 5 -0000 +++ appdb/include/maintainer.php 24 Jan 2007 4:10: 5 -0000 @@ -178,6 +178,9 @@ class maintainer function deleteMaintainersForVersion($oVersion) { + if(!$oVersion->iVersionId) + return FALSE; + $hResult = query_parameters("DELETE from appMaintainers WHERE versionId='?'", $oVersion->iVersionId); } Index: appdb/unit_test/test_maintainer.php diff -u -p appdb/unit_test/test_maintainer.php:1.4 appdb/unit_test/test_maintainer.php:1.5 --- appdb/unit_test/test_maintainer.php:1.4 24 Jan 2007 4:10: 5 -0000 +++ appdb/unit_test/test_maintainer.php 24 Jan 2007 4:10: 5 -0000 @@ -305,6 +305,38 @@ function test_superMaintainerOnAppSubmit return true; } +/* deleteMaintainersForVersion() should fail if versionId = 0 + Otherwise it will delete all super maintainers */ +function test_maintainer_deleteMaintainersForVersion() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + + $oUser = new user(); + $oUser->login($test_email, $test_password); + + $oMaintainer = new maintainer(); + $oMaintainer->iAppId = 655000; + $oMaintainer->iVersionId = 0; + $oMaintainer->iUserId = 655000; + $oMaintainer->sMaintainReason = "Silly reason"; + $oMaintainer->bSuperMaintainer = 1; + + $oMaintainer->create(); + + $oVersion = new version(); + $oVersion->iVersionId = 0; + + if(maintainer::deleteMaintainersForVersion($oVersion) !== FALSE) + { + echo "Got success, but this should fail.\n"; + return FALSE; + } + + return TRUE; +} + if(!test_maintainer_getMaintainerCountForUser()) echo "test_maintainer_getMaintainerCountForUser() failed!\n"; else @@ -327,4 +359,9 @@ if(!test_superMaintainerOnAppSubmit()) else echo "test_superMaintainerOnAppSubmit() passed\n"; +if(!test_maintainer_deleteMaintainersForVersion()) + echo "test_maintainer_deleteMaintainersForVersion() failed!\n"; +else + echo "test_maintainer_deleteMaintianersForVersion() passed\n"; + ?>

1 0

lostwages/templates/en download-deb.template
by Jeremy Newman 23 Jan '07

23 Jan '07

ChangeSet ID: 30907 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/01/23 09:22:20 Modified files: templates/en : download-deb.template Log message: Scott Ritchie <scott(a)open-vote.org> Update download-deb with simpler instructions and APT Patch: http://cvs.winehq.org/patch.py?id=30907 Old revision New revision Changes Path 1.12 1.13 +18 -61 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.12 lostwages/templates/en/download-deb.template:1.13 --- lostwages/templates/en/download-deb.template:1.12 23 Jan 2007 15:22:20 -0000 +++ lostwages/templates/en/download-deb.template 23 Jan 2007 15:22:20 -0000 @@ -12,78 +12,35 @@ distributions have their own repositorie Wine, however we keep our own repository of the latest available packages here for download. -Packages here are designed to function on Ubuntu Edgy (6.10), Dapper (6.06), and -Breezy (5.10). Packages here used to also work for Debian unstable, however due -to changes in Debian this no longer works and our Ubuntu maintainer is unable to support them. -If you can help provide up-to-date Debian packages, please contact <a href=mailto:scott(a)open-vote.org>Scott Ritchie</a>. +Packages here are designed to function on Ubuntu Edgy (6.10) and Dapper (6.06). +Packages here used to also work for Debian unstable, however due to changes in +Debian this no longer works and our Ubuntu maintainer is unable to support them. +If you can help provide up-to-date Debian packages, please contact +<a href=mailto:scott(a)open-vote.org>Scott Ritchie</a>. +<h2>Adding the WineHQ APT Repository:</h2> -<h2>Installing from the WineHQ APT Repository with Synaptic:</h2> - -To install Wine from the WineHQ APT repository, you need to configure APT to -look in the right place for the Wine packages. On Ubuntu systems, and those -using the Synaptic Package Manager, this can be done easily by opening up -Synaptic (System->Administration->Synaptic Package Manager) and selecting -Settings->Repositories. Then click add, select custom, and enter one of the -following: +First, open a terminal window. Then add the repository's key to your system's +list of trusted APT keys by copy and pasting the following: -For Ubuntu Edgy (6.10): -deb http://wine.budgetdedicated.com/apt edgy main -For Ubuntu Dapper (6.06): -deb http://wine.budgetdedicated.com/apt dapper main -For Ubuntu Breezy (5.10): -deb http://wine.budgetdedicated.com/apt breezy main - -<img src="{$root}/images/distro/synaptic-repository-binary3.png" alt="Synaptic Package Repository Screenshot" border="0"> - -Then, simply click reload and search for the package 'wine' for installation. -If you already have a 'wine' package installed, selecting mark all upgrades -should update Wine to the newest version. - - - -<h2>Getting source packages from the repository</h2> +wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - -Currently, we only have i386 binary packages available. If you do not use an -i386 architecture, or wish to compile the package in a special or optimized way, -you can build the wine package using the source repository instead. To do this, -add a source repository with one of the following: +Next, add the repository to your system's list of APT sources: For Ubuntu Edgy (6.10): -deb-src http://wine.budgetdedicated.com/apt edgy main +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Dapper (6.06): -deb-src http://wine.budgetdedicated.com/apt dapper main -For Ubuntu Breezy (5.10): -deb-src http://wine.budgetdedicated.com/apt breezy main +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list -Then, see the instructions below for building the package in the console. -Most users, however, will neither need nor want to do this. - -<img src="{$root}/images/distro/synaptic-repository-source3.png" alt="Synaptic Package Repository Screenshot" border="0"> - - -<h2>Installing from the WineHQ APT Repository with the console:</h2> - -If your system doesn't use a graphical package manager like Synaptic, you -will need to edit APT's configuration file by hand. You will need root access to -do this and run the commands below. Switch to root by typing 'su'. If you -are an Ubuntu user, you can instead precede each command with 'sudo'. Now, -use your favorite text editor to open the file /etc/apt/sources.list or use the -console editor by typing 'nano /etc/apt/sources.list' and then add the -following lines to the end: - -For Ubuntu Dapper (6.06): -deb http://wine.budgetdedicated.com/apt dapper main -deb-src http://wine.budgetdedicated.com/apt dapper main -For Ubuntu Breezy (5.10): -deb http://wine.budgetdedicated.com/apt breezy main -deb-src http://wine.budgetdedicated.com/apt breezy main +Then, you can install Wine from WineHQ like it were any other package, such as by +using the Synaptic Package Manager under System->Administration. Alternatively, you +can install from the terminal by running 'apt-get update' to update APT's +package information and then 'apt-get install wine'. -Then, you can run 'apt-get update' to update APT's package information. -Finally, to install Wine, do 'apt-get install wine'. +<h2>Debian Users:</h2> If you are using Debian and want to make sure that apt-get will install the -WineHQ Wine package instead of the Debian Wine package (which usually confuses +WineHQ Wine package instead of the Debian Wine package (which sometimes confuses APT by having the same version number), then you will need to add something like the following entry to /etc/apt/preferences:

1 0

Anatoly Lyutin : cmd: In function WCMD_goto() changed strcmp() to lstrcmpi( ).
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 45d4f8ec2be62c67c71bb7ba97442e1088884eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d4f8ec2be62c67c71bb7ba9… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Jan 17 12:46:34 2007 +0300 cmd: In function WCMD_goto() changed strcmp() to lstrcmpi(). --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 59e4c5d..018a8e0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -435,7 +435,7 @@ char string[MAX_PATH]; if (context != NULL) { SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string), context -> h)) { - if ((string[0] == ':') && (strcmp (&string[1], param1) == 0)) return; + if ((string[0] == ':') && (lstrcmpi (&string[1], param1) == 0)) return; } WCMD_output ("Target to GOTO not found\n"); }

1 0

Anatoly Lyutin : cmd: Remove incorrect return in WCMD_if().
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 707a56b20c52efa5d8e5bf69b721b7c50dac32b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707a56b20c52efa5d8e5bf69b… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Jan 17 11:45:21 2007 +0300 cmd: Remove incorrect return in WCMD_if(). --- programs/cmd/builtins.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 08972e5..59e4c5d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -464,7 +464,6 @@ char condition[MAX_PATH], *command, *s; } if (!lstrcmpi (condition, "errorlevel")) { if (errorlevel >= atoi(WCMD_parameter (p, 1+negate, NULL))) test = 1; - return; WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpi (condition, "exist")) {

1 0

Anatoly Lyutin : kernel32: Add comment for GetConsoleWindow.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 8ffdf9b45a811e22ecf6ad24f90444a354b036db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ffdf9b45a811e22ecf6ad24f… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Jan 18 10:53:39 2007 +0300 kernel32: Add comment for GetConsoleWindow. --- dlls/kernel32/console.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0590cd4..98baebd 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -120,7 +120,11 @@ static void char_info_AtoW( CHAR_INFO *b /****************************************************************************** - * GetConsoleWindow [KERNEL32.@] + * GetConsoleWindow [KERNEL32.@] Get hwnd of the console window. + * + * RETURNS + * Success: hwnd of the console window. + * Failure: NULL */ HWND WINAPI GetConsoleWindow(VOID) {

1 0

Eric Pouech : msvcrt: Fix the internal flag computation for _open_osfhandle .
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 8333cf88d8eea42b0c1fe2f8f18656fe4b631141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8333cf88d8eea42b0c1fe2f8f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jan 21 16:33:37 2007 +0100 msvcrt: Fix the internal flag computation for _open_osfhandle. --- dlls/msvcrt/file.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9ce2039..0cd098b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1567,11 +1567,9 @@ int CDECL _open_osfhandle(long handle, i * file, so set the write flag. It also only sets MSVCRT__O_TEXT if it wants * text - it never sets MSVCRT__O_BINARY. */ - /* FIXME: handle more flags */ - if (!(oflags & (MSVCRT__O_BINARY | MSVCRT__O_TEXT)) && (*__p__fmode() & MSVCRT__O_BINARY)) + /* don't let split_oflags() decide the mode if no mode is passed */ + if (!(oflags & (MSVCRT__O_BINARY | MSVCRT__O_TEXT))) oflags |= MSVCRT__O_BINARY; - else - oflags |= MSVCRT__O_TEXT; fd = msvcrt_alloc_fd((HANDLE)handle, split_oflags(oflags)); TRACE(":handle (%ld) fd (%d) flags 0x%08x\n", handle, fd, oflags);

1 0

Thomas Weidenmueller : shell32: Implement the property sheet extension array functions.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: fb5c516dfdff07395c5d90289fe747e4e208d749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5c516dfdff07395c5d90289… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri Jan 19 14:15:45 2007 +0100 shell32: Implement the property sheet extension array functions. Implement the SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray, SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray functions that are used to extend/replace property sheets by shell extensions. --- dlls/shell32/shellord.c | 198 +++++++++++++++++++++++++++++++++++++++++++++-- include/shlguid.h | 2 +- include/shobjidl.idl | 39 ++++++++-- 3 files changed, 224 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb5c516dfdff07395c5d9…

1 0

Alexandre Julliard : oleaut32/tests: Add tmarshal test.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: aa9dcb42019e0ebc0913d1a56b150684212099ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9dcb42019e0ebc0913d1a56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 23:18:45 2007 +0100 oleaut32/tests: Add tmarshal test. --- .gitignore | 4 + dlls/oleaut32/tests/Makefile.in | 9 +- dlls/oleaut32/tests/tmarshal.c | 1117 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 159 +++++ dlls/oleaut32/tests/tmarshal.rc | 30 + dlls/oleaut32/tests/tmarshal_dispids.h | 34 + 6 files changed, 1352 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa9dcb42019e0ebc0913d…

1 0