April 2010 - Wine-Commits - list.winehq.org

Maarten Lankhorst : wineoss.drv: Clean up DriverProc.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: d54dcdfedb9ca86bee9ead6c5265329aae8dcdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54dcdfedb9ca86bee9ead6c5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:45:28 2010 +0200 wineoss.drv: Clean up DriverProc. --- dlls/wineoss.drv/oss.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2632cd4..1d80272 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -61,24 +61,6 @@ static LRESULT OSS_drvFree(void) return 1; } -/************************************************************************** - * OSS_drvOpen [internal] - */ -static LRESULT OSS_drvOpen(LPSTR str) -{ - TRACE("(%s)\n", str); - return 1; -} - -/************************************************************************** - * OSS_drvClose [internal] - */ -static LRESULT OSS_drvClose(DWORD_PTR dwDevID) -{ - TRACE("(%08lx)\n", dwDevID); - return 1; -} - #endif @@ -95,16 +77,18 @@ LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, #ifdef HAVE_OSS case DRV_LOAD: return OSS_drvLoad(); case DRV_FREE: return OSS_drvFree(); - case DRV_OPEN: return OSS_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return OSS_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; + case DRV_OPEN: + case DRV_CLOSE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; case DRV_CONFIGURE: MessageBoxA(0, "OSS MultiMedia Driver !", "OSS Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; + case DRV_INSTALL: + case DRV_REMOVE: + return DRV_SUCCESS; #endif default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + return 0; } }

1 0

Maarten Lankhorst : mmdevapi: Fix small capture bugs.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: a363c41e0404a0f0e08da8cd952ba6e9694df6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a363c41e0404a0f0e08da8cd9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 13:21:17 2010 +0200 mmdevapi: Fix small capture bugs. --- dlls/mmdevapi/audio.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 4a7a4c6..2781125 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -633,7 +633,7 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) if (ofs + avail <= This->bufsize) palcCaptureSamples(This->capdev, buf1, avail); else { - DWORD part1 = This->bufsize - This->ofs; + DWORD part1 = This->bufsize - ofs; palcCaptureSamples(This->capdev, buf1, part1); palcCaptureSamples(This->capdev, This->buffer, avail - part1); } @@ -648,7 +648,7 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) if (rest) This->ofs += psize - rest; This->ofs %= This->bufsize; - This->pad = This->bufsize - rest; + This->pad = This->bufsize; } } if (This->pad >= psize) @@ -1224,6 +1224,7 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN hr = AUDCLNT_S_BUFFER_EMPTY; out: LeaveCriticalSection(This->parent->crst); + TRACE("Returning %08x %i\n", hr, *frames); return hr; } @@ -1232,15 +1233,15 @@ static HRESULT WINAPI ACC_ReleaseBuffer(IAudioCaptureClient *iface, UINT32 writt ACCapture *This = (ACCapture*)iface; HRESULT hr = S_OK; EnterCriticalSection(This->parent->crst); - if (!written || written == This->parent->locked) + if (!written || written == This->parent->locked) { This->parent->locked = 0; - else if (!This->parent->locked) + This->parent->ofs += written; + This->parent->ofs %= This->parent->bufsize; + This->parent->pad -= written; + } else if (!This->parent->locked) hr = AUDCLNT_E_OUT_OF_ORDER; else hr = AUDCLNT_E_INVALID_SIZE; - This->parent->ofs += written; - This->parent->ofs %= This->parent->bufsize; - This->parent->pad -= written; LeaveCriticalSection(This->parent->crst); return hr; }

1 0

Gerald Pfeifer : taskmgr: Remove variable pnmhdr which is not really used from ProcessPageOnNotify.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 68028662568633dee1c078182f10211d85c419a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68028662568633dee1c078182… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 21 13:51:27 2010 +0200 taskmgr: Remove variable pnmhdr which is not really used from ProcessPageOnNotify. --- programs/taskmgr/procpage.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index c21ba10..4575605 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -154,7 +154,6 @@ static void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) LPNMHDR pnmh; LPNMLISTVIEW pnmv; NMLVDISPINFOW* pnmdi; - LPNMHEADERW pnmhdr; LVITEM lvitem; ULONG Index; ULONG ColumnIndex; @@ -168,7 +167,6 @@ static void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) pnmh = (LPNMHDR) lParam; pnmv = (LPNMLISTVIEW) lParam; pnmdi = (NMLVDISPINFOW*) lParam; - pnmhdr = (LPNMHEADERW) lParam; if (pnmh->hwndFrom == hProcessPageListCtrl) {

1 0

Gerald Pfeifer : wininet: Remove variable len which is not really used from CommitUrlCacheEntryInternal .
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: dec98a5997338b342ac4c4ea027104a0490ea864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec98a5997338b342ac4c4ea0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 21 13:46:00 2010 +0200 wininet: Remove variable len which is not really used from CommitUrlCacheEntryInternal. --- dlls/wininet/urlcache.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 6a39c69..c617a93 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2435,7 +2435,6 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwFileSizeLow = 0; DWORD dwFileSizeHigh = 0; BYTE cDirectory = 0; - int len; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; @@ -2556,7 +2555,6 @@ static BOOL CommitUrlCacheEntryInternal( dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1); if (lpszLocalFileName) { - len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); dwOffsetLocalFileName = dwBytesNeeded; dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(pchLocalFileName) + 1); }

1 0

Gerald Pfeifer : wined3d: Remove variable dlc_tmp which is not really used from shader_arb_generate_pshader .
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 07c8120b57d17ecfc837b37197b58cf13e4f5b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c8120b57d17ecfc837b3719… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 21 13:49:20 2010 +0200 wined3d: Remove variable dlc_tmp which is not really used from shader_arb_generate_pshader. --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6d1d2d9..e312869 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3309,7 +3309,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct char fragcolor[16]; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This), next_local, cur; struct shader_arb_ctx_priv priv_ctx; - BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; + BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; struct arb_pshader_private *shader_priv = This->baseShader.backend_data; GLint errPos; @@ -3331,7 +3331,6 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct } switch(found) { - case 4: dcl_tmp = FALSE; break; case 0: sprintf(srgbtmp[0], "TA"); sprintf(srgbtmp[1], "TB"); @@ -3351,6 +3350,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct case 3: sprintf(srgbtmp[3], "TA"); break; + case 4: + break; } /* Create the hw ARB shader */

1 0

Alexandre Julliard : comctl32: Fix handling of bitmap header size for V4/ V5 bitmaps.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 5d6e052926c12518b587851540591a5ae5435efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6e052926c12518b58785154… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 14:56:37 2010 +0200 comctl32: Fix handling of bitmap header size for V4/V5 bitmaps. --- dlls/comctl32/commctrl.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1283bad..eb0f6b5 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -922,8 +922,7 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, if (hbm) { HDC hdcDst = CreateCompatibleDC (hdcScreen); HBITMAP hbmOld = SelectObject (hdcDst, hbm); - const BYTE *lpBits = (const BYTE *)(lpBitmap + 1); - lpBits += nColorTableSize * sizeof(RGBQUAD); + const BYTE *lpBits = (const BYTE *)lpBitmap + nSize; StretchDIBits (hdcDst, 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight, lpBits, (LPBITMAPINFO)lpBitmapInfo, DIB_RGB_COLORS, SRCCOPY);

1 0

Alexandre Julliard : winex11: Fix handling of bitmap header size for V4/ V5 bitmaps.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 3f1c526ea261cb7847c5c74cd2fb278cd5dd1fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1c526ea261cb7847c5c74cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 14:56:32 2010 +0200 winex11: Fix handling of bitmap header size for V4/V5 bitmaps. --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4cdec0e..7a1aad7 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -208,7 +208,7 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; - return sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) + colors * + return info->bmiHeader.biSize + masks * sizeof(DWORD) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } }

1 0

Jacek Caban : mshtml: Limit message length to 2000 in IHTMLWindow2::alert.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 1997a3a20a6e1fb1f9a026af5b7236de8b4e8777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1997a3a20a6e1fb1f9a026af5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 14:01:22 2010 +0200 mshtml: Limit message length to 2000 in IHTMLWindow2::alert. --- dlls/mshtml/htmlwindow.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5dbea55..1701b53 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -511,20 +511,34 @@ static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, LONG timerID return clear_task_timer(&This->doc->basedoc, FALSE, timerID); } +#define MAX_MESSAGE_LEN 2000 + static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - WCHAR wszTitle[100]; + WCHAR title[100], *msg = message; + DWORD len; TRACE("(%p)->(%s)\n", This, debugstr_w(message)); - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, - sizeof(wszTitle)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, + sizeof(title)/sizeof(WCHAR))) { WARN("Could not load message box title: %d\n", GetLastError()); return S_OK; } - MessageBoxW(This->doc_obj->hwnd, message, wszTitle, MB_ICONWARNING); + len = SysStringLen(message); + if(len > MAX_MESSAGE_LEN) { + msg = heap_alloc((MAX_MESSAGE_LEN+1)*sizeof(WCHAR)); + if(!msg) + return E_OUTOFMEMORY; + memcpy(msg, message, MAX_MESSAGE_LEN*sizeof(WCHAR)); + msg[MAX_MESSAGE_LEN] = 0; + } + + MessageBoxW(This->doc_obj->hwnd, msg, title, MB_ICONWARNING); + if(msg != message) + heap_free(msg); return S_OK; }

1 0

Alexandre Julliard : tools: Remove the deprecated wineprefixcreate script.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 6359de3ddc683719930971b3386c90bb5ac6fa95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6359de3ddc683719930971b33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 12:17:00 2010 +0200 tools: Remove the deprecated wineprefixcreate script. --- .gitignore | 2 - tools/Makefile.in | 16 +---- tools/wineprefixcreate.in | 141 ----------------------------------------- tools/wineprefixcreate.man.in | 82 ------------------------ 4 files changed, 4 insertions(+), 237 deletions(-) diff --git a/.gitignore b/.gitignore index 793bf5a..007c8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -280,8 +280,6 @@ tools/winegcc/winegcc tools/winegcc/winegcc.man tools/winemaker.de.man tools/winemaker.man -tools/wineprefixcreate -tools/wineprefixcreate.man tools/wmc/mcy.tab.c tools/wmc/mcy.tab.h tools/wmc/wmc diff --git a/tools/Makefile.in b/tools/Makefile.in index 526ac1b..39209f9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,13 +15,11 @@ PROGRAMS = \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wine.inf \ - wineapploader \ - wineprefixcreate + wineapploader MANPAGES = \ winemaker.man \ - winemaker.de.man \ - wineprefixcreate.man + winemaker.de.man C_SRCS = \ fnt2bdf.c \ @@ -70,15 +68,9 @@ wine.inf: wine.inf.in wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) -wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) - sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) - chmod +x wineprefixcreate - -install install-lib:: wine.inf wineprefixcreate $(INSTALLDIRS) - $(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate +install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop - $(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -87,7 +79,7 @@ install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop + $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) depend: makedep$(EXEEXT) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in deleted file mode 100644 index 5612dfd..0000000 --- a/tools/wineprefixcreate.in +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# -# Script to create the initial WINEPREFIX directory -# -# Copyright 1999 Ove Kåven -# Copyright 2004 Chris Morgan -# Copyright 2004 Alexandre Julliard -# -# 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 -# - -usage() -{ - echo "Usage: $0 [options]" - echo "" - echo "Options:" - echo " -h, --help Display this message" - echo " --prefix <dir> Directory to create (default: \$WINEPREFIX or ~/.wine)" - echo " -q, --quiet Don't print status messages" - echo " -w, --wait Wait for the wineserver to exit before returning" - echo "" -} - -set -e - -bindir="" -case "$0" in - */*) - # $0 contains a path, use it - bindir=`dirname "$0"` - ;; - *) - # no directory in $0, search in PATH - saved_ifs=$IFS - IFS=: - for d in $PATH - do - IFS=$saved_ifs - if [ -x "$d/$0" ] - then - bindir="$d" - break - fi - done - ;; -esac - -bindir=`cd "$bindir" && pwd` -dlldir="$bindir/@bintodlldir@" - -do_wait=0 -quiet=0 - -if [ ! -f "$dlldir/ntdll.dll.so" -a \ - -x "$bindir/../server/wineserver" -a \ - -f "$bindir/../dlls/ntdll/ntdll.dll.so" ] -then - # running from the wine source tree - topdir=`cd "$bindir/.." && pwd` - WINELOADER="$topdir/wine" - WINESERVER="$topdir/server/wineserver" - if [ -n "$LD_LIBRARY_PATH" ] - then - LD_LIBRARY_PATH="$topdir/libs/wine:$LD_LIBRARY_PATH" - else - LD_LIBRARY_PATH="$topdir/libs/wine" - fi - export LD_LIBRARY_PATH -fi - -while [ $# -gt 0 ] -do - case "$1" in - -h|--help) - usage - exit 0 - ;; - --prefix) - WINEPREFIX="$2" - shift 2 - ;; - -q|--quiet) - quiet=1 - shift - ;; - -w|--wait) - do_wait=1 - shift - ;; - --use-wine-tree) - # ignored, autodetected now - shift 2 - ;; - *) - echo "Unknown option $1" - usage - exit 1 - ;; - esac -done - -echo "Note: wineprefixcreate is deprecated and shouldn't be needed anymore." 1>&2 -echo " WINEPREFIX creation and updates now happen automatically when needed." 1>&2 -echo 1>&2 - -WINEPREFIX="${WINEPREFIX:-$HOME/.wine}" - -if [ -d "$WINEPREFIX" ] || mkdir "$WINEPREFIX"; then : -else - echo "Could not create $WINEPREFIX, aborting" - exit 1 -fi - -WINEPREFIX=`cd "$WINEPREFIX" && pwd` -export WINEPREFIX - -if [ -d "$WINEPREFIX/dosdevices" ] -then - "${WINELOADER:-$bindir/wine}" wineboot.exe --update -else - "${WINELOADER:-$bindir/wine}" wineboot.exe -fi - -# Wait for the wineserver to finish - -if [ $do_wait = 1 ] -then - "${WINESERVER:-$bindir/wineserver}" -w -fi diff --git a/tools/wineprefixcreate.man.in b/tools/wineprefixcreate.man.in deleted file mode 100644 index bc98696..0000000 --- a/tools/wineprefixcreate.man.in +++ /dev/null @@ -1,82 +0,0 @@ -.\" -*- nroff -*- -.TH WINEPREFIXCREATE 1 "August 2006" "@PACKAGE_STRING@" "Windows on Unix" -.SH NAME -wineprefixcreate \- create or update the Wine configuration -.SH SYNOPSIS -.BI wineprefixcreate\ [options] -.SH DESCRIPTION -.B wineprefixcreate -creates or updates a Wine configuration directory. When running Wine, -the base name of the configuration directory is specified in the -WINEPREFIX variable, hence the name of this tool. -.PP -.B wineprefixcreate -is launched automatically by -.BR wine (1) -if you don't have an existing configuration. However, it can sometimes -be useful to run it explicitly to create a different directory, or -update an existing one. -.SH OPTIONS -.TP -.BI \--prefix\ directory -Create the specified directory (or update it if it exists already). If -this option is not specified, -.B wineprefixcreate -defaults to the -.I WINEPREFIX -environment variable, or to -.I $HOME/.wine -if not set. -.TP -.BR \-h ", " \--help -Display a usage message. -.TP -.BR \-q ", " \--quiet -Don't display any status messages. -.TP -.BR \-w ", " \--wait -Wait for -.B wineserver -to save everything before returning. This is necessary for instance if -you are planning to rename the directory once created; otherwise a -running server could still try to access the directory under its old -name. -.SH ENVIRONMENT VARIABLES -.TP -.I WINEPREFIX -If set, the content of this variable is taken as the name of the directory where -.B wineprefixcreate -stores its data (the default is \fI$HOME/.wine\fR). All -.B wine -processes using the same prefix share certain things like registry, -shared memory and kernel objects. By setting -.I WINEPREFIX -to different values for different Wine processes, it is possible to -run a number of truly independent Wine sessions. -.SH FILES -.TP -.B ~/.wine -Default location for the -.B wine -configuration data. -.SH AUTHORS -Many people have contributed to the development of Wine. Please check -the file Changelog in the Wine distribution for the complete details. -.SH BUGS -If you find a bug, please submit a bug report at -.UR http://bugs.winehq.org -.BR http://bugs.winehq.org . -.UE -.SH AVAILABILITY -.B wineprefixcreate -is part of the Wine distribution, which is available through WineHQ, -the Wine development headquarters, at -.UR http://www.winehq.org/ -.BR http://www.winehq.org/ . -.UE -.br -It is distributed under the terms of the GNU Lesser General Public -License. -.SH "SEE ALSO" -.BR wine (1), -.BR wineserver (1).

1 0

Alexandre Julliard : wrc: Make the bitmap size checking more generic, and add support for V5 bitmaps.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 1ffab3ab4e111e7805623cf9a3a339a651a0583c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ffab3ab4e111e7805623cf9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 14:07:50 2010 +0200 wrc: Make the bitmap size checking more generic, and add support for V5 bitmaps. --- tools/wrc/newstruc.c | 181 ++++++++++++++++++++----------------------------- 1 files changed, 74 insertions(+), 107 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 6ed49dc..603eb0c 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -206,41 +206,42 @@ fontdir_t *new_fontdir(raw_data_t *rd, int *memopt) /* * Convert bitmaps to proper endian */ -static void convert_bitmap_swap_v3(BITMAPINFOHEADER *bih) +static void convert_bitmap_swap(BITMAPV5HEADER *bh, DWORD size) { - bih->biSize = BYTESWAP_DWORD(bih->biSize); - bih->biWidth = BYTESWAP_DWORD(bih->biWidth); - bih->biHeight = BYTESWAP_DWORD(bih->biHeight); - bih->biPlanes = BYTESWAP_WORD(bih->biPlanes); - bih->biBitCount = BYTESWAP_WORD(bih->biBitCount); - bih->biCompression = BYTESWAP_DWORD(bih->biCompression); - bih->biSizeImage = BYTESWAP_DWORD(bih->biSizeImage); - bih->biXPelsPerMeter = BYTESWAP_DWORD(bih->biXPelsPerMeter); - bih->biYPelsPerMeter = BYTESWAP_DWORD(bih->biYPelsPerMeter); - bih->biClrUsed = BYTESWAP_DWORD(bih->biClrUsed); - bih->biClrImportant = BYTESWAP_DWORD(bih->biClrImportant); -} - -static void convert_bitmap_swap_v4(BITMAPV4HEADER *b4h) -{ - convert_bitmap_swap_v3((BITMAPINFOHEADER *)b4h); - b4h->bV4RedMask = BYTESWAP_DWORD(b4h->bV4RedMask); - b4h->bV4GreenMask = BYTESWAP_DWORD(b4h->bV4GreenMask); - b4h->bV4BlueMask = BYTESWAP_DWORD(b4h->bV4BlueMask); - b4h->bV4AlphaMask = BYTESWAP_DWORD(b4h->bV4AlphaMask); - b4h->bV4CSType = BYTESWAP_DWORD(b4h->bV4CSType); - b4h->bV4Endpoints.ciexyzRed.ciexyzX = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzRed.ciexyzX); - b4h->bV4Endpoints.ciexyzRed.ciexyzY = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzRed.ciexyzY); - b4h->bV4Endpoints.ciexyzRed.ciexyzZ = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzRed.ciexyzZ); - b4h->bV4Endpoints.ciexyzGreen.ciexyzX = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzGreen.ciexyzX); - b4h->bV4Endpoints.ciexyzGreen.ciexyzY = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzGreen.ciexyzY); - b4h->bV4Endpoints.ciexyzGreen.ciexyzZ = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzGreen.ciexyzZ); - b4h->bV4Endpoints.ciexyzBlue.ciexyzX = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzBlue.ciexyzX); - b4h->bV4Endpoints.ciexyzBlue.ciexyzY = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzBlue.ciexyzY); - b4h->bV4Endpoints.ciexyzBlue.ciexyzZ = BYTESWAP_DWORD(b4h->bV4Endpoints.ciexyzBlue.ciexyzZ); - b4h->bV4GammaRed = BYTESWAP_DWORD(b4h->bV4GammaRed); - b4h->bV4GammaGreen = BYTESWAP_DWORD(b4h->bV4GammaGreen); - b4h->bV4GammaBlue = BYTESWAP_DWORD(b4h->bV4GammaBlue); + bh->bV5Size = BYTESWAP_DWORD(bh->bV5Size); + bh->bV5Width = BYTESWAP_DWORD(bh->bV5Width); + bh->bV5Height = BYTESWAP_DWORD(bh->bV5Height); + bh->bV5Planes = BYTESWAP_WORD(bh->bV5Planes); + bh->bV5BitCount = BYTESWAP_WORD(bh->bV5BitCount); + bh->bV5Compression = BYTESWAP_DWORD(bh->bV5Compression); + bh->bV5SizeImage = BYTESWAP_DWORD(bh->bV5SizeImage); + bh->bV5XPelsPerMeter = BYTESWAP_DWORD(bh->bV5XPelsPerMeter); + bh->bV5YPelsPerMeter = BYTESWAP_DWORD(bh->bV5YPelsPerMeter); + bh->bV5ClrUsed = BYTESWAP_DWORD(bh->bV5ClrUsed); + bh->bV5ClrImportant = BYTESWAP_DWORD(bh->bV5ClrImportant); + if (size == sizeof(BITMAPINFOHEADER)) return; + bh->bV5RedMask = BYTESWAP_DWORD(bh->bV5RedMask); + bh->bV5GreenMask = BYTESWAP_DWORD(bh->bV5GreenMask); + bh->bV5BlueMask = BYTESWAP_DWORD(bh->bV5BlueMask); + bh->bV5AlphaMask = BYTESWAP_DWORD(bh->bV5AlphaMask); + bh->bV5CSType = BYTESWAP_DWORD(bh->bV5CSType); + bh->bV5Endpoints.ciexyzRed.ciexyzX = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzRed.ciexyzX); + bh->bV5Endpoints.ciexyzRed.ciexyzY = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzRed.ciexyzY); + bh->bV5Endpoints.ciexyzRed.ciexyzZ = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzRed.ciexyzZ); + bh->bV5Endpoints.ciexyzGreen.ciexyzX = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzGreen.ciexyzX); + bh->bV5Endpoints.ciexyzGreen.ciexyzY = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzGreen.ciexyzY); + bh->bV5Endpoints.ciexyzGreen.ciexyzZ = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzGreen.ciexyzZ); + bh->bV5Endpoints.ciexyzBlue.ciexyzX = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzBlue.ciexyzX); + bh->bV5Endpoints.ciexyzBlue.ciexyzY = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzBlue.ciexyzY); + bh->bV5Endpoints.ciexyzBlue.ciexyzZ = BYTESWAP_DWORD(bh->bV5Endpoints.ciexyzBlue.ciexyzZ); + bh->bV5GammaRed = BYTESWAP_DWORD(bh->bV5GammaRed); + bh->bV5GammaGreen = BYTESWAP_DWORD(bh->bV5GammaGreen); + bh->bV5GammaBlue = BYTESWAP_DWORD(bh->bV5GammaBlue); + if (size == sizeof(BITMAPV4HEADER)) return; + bh->bV5Intent = BYTESWAP_DWORD(bh->bV5Intent); + bh->bV5ProfileData = BYTESWAP_DWORD(bh->bV5ProfileData); + bh->bV5ProfileSize = BYTESWAP_DWORD(bh->bV5ProfileSize); + bh->bV5Reserved = BYTESWAP_DWORD(bh->bV5Reserved); } static void convert_bitmap_swap_os2(BITMAPOS2HEADER *boh) @@ -254,31 +255,13 @@ static void convert_bitmap_swap_os2(BITMAPOS2HEADER *boh) #define FL_SIGBE 0x01 #define FL_SIZEBE 0x02 -#define FL_V4 0x04 -#define FL_OS2 0x08 static int convert_bitmap(char *data, int size) { - BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)data; - BITMAPV4HEADER *b4h = (BITMAPV4HEADER *)data; + BITMAPV5HEADER *bih = (BITMAPV5HEADER *)data; BITMAPOS2HEADER *boh = (BITMAPOS2HEADER *)data; + DWORD bmsize; int type = 0; int returnSize = 0; /* size to be returned */ -#ifdef WORDS_BIGENDIAN - DWORD bisizel = BYTESWAP_DWORD(sizeof(BITMAPINFOHEADER)); - DWORD b4sizel = BYTESWAP_DWORD(sizeof(BITMAPV4HEADER)); - DWORD bosizel = BYTESWAP_DWORD(sizeof(BITMAPOS2HEADER)); - DWORD bisizeb = sizeof(BITMAPINFOHEADER); - DWORD b4sizeb = sizeof(BITMAPV4HEADER); - DWORD bosizeb = sizeof(BITMAPOS2HEADER); -#else - DWORD bisizel = sizeof(BITMAPINFOHEADER); - DWORD b4sizel = sizeof(BITMAPV4HEADER); - DWORD bosizel = sizeof(BITMAPOS2HEADER); - DWORD bisizeb = BYTESWAP_DWORD(sizeof(BITMAPINFOHEADER)); - DWORD b4sizeb = BYTESWAP_DWORD(sizeof(BITMAPV4HEADER)); - DWORD bosizeb = BYTESWAP_DWORD(sizeof(BITMAPOS2HEADER)); -#endif - /* * Originally the bih and b4h pointers were simply incremented here, @@ -299,47 +282,40 @@ static int convert_bitmap(char *data, int size) } - if(bih->biSize == bisizel) - { - /* Little endian */ - } - else if(bih->biSize == bisizeb) - { - type |= FL_SIZEBE; - } - else if(bih->biSize == b4sizel) - { - type |= FL_V4; - } - else if(bih->biSize == b4sizeb) - { - type |= FL_SIZEBE | FL_V4; - } - else if(!bih->biSize || bih->biSize == bosizel) - { - type |= FL_OS2; - } - else if(bih->biSize == bosizeb) - { - type |= FL_SIZEBE | FL_OS2; - } - else - parser_error("Invalid bitmap format, bih->biSize = %d", bih->biSize); + bmsize = bih->bV5Size; + if (bmsize >> 16) /* assume swapped */ + { +#ifndef WORDS_BIGENDIAN + type |= FL_SIZEBE; +#endif + bmsize = BYTESWAP_DWORD( bmsize ); + } + else + { +#ifdef WORDS_BIGENDIAN + type |= FL_SIZEBE; +#endif + } + + switch (bmsize) + { + case sizeof(BITMAPOS2HEADER): + case sizeof(BITMAPINFOHEADER): + case sizeof(BITMAPV4HEADER): + case sizeof(BITMAPV5HEADER): + break; + default: + parser_error("Invalid bitmap format, bih->biSize = %d", bih->bV5Size); + } switch(type) { - default: - break; case FL_SIZEBE: - case FL_SIZEBE | FL_V4: - case FL_SIZEBE | FL_OS2: - parser_warning("Bitmap v%c signature little-endian, but size big-endian\n", type & FL_V4 ? '4' : '3'); - break; + parser_warning("Bitmap signature little-endian, but size big-endian\n"); + break; case FL_SIGBE: - case FL_SIGBE | FL_V4: - case FL_SIGBE | FL_OS2: - parser_warning("Bitmap v%c signature big-endian, but size little-endian\n", type & FL_V4 ? '4' : '3'); - break; + parser_warning("Bitmap signature big-endian, but size little-endian\n"); + break; } switch(byteorder) @@ -350,14 +326,10 @@ static int convert_bitmap(char *data, int size) case WRC_BO_BIG: if(!(type & FL_SIZEBE)) { - if(type & FL_V4) - convert_bitmap_swap_v4(b4h); - else if(type & FL_OS2) - { - convert_bitmap_swap_os2(boh); - } - else - convert_bitmap_swap_v3(bih); + if (bmsize == sizeof(BITMAPOS2HEADER)) + convert_bitmap_swap_os2(boh); + else + convert_bitmap_swap(bih, bmsize); } break; #ifndef WORDS_BIGENDIAN @@ -366,14 +338,10 @@ static int convert_bitmap(char *data, int size) case WRC_BO_LITTLE: if(type & FL_SIZEBE) { - if(type & FL_V4) - convert_bitmap_swap_v4(b4h); - else if(type & FL_OS2) - { - convert_bitmap_swap_os2(boh); - } - else - convert_bitmap_swap_v3(bih); + if (bmsize == sizeof(BITMAPOS2HEADER)) + convert_bitmap_swap_os2(boh); + else + convert_bitmap_swap(bih, bmsize); } break; } @@ -388,7 +356,6 @@ static int convert_bitmap(char *data, int size) } #undef FL_SIGBE #undef FL_SIZEBE -#undef FL_V4 /* * Cursor and icon splitter functions used when allocating

1 0