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

Hans Leidekker : msi: Make the string reference count a short.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 109ffd0f97e4a17e5369d0c4a8636a6abe46baab URL: http://source.winehq.org/git/wine.git/?a=commit;h=109ffd0f97e4a17e5369d0c4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:08 2010 +0200 msi: Make the string reference count a short. This is safe because the reference count is stored in 2 bytes on disk. (This is commit ff2f894888c0cb465fe08db8e6f22d4848ca5aef reapplied because of incorrect revert in 88214a72cedb182c2324ba096fa55353c6be3374). --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5e699ae..2b7d6ba 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,7 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 3bdc436..84f4e71 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { - UINT persistent_refcount; - UINT nonpersistent_refcount; + USHORT persistent_refcount; + USHORT nonpersistent_refcount; LPWSTR str; } msistring; @@ -188,7 +188,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -237,7 +237,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -288,7 +288,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str;

1 0

Damjan Jovanovic : usb.h: Add and fix some USBD_STATUS codes.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 50aa0215a7b7e00ab8ef34f4ed5900a0a73fc901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50aa0215a7b7e00ab8ef34f4e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Apr 14 04:52:27 2010 +0200 usb.h: Add and fix some USBD_STATUS codes. --- include/ddk/usb.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index af1c10d..0cda6a4 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -84,6 +84,11 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_SUCCESS ((USBD_STATUS)0x00000000) #define USBD_STATUS_PENDING ((USBD_STATUS)0x40000000) +#define USBD_STATUS_ERROR ((USBD_STATUS)0x80000000) +#define USBD_STATUS_HALTED ((USBD_STATUS)0xC0000000) + +#define USBD_STATUS_CANCELED ((USBD_STATUS)0x00010000) +#define USBD_STATUS_CANCELING ((USBD_STATUS)0x00020000) #define USBD_STATUS_CRC ((USBD_STATUS)0xC0000001) #define USBD_STATUS_BTSTUFF ((USBD_STATUS)0xC0000002) #define USBD_STATUS_DATA_TOGGLE_MISMATCH ((USBD_STATUS)0xC0000003) @@ -103,9 +108,11 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_BABBLE_DETECTED ((USBD_STATUS)0xC0000012) #define USBD_STATUS_DATA_BUFFER_ERROR ((USBD_STATUS)0xC0000013) #define USBD_STATUS_ENDPOINT_HALTED ((USBD_STATUS)0xC0000030) +#define USBD_STATUS_NO_MEMORY ((USBD_STATUS)0x80000100) #define USBD_STATUS_INVALID_URB_FUNCTION ((USBD_STATUS)0x80000200) #define USBD_STATUS_INVALID_PARAMETER ((USBD_STATUS)0x80000300) #define USBD_STATUS_ERROR_BUSY ((USBD_STATUS)0x80000400) +#define USBD_STATUS_REQUEST_FAILED ((USBD_STATUS)0x80000500) #define USBD_STATUS_INVALID_PIPE_HANDLE ((USBD_STATUS)0x80000600) #define USBD_STATUS_NO_BANDWIDTH ((USBD_STATUS)0x80000700) #define USBD_STATUS_INTERNAL_HC_ERROR ((USBD_STATUS)0x80000800) @@ -124,7 +131,6 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000) #define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000) #define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000) -#define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000) #define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW ((USBD_STATUS)0xC0020000) #define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000) #define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000)

1 0

Aric Stewart : usp10: Improve ScriptItemize with a SCRIPT_CONTROL and SCRIPT_STATE set.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 6c3659c3d42dc8a7f26b4f73a4d1716dd75f7ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3659c3d42dc8a7f26b4f73a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 13 14:49:07 2010 -0500 usp10: Improve ScriptItemize with a SCRIPT_CONTROL and SCRIPT_STATE set. Reduce bidi duplications from gdi32 by using the newly corrected usp10 functions. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bidi.c | 675 +++++------------------------------ dlls/usp10/Makefile.in | 1 + dlls/usp10/bidi.c | 829 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 286 ++++++++++++++-- dlls/usp10/usp10.c | 60 +++- dlls/usp10/usp10_internal.h | 25 ++ 7 files changed, 1253 insertions(+), 624 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c3659c3d42dc8a7f26b4…

1 0

Aric Stewart : ups10: Reimplement ScriptLayout to properly handle mixed runs.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: b9c30445c70d828d92833333ca54afb46c884447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c30445c70d828d92833333c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 13 14:49:20 2010 -0500 ups10: Reimplement ScriptLayout to properly handle mixed runs. --- dlls/gdi32/bidi.c | 105 +++++++++--------------------------------- dlls/usp10/bidi.c | 95 ++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 59 +++++++++++++++++++----- dlls/usp10/usp10.c | 45 +++++++++++++------ dlls/usp10/usp10_internal.h | 3 + 5 files changed, 199 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9c30445c70d828d92833…

1 0

Alexandre Julliard : libwine: Store more detailed information about characters direction.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: dc0e712d1062d494ce4b1d2ffc27cb4600c1a456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0e712d1062d494ce4b1d2ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:31:30 2010 +0200 libwine: Store more detailed information about characters direction. --- libs/wine/cpmap.pl | 16 +- libs/wine/wctype.c | 600 ++++++++++++++++++++++++++-------------------------- 2 files changed, 308 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc0e712d1062d494ce4b1…

1 0

Alexandre Julliard : kernel32: Map the new detailed direction information back to the Windows constants.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: d0578c080a360f5f8d8ce7c0bb2921f35ac43fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0578c080a360f5f8d8ce7c0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:31:59 2010 +0200 kernel32: Map the new detailed direction information back to the Windows constants. --- dlls/kernel32/locale.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7a141b2..76076ea 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2261,6 +2261,26 @@ DWORD WINAPI VerLanguageNameW( DWORD wLang, LPWSTR szLang, DWORD nSize ) */ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype ) { + static const unsigned char type2_map[16] = + { + C2_NOTAPPLICABLE, /* unassigned */ + C2_LEFTTORIGHT, /* L */ + C2_RIGHTTOLEFT, /* R */ + C2_EUROPENUMBER, /* EN */ + C2_EUROPESEPARATOR, /* ES */ + C2_EUROPETERMINATOR, /* ET */ + C2_ARABICNUMBER, /* AN */ + C2_COMMONSEPARATOR, /* CS */ + C2_BLOCKSEPARATOR, /* B */ + C2_SEGMENTSEPARATOR, /* S */ + C2_WHITESPACE, /* WS */ + C2_OTHERNEUTRAL, /* ON */ + C2_RIGHTTOLEFT, /* AL */ + C2_NOTAPPLICABLE, /* NSM */ + C2_NOTAPPLICABLE, /* BN */ + C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ + }; + if (count == -1) count = strlenW(src) + 1; switch(type) { @@ -2268,7 +2288,7 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype while (count--) *chartype++ = get_char_typeW( *src++ ) & 0xfff; break; case CT_CTYPE2: - while (count--) *chartype++ = get_char_typeW( *src++ ) >> 12; + while (count--) *chartype++ = type2_map[get_char_typeW( *src++ ) >> 12]; break; case CT_CTYPE3: {

1 0

Joel Holdsworth : shell32: Replaced document. ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 4b320a461e8e3274060ccbb7642b2331310d3fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b320a461e8e3274060ccbb76… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:03 2010 +0100 shell32: Replaced document.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/document.ico | Bin 4710 -> 25214 bytes dlls/shell32/document.svg | 130 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b320a461e8e3274060cc…

1 0

Joel Holdsworth : shell32: Replaced cdrom.ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: b4057d934c2089ef0114808204c6ec740d534498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4057d934c2089ef011480820… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:06 2010 +0100 shell32: Replaced cdrom.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/cdrom.ico | Bin 25214 -> 25214 bytes dlls/shell32/cdrom.svg | 151 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4057d934c2089ef01148…

1 0

Joel Holdsworth : shell32: Replaced delete.ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 6eef9bbe5fed1599859b2304723695b09409e0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eef9bbe5fed1599859b23047… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:11 2010 +0100 shell32: Replaced delete.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/delete.ico | Bin 2998 -> 13942 bytes dlls/shell32/delete.svg | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eef9bbe5fed1599859b2…

1 0

Joel Holdsworth : shell32: Replaced desktop.ico with a Tango compliant icon .
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 9ea28d5ef716a5965405be62f875bc92c4b99ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea28d5ef716a5965405be62f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:16 2010 +0100 shell32: Replaced desktop.ico with a Tango compliant icon. --- dlls/shell32/desktop.ico | Bin 15086 -> 25214 bytes dlls/shell32/desktop.svg | 1195 +++------------------------------------------ 2 files changed, 80 insertions(+), 1115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ea28d5ef716a5965405b…

1 0