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

Alexandre Julliard : configure: Default to / lib64 as libdir for 64-bit builds, and use plain /lib for 32-bit builds.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: b32653235a03d1edca3d5698a1dcbd6ea56e2fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32653235a03d1edca3d5698a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 12:28:22 2010 +0200 configure: Default to /lib64 as libdir for 64-bit builds, and use plain /lib for 32-bit builds. --- configure | 4 +++- configure.ac | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 93b12c8..783b776 100755 --- a/configure +++ b/configure @@ -4123,7 +4123,9 @@ then enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} - test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" +elif test "x$enable_win64" = "xyes" +then + test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 diff --git a/configure.ac b/configure.ac index 4aa7cfd..83b3240 100644 --- a/configure.ac +++ b/configure.ac @@ -192,7 +192,9 @@ then enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} - test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" +elif test "x$enable_win64" = "xyes" +then + test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,

1 0

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

21 Apr '10

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

Alexandre Julliard : gdi32: Fix handling of bitmap header size for V4/ V5 bitmaps.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 50500d1a0b35a9b4dfcff8f70e93dcfe5f50fe31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50500d1a0b35a9b4dfcff8f70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 14:56:22 2010 +0200 gdi32: Fix handling of bitmap header size for V4/V5 bitmaps. --- dlls/gdi32/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eebc321..1b34a34 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -139,7 +139,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

Alexandre Julliard : user32: Fix handling of bitmap header size for V4/ V5 bitmaps.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 3a263a871c3fadfdcbf5ec113e31033a1f12fe54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a263a871c3fadfdcbf5ec113… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 14:56:26 2010 +0200 user32: Fix handling of bitmap header size for V4/V5 bitmaps. --- dlls/user32/cursoricon.c | 33 +++++++-------------------------- 1 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0fc55ad..7035c1b 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -320,7 +320,7 @@ static 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)); } } @@ -380,19 +380,10 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) * * Get the info from a bitmap header. * Return 1 for INFOHEADER, 0 for COREHEADER, - * 4 for V4HEADER, 5 for V5HEADER, -1 for error. */ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *bpp, DWORD *compr ) { - if (header->biSize == sizeof(BITMAPINFOHEADER)) - { - *width = header->biWidth; - *height = header->biHeight; - *bpp = header->biBitCount; - *compr = header->biCompression; - return 1; - } if (header->biSize == sizeof(BITMAPCOREHEADER)) { const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; @@ -402,23 +393,13 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = 0; return 0; } - if (header->biSize == sizeof(BITMAPV4HEADER)) + else if (header->biSize >= sizeof(BITMAPINFOHEADER)) { - const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header; - *width = v4hdr->bV4Width; - *height = v4hdr->bV4Height; - *bpp = v4hdr->bV4BitCount; - *compr = v4hdr->bV4V4Compression; - return 4; - } - if (header->biSize == sizeof(BITMAPV5HEADER)) - { - const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header; - *width = v5hdr->bV5Width; - *height = v5hdr->bV5Height; - *bpp = v5hdr->bV5BitCount; - *compr = v5hdr->bV5Compression; - return 5; + *width = header->biWidth; + *height = header->biHeight; + *bpp = header->biBitCount; + *compr = header->biCompression; + return 1; } ERR("(%d): unknown/wrong size for header\n", header->biSize ); return -1;

1 0

Alistair Leslie-Hughes : include: Add asptlb.idl.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: e560e2ead5f6e0607614cfdae998c4f9508a99ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e560e2ead5f6e0607614cfdae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 21 13:04:41 2010 +1000 include: Add asptlb.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/asptlb.idl | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index d2ba32b..793bf5a 100644 --- a/.gitignore +++ b/.gitignore @@ -135,6 +135,7 @@ include/activdbg.h include/activscp.h include/amstream.h include/amvideo.h +include/asptlb.h include/audioclient.h include/audiopolicy.h include/austream.h diff --git a/include/Makefile.in b/include/Makefile.in index 2408e27..3f9b43b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ PUBLIC_IDL_H_SRCS = \ activscp.idl \ amstream.idl \ amvideo.idl \ + asptlb.idl \ audioclient.idl \ audiopolicy.idl \ austream.idl \ diff --git a/include/asptlb.idl b/include/asptlb.idl new file mode 100644 index 0000000..608d220 --- /dev/null +++ b/include/asptlb.idl @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2010 Alistair Leslie-Hughes + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +[ + object, + dual, + uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) +] +interface IRequestDictionary : IDispatch +{ + [propget] + HRESULT Item(IRequestDictionary *iface, [in, optional] VARIANT Var, + [retval, out] VARIANT *pVariantReturn); + + [restricted, propget] + HRESULT _NewEnum(IRequestDictionary *iface, [retval, out] IUnknown **ppEnumReturn); + + [propget] + HRESULT Count(IRequestDictionary *iface, [retval, out] int *cStrRet); + + [propget] + HRESULT Key(IRequestDictionary *iface, [in] VARIANT VarKey, [retval, out]VARIANT *pvar); +}; + +[ + object, + dual, + uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) +] +interface IResponse : IDispatch +{ + [propget] + HRESULT Buffer(IResponse *iface, [retval, out] VARIANT_BOOL *fIsBuffering); + + [propput] + HRESULT Buffer(IResponse *iface, [in] VARIANT_BOOL fIsBuffering); + + [propget] + HRESULT ContentType(IResponse *iface, [retval, out] BSTR *pbstrContentTypeRet); + + [propput] + HRESULT ContentType(IResponse *iface, [in] BSTR bstrContentType); + + [propget] + HRESULT Expires(IResponse *iface, [retval, out] VARIANT *pvarExpiresMinutesRet); + + [propput] + HRESULT Expires(IResponse *iface, [in] long lExpiresMinutes); + + [propget] + HRESULT ExpiresAbsolute(IResponse *iface, [retval, out] VARIANT *pvarExpiresRet); + + [propput] + HRESULT ExpiresAbsolute(IResponse *iface, [in] DATE dtExpires); + + [propget] + HRESULT Cookies(IResponse *iface, [retval, out] IRequestDictionary **ppCookies); + + [propget] + HRESULT Status(IResponse *iface, [retval][out] BSTR *pbstrStatusRet); + + [propput] + HRESULT Status(IResponse *iface, [in] BSTR bstrStatus); + + [hidden] + HRESULT Add(IResponse *iface, [in] BSTR bstrHeaderValue, [in] BSTR bstrHeaderName); + + HRESULT AddHeader(IResponse *iface, [in] BSTR bstrHeaderName, [in] BSTR bstrHeaderValue); + + HRESULT AppendToLog(IResponse *iface, [in] BSTR bstrLogEntry); + + HRESULT BinaryWrite(IResponse *iface, [in] VARIANT varInput); + + HRESULT Clear(IResponse *iface); + + HRESULT End(IResponse *iface); + + HRESULT Flush(IResponse *iface); + + HRESULT Redirect(IResponse *iface, [in] BSTR bstrURL); + + HRESULT Write(IResponse *iface, [in] VARIANT varText); + + [hidden] + HRESULT WriteBlock(IResponse *iface, [in] short iBlockNumber); + + HRESULT IsClientConnected(IResponse *iface, [retval, out] VARIANT_BOOL *pfIsClientConnected); + + [propget] + HRESULT get_CharSet( IResponse *iface, [retval, out] BSTR *pbstrCharSetRet); + + [propput] + HRESULT put_CharSet(IResponse *iface, [in] BSTR bstrCharSet); + + HRESULT Pics(IResponse *iface, [in] BSTR bstrHeaderValue); + + [propget] + HRESULT get_CacheControl(IResponse *iface, [retval, out] BSTR *pbstrCacheControl); + + [propput] + HRESULT put_CacheControl(IResponse *iface, [in] BSTR bstrCacheControl); + + [propget] + HRESULT get_CodePage(IResponse *iface, [retval, out] long *plvar); + + [propput] + HRESULT put_CodePage(IResponse *iface, [in] long lvar); + + [propget] + HRESULT get_LCID(IResponse *iface, [retval, out] long *plvar); + + [propput] + HRESULT put_LCID(IResponse *iface, [in] long lvar); +};

1 0

Detlef Riekenberg : msiexec: Recognize /uninstall as alias for /x [resend].
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 5c02e3f8b53d4fe3b3df4ea4c54422ff62243b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02e3f8b53d4fe3b3df4ea4c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 21 10:44:10 2010 +0200 msiexec: Recognize /uninstall as alias for /x [resend]. --- programs/msiexec/msiexec.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index fe19d98..5415291 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -660,11 +660,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(msi_option_prefix(argvW[i], "x")) + else if(msi_option_prefix(argvW[i], "x") || msi_option_equal(argvW[i], "uninstall")) { FunctionInstall = TRUE; - PackageName = argvW[i]+2; - if (!PackageName[0]) + if(msi_option_prefix(argvW[i], "x")) PackageName = argvW[i]+2; + if(!PackageName || !PackageName[0]) { i++; if (i >= argc)

1 0

Michael Stefaniuc : ntdll/tests: Avoid using the 'long' types.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: ed1711ec544b9053a09cdebd420c96f82ca817fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1711ec544b9053a09cdebd4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 21 11:00:26 2010 +0200 ntdll/tests: Avoid using the 'long' types. --- dlls/ntdll/tests/file.c | 8 ++++---- dlls/ntdll/tests/rtlstr.c | 6 +++--- dlls/ntdll/tests/string.c | 32 ++++++++++++++++---------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c483045..708803f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -116,7 +116,7 @@ ULONG_PTR completionKey; IO_STATUS_BLOCK ioSb; ULONG_PTR completionValue; -static long get_pending_msgs(HANDLE h) +static ULONG get_pending_msgs(HANDLE h) { NTSTATUS res; ULONG a, req; @@ -911,13 +911,13 @@ static void nt_mailslot_test(void) static void test_iocp_setcompletion(HANDLE h) { NTSTATUS res; - long count; + ULONG count; res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, 3 ); ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %x\n", res ); count = get_pending_msgs(h); - ok( count == 1, "Unexpected msg count: %ld\n", count ); + ok( count == 1, "Unexpected msg count: %d\n", count ); if (get_msg(h)) { @@ -928,7 +928,7 @@ static void test_iocp_setcompletion(HANDLE h) } count = get_pending_msgs(h); - ok( !count, "Unexpected msg count: %ld\n", count ); + ok( !count, "Unexpected msg count: %d\n", count ); } static void test_iocp_fileio(HANDLE h) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index d9ba0c9..46d88c5 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -42,7 +42,7 @@ static VOID (WINAPI *pRtlCopyString)(STRING *, const STRING *); static BOOLEAN (WINAPI *pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static NTSTATUS (WINAPI *pRtlDowncaseUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN); -static NTSTATUS (WINAPI *pRtlDuplicateUnicodeString)(long, UNICODE_STRING *, UNICODE_STRING *); +static NTSTATUS (WINAPI *pRtlDuplicateUnicodeString)(int, UNICODE_STRING *, UNICODE_STRING *); static BOOLEAN (WINAPI *pRtlEqualUnicodeString)(const UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN); static NTSTATUS (WINAPI *pRtlFindCharInUnicodeString)(int, const UNICODE_STRING *, const UNICODE_STRING *, USHORT *); static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); @@ -53,14 +53,14 @@ static VOID (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING, LPCWSTR); static NTSTATUS (WINAPI *pRtlInitUnicodeStringEx)(PUNICODE_STRING, LPCWSTR); static NTSTATUS (WINAPI *pRtlIntegerToChar)(ULONG, ULONG, ULONG, PCHAR); static NTSTATUS (WINAPI *pRtlIntegerToUnicodeString)(ULONG, ULONG, UNICODE_STRING *); -static NTSTATUS (WINAPI *pRtlMultiAppendUnicodeStringBuffer)(UNICODE_STRING *, long, UNICODE_STRING *); +static NTSTATUS (WINAPI *pRtlMultiAppendUnicodeStringBuffer)(UNICODE_STRING *, LONG, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_STRING *, BOOLEAN); static NTSTATUS (WINAPI *pRtlUnicodeStringToInteger)(const UNICODE_STRING *, int, int *); static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static NTSTATUS (WINAPI *pRtlUpcaseUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN); static CHAR (WINAPI *pRtlUpperChar)(CHAR); static NTSTATUS (WINAPI *pRtlUpperString)(STRING *, const STRING *); -static NTSTATUS (WINAPI *pRtlValidateUnicodeString)(long, UNICODE_STRING *); +static NTSTATUS (WINAPI *pRtlValidateUnicodeString)(LONG, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlGUIDFromString)(const UNICODE_STRING*,GUID*); static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); static BOOLEAN (WINAPI *pRtlIsTextUnicode)(LPVOID, INT, INT *); diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cd3ae37..c1632f7 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -37,8 +37,8 @@ static int (WINAPIV *patoi)(const char *); static long (WINAPIV *patol)(const char *); static LONGLONG (WINAPIV *p_atoi64)(const char *); static LPSTR (WINAPIV *p_itoa)(int, LPSTR, INT); -static LPSTR (WINAPIV *p_ltoa)(long, LPSTR, INT); -static LPSTR (WINAPIV *p_ultoa)(unsigned long, LPSTR, INT); +static LPSTR (WINAPIV *p_ltoa)(LONG, LPSTR, INT); +static LPSTR (WINAPIV *p_ultoa)(ULONG, LPSTR, INT); static LPSTR (WINAPIV *p_i64toa)(LONGLONG, LPSTR, INT); static LPSTR (WINAPIV *p_ui64toa)(ULONGLONG, LPSTR, INT); @@ -46,8 +46,8 @@ static int (WINAPIV *p_wtoi)(LPWSTR); static long (WINAPIV *p_wtol)(LPWSTR); static LONGLONG (WINAPIV *p_wtoi64)(LPWSTR); static LPWSTR (WINAPIV *p_itow)(int, LPWSTR, int); -static LPWSTR (WINAPIV *p_ltow)(long, LPWSTR, INT); -static LPWSTR (WINAPIV *p_ultow)(unsigned long, LPWSTR, INT); +static LPWSTR (WINAPIV *p_ltow)(LONG, LPWSTR, INT); +static LPWSTR (WINAPIV *p_ultow)(ULONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_i64tow)(LONGLONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_ui64tow)(ULONGLONG, LPWSTR, INT); @@ -228,7 +228,7 @@ static void one_itoa_test(int test_num, const ulong2str_t *ulong2str) static void one_ltoa_test(int test_num, const ulong2str_t *ulong2str) { char dest_str[LARGE_STRI_BUFFER_LENGTH + 1]; - long value; + LONG value; LPSTR result; memset(dest_str, '-', LARGE_STRI_BUFFER_LENGTH); @@ -236,10 +236,10 @@ static void one_ltoa_test(int test_num, const ulong2str_t *ulong2str) value = ulong2str->value; result = p_ltoa(ulong2str->value, dest_str, ulong2str->base); ok(result == dest_str, - "(test %d): _ltoa(%ld, [out], %d) has result %p, expected: %p\n", + "(test %d): _ltoa(%d, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_str); ok(memcmp(dest_str, ulong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ltoa(%ld, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ltoa(%d, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, dest_str, ulong2str->Buffer); } @@ -247,7 +247,7 @@ static void one_ltoa_test(int test_num, const ulong2str_t *ulong2str) static void one_ultoa_test(int test_num, const ulong2str_t *ulong2str) { char dest_str[LARGE_STRI_BUFFER_LENGTH + 1]; - unsigned long value; + ULONG value; LPSTR result; memset(dest_str, '-', LARGE_STRI_BUFFER_LENGTH); @@ -255,10 +255,10 @@ static void one_ultoa_test(int test_num, const ulong2str_t *ulong2str) value = ulong2str->value; result = p_ultoa(ulong2str->value, dest_str, ulong2str->base); ok(result == dest_str, - "(test %d): _ultoa(%lu, [out], %d) has result %p, expected: %p\n", + "(test %d): _ultoa(%u, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_str); ok(memcmp(dest_str, ulong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ultoa(%lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ultoa(%u, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, dest_str, ulong2str->Buffer); } @@ -323,7 +323,7 @@ static void one_ltow_test(int test_num, const ulong2str_t *ulong2str) WCHAR dest_wstr[LARGE_STRI_BUFFER_LENGTH + 1]; UNICODE_STRING unicode_string; STRING ansi_str; - long value; + LONG value; LPWSTR result; for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { @@ -343,10 +343,10 @@ static void one_ltow_test(int test_num, const ulong2str_t *ulong2str) result = p_ltow(value, dest_wstr, ulong2str->base); pRtlUnicodeStringToAnsiString(&ansi_str, &unicode_string, 1); ok(result == dest_wstr, - "(test %d): _ltow(%ld, [out], %d) has result %p, expected: %p\n", + "(test %d): _ltow(%d, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_wstr); ok(memcmp(dest_wstr, expected_wstr, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): _ltow(%ld, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ltow(%d, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, ansi_str.Buffer, ulong2str->Buffer); pRtlFreeAnsiString(&ansi_str); } @@ -359,7 +359,7 @@ static void one_ultow_test(int test_num, const ulong2str_t *ulong2str) WCHAR dest_wstr[LARGE_STRI_BUFFER_LENGTH + 1]; UNICODE_STRING unicode_string; STRING ansi_str; - unsigned long value; + ULONG value; LPWSTR result; for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { @@ -379,10 +379,10 @@ static void one_ultow_test(int test_num, const ulong2str_t *ulong2str) result = p_ultow(value, dest_wstr, ulong2str->base); pRtlUnicodeStringToAnsiString(&ansi_str, &unicode_string, 1); ok(result == dest_wstr, - "(test %d): _ultow(%lu, [out], %d) has result %p, expected: %p\n", + "(test %d): _ultow(%u, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_wstr); ok(memcmp(dest_wstr, expected_wstr, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): _ultow(%lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ultow(%u, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, ansi_str.Buffer, ulong2str->Buffer); pRtlFreeAnsiString(&ansi_str); }

1 0

Hans Leidekker : msi: Add a test to show that MsiOpenPackage must apply any existing patches.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 031d2c63e872ed38314c85a0dcb40a518931d697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031d2c63e872ed38314c85a0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 11:37:29 2010 +0200 msi: Add a test to show that MsiOpenPackage must apply any existing patches. --- dlls/msi/tests/patch.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index e889cf4..41651ab 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -674,6 +674,8 @@ static void test_simple_patch( void ) UINT r; DWORD size; char path[MAX_PATH]; + const char *query; + MSIHANDLE hpackage, hdb, hview, hrec; if (!pMsiApplyPatchA) { @@ -712,6 +714,28 @@ static void test_simple_patch( void ) strcat( path, "\\" ); strcat( path, msifile ); + r = MsiOpenPackageA( path, &hpackage ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hpackage ); + ok( hdb, "failed to get database handle\n" ); + + query = "SELECT * FROM `Property` where `Property` = 'PATCHNEWPACKAGECODE'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hdb ); + MsiCloseHandle( hpackage ); + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Hans Leidekker : msi: Make msi_get_property_int and friends take a pointer to a database instead of a package .
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 186f4efa3f6fedb199984f310145a78d276a7882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186f4efa3f6fedb199984f310… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 11:37:54 2010 +0200 msi: Make msi_get_property_int and friends take a pointer to a database instead of a package. They only operate on a database and this way we can use them before a package is created. --- dlls/msi/action.c | 82 ++++++++++++++++++++++++++-------------------------- dlls/msi/cond.y | 2 +- dlls/msi/custom.c | 16 +++++----- dlls/msi/dialog.c | 28 +++++++++--------- dlls/msi/events.c | 6 ++-- dlls/msi/files.c | 8 ++-- dlls/msi/format.c | 2 +- dlls/msi/helpers.c | 12 ++++---- dlls/msi/install.c | 4 +- dlls/msi/media.c | 10 +++--- dlls/msi/msipriv.h | 7 ++-- dlls/msi/package.c | 30 +++++++++--------- dlls/msi/upgrade.c | 4 +- 13 files changed, 105 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=186f4efa3f6fedb199984…

1 0

Hans Leidekker : msi: Make MSI_SetPropertyW take a pointer to a database instead of a package.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 44b7983913ca1282622b34c92c1fc069c5977a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b7983913ca1282622b34c92… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 11:38:17 2010 +0200 msi: Make MSI_SetPropertyW take a pointer to a database instead of a package. --- dlls/msi/action.c | 35 ++++++++----- dlls/msi/appsearch.c | 7 ++- dlls/msi/custom.c | 14 +++-- dlls/msi/dialog.c | 45 +++++++++-------- dlls/msi/events.c | 4 +- dlls/msi/helpers.c | 8 ++-- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 8 ++-- dlls/msi/msipriv.h | 3 +- dlls/msi/package.c | 130 ++++++++++++++++++++++++------------------------- dlls/msi/upgrade.c | 11 +++- 11 files changed, 143 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44b7983913ca1282622b3…

1 0