March 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : taskmgr: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 24ac29e19021c3c5afd327d9edcdd2ca358bbd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ac29e19021c3c5afd327d9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:53:09 2013 +0100 taskmgr: Add a 256x256 icon. --- programs/taskmgr/taskmgr.ico | Bin 25214 -> 66719 bytes programs/taskmgr/taskmgr.svg | 2410 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2144 insertions(+), 266 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24ac29e19021c3c5afd32…

1 0

Alexandre Julliard : regedit: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 1090077e73b368feec8d9fac4688f5094b65baad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1090077e73b368feec8d9fac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:51:20 2013 +0100 regedit: Add a 256x256 icon. --- programs/regedit/regedit.ico | Bin 25214 -> 60340 bytes programs/regedit/regedit.svg | 1865 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 1650 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1090077e73b368feec8d9…

1 0

Alexandre Julliard : inetcpl.cpl: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 27a93bfc13c9025b64e43200477cca33cf7b50c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a93bfc13c9025b64e432004… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:34:36 2013 +0100 inetcpl.cpl: Add a 256x256 icon. --- dlls/inetcpl.cpl/inetcpl.ico | Bin 25214 -> 82992 bytes dlls/inetcpl.cpl/inetcpl.svg | 2620 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2358 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27a93bfc13c9025b64e43…

1 0

Alexandre Julliard : appwiz.cpl: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 7964bd820f4bbbe4bf0c90108f711071ab2b49e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7964bd820f4bbbe4bf0c90108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:34:29 2013 +0100 appwiz.cpl: Add a 256x256 icon. --- dlls/appwiz.cpl/appwiz.ico | Bin 25214 -> 49609 bytes dlls/appwiz.cpl/appwiz.svg | 2157 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 1903 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7964bd820f4bbbe4bf0c9…

1 0

Alexandre Julliard : wordpad: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: d1cebac78d527e0bf46f9d4b059f81ccd284edef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1cebac78d527e0bf46f9d4b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:06:16 2013 +0100 wordpad: Add a 256x256 icon. --- programs/wordpad/wordpad.ico | Bin 25214 -> 58342 bytes programs/wordpad/wordpad.svg | 3816 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 3473 insertions(+), 343 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1cebac78d527e0bf46f9…

1 0

Alexandre Julliard : winhlp32: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 4a99f2d4ca3553421a57cb2d54d8c741ee025120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a99f2d4ca3553421a57cb2d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:04:29 2013 +0100 winhlp32: Add a 256x256 icon. --- programs/winhlp32/winhelp.ico | Bin 25214 -> 67901 bytes programs/winhlp32/winhelp.svg | 2063 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 1843 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a99f2d4ca3553421a57c…

1 0

Piotr Caban : d3dx10: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 9f855ae4bb61ff5fed518397b8cebac36fa3e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f855ae4bb61ff5fed518397b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:01 2013 +0100 d3dx10: Match parameters list with function we're forwarding to. --- dlls/d3dx10_33/d3dx10_33.spec | 8 ++++---- dlls/d3dx10_34/d3dx10_34.spec | 8 ++++---- dlls/d3dx10_35/d3dx10_35.spec | 8 ++++---- dlls/d3dx10_36/d3dx10_36.spec | 8 ++++---- dlls/d3dx10_37/d3dx10_37.spec | 8 ++++---- dlls/d3dx10_38/d3dx10_38.spec | 8 ++++---- dlls/d3dx10_39/d3dx10_39.spec | 8 ++++---- dlls/d3dx10_40/d3dx10_40.spec | 8 ++++---- dlls/d3dx10_41/d3dx10_41.spec | 8 ++++---- dlls/d3dx10_42/d3dx10_42.spec | 8 ++++---- dlls/d3dx10_43/d3dx10_43.spec | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f855ae4bb61ff5fed518…

1 0

Alexandre Julliard : buildimage: Store large images as raw PNG files in icons.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 0aa3ae18f8ef828fe08be6ff182862c3ed1086f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa3ae18f8ef828fe08be6ff1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 13:44:18 2013 +0100 buildimage: Store large images as raw PNG files in icons. --- tools/buildimage | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/buildimage b/tools/buildimage index b307497..442bb3e 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -38,6 +38,7 @@ die "Only BMP and ICO outputs are supported" unless $ext eq "bmp" or $ext eq "ic my $renderedSVGFileName = "$svgFileName.png"; my @pngFiles; +my @pngFilesRaw; # Get the programs from the environment variables my $convert = $ENV{"CONVERT"} || "convert"; @@ -49,6 +50,7 @@ sub cleanup() { unlink $renderedSVGFileName; unlink $_ foreach(@pngFiles); + unlink $_ foreach(@pngFilesRaw); } $SIG{"INT"} = "cleanup"; @@ -73,6 +75,8 @@ sub svg_element_start my $size = 0; my $depth = 0; + my $width = 0; + my $height = 0; if($ext eq "ico") { return unless $id =~ /icon:(\d*)-(\d*)/; @@ -100,8 +104,8 @@ sub svg_element_start # Extract SVG vector images my $x = $attr{'x'}; my $y = $attr{'y'}; - my $width = $attr{'width'}; - my $height = $attr{'height'}; + $width = $attr{'width'}; + $height = $attr{'height'}; if(defined($x) and defined($x)) { if($x =~ /\d*/ and $y =~ /\d*/) { @@ -126,7 +130,14 @@ sub svg_element_start return; } - push(@pngFiles, $pngFileName); + if ($width >= 128 && $height >= 128) + { + push(@pngFilesRaw, $pngFileName); + } + else + { + push(@pngFiles, $pngFileName); + } } # Render the SVG image @@ -138,7 +149,7 @@ my $parser = new XML::Parser( $parser->parsefile("$svgFileName"); # If no render directives were found, take the full image as-is -unless(@pngFiles) { +unless (@pngFiles || @pngFilesRaw) { my $pngFileName = "bmp$renderedSVGFileName"; copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; push(@pngFiles, $pngFileName); @@ -148,7 +159,7 @@ unless(@pngFiles) { if($ext eq "ico") { # Place images into the ICO - shell $icotool, "-c", "-o", $outFileName, @pngFiles; + shell $icotool, "-c", "-o", $outFileName, @pngFiles, map { "--raw=$_"; } @pngFilesRaw; } elsif($ext eq "bmp") {

1 0

Alexandre Julliard : wrc: Add support for PNG icons.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: c9d806a0d19379ee8f6dd50bb0945e714bfa847d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d806a0d19379ee8f6dd50bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 13:26:22 2013 +0100 wrc: Add support for PNG icons. --- tools/wrc/newstruc.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 4651617..52bafbd 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -34,6 +34,8 @@ #include "wingdi.h" /* for BITMAPINFOHEADER */ +#define ICO_PNG_MAGIC 0x474e5089 + #include <pshpack2.h> typedef struct { @@ -397,27 +399,28 @@ static int convert_bitmap(char *data, int size) } 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): +#ifdef WORDS_BIGENDIAN + type |= FL_SIZEBE; +#endif + break; + case BYTESWAP_DWORD( sizeof(BITMAPOS2HEADER) ): + case BYTESWAP_DWORD( sizeof(BITMAPINFOHEADER) ): + case BYTESWAP_DWORD( sizeof(BITMAPV4HEADER) ): + case BYTESWAP_DWORD( sizeof(BITMAPV5HEADER) ): +#ifndef WORDS_BIGENDIAN + type |= FL_SIZEBE; +#endif + bmsize = BYTESWAP_DWORD( bmsize ); break; + case ICO_PNG_MAGIC: + case BYTESWAP_DWORD( ICO_PNG_MAGIC ): + return 0; /* nothing to convert */ default: parser_error("Invalid bitmap format, bih->biSize = %d", bih->bV5Size); }

1 0

Alistair Leslie-Hughes : iads.idl: Add missing interfaces.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: a4cb7c46fe26e638fd7f4e1bf86dece636c08363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cb7c46fe26e638fd7f4e1bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 21 09:20:02 2013 +1100 iads.idl: Add missing interfaces. --- include/iads.idl | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 287 insertions(+), 0 deletions(-) diff --git a/include/iads.idl b/include/iads.idl index 2a1aa13..de5730d 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -60,6 +60,269 @@ typedef enum ADS_AUTH_RESERVED = 0x80000000 } ADS_AUTHENTICATION_ENUM; +typedef enum +{ + ADS_SEARCHPREF_ASYNCHRONOUS, + ADS_SEARCHPREF_DEREF_ALIASES, + ADS_SEARCHPREF_SIZE_LIMIT, + ADS_SEARCHPREF_TIME_LIMIT, + ADS_SEARCHPREF_ATTRIBTYPES_ONLY, + ADS_SEARCHPREF_SEARCH_SCOPE, + ADS_SEARCHPREF_TIMEOUT, + ADS_SEARCHPREF_PAGESIZE, + ADS_SEARCHPREF_PAGED_TIME_LIMIT, + ADS_SEARCHPREF_CHASE_REFERRALS, + ADS_SEARCHPREF_SORT_ON, + ADS_SEARCHPREF_CACHE_RESULTS, + ADS_SEARCHPREF_DIRSYNC, + ADS_SEARCHPREF_TOMBSTONE, + ADS_SEARCHPREF_VLV, + ADS_SEARCHPREF_ATTRIBUTE_QUERY, + ADS_SEARCHPREF_SECURITY_MASK, + ADS_SEARCHPREF_DIRSYNC_FLAG, + ADS_SEARCHPREF_EXTENDED_DN +} ADS_SEARCHPREF_ENUM; + +typedef ADS_SEARCHPREF_ENUM *PADS_SEARCHPREF_INFO; + +typedef enum +{ + ADS_STATUS_S_OK, + ADS_STATUS_INVALID_SEARCHPREF, + ADS_STATUS_INVALID_SEARCHPREFVALUE +} ADS_STATUSENUM; + +typedef enum +{ + ADSTYPE_INVALID, + ADSTYPE_DN_STRING, + ADSTYPE_CASE_EXACT_STRING, + ADSTYPE_CASE_IGNORE_STRING, + ADSTYPE_PRINTABLE_STRING, + ADSTYPE_NUMERIC_STRING, + ADSTYPE_BOOLEAN, + ADSTYPE_INTEGER, + ADSTYPE_OCTET_STRING, + ADSTYPE_UTC_TIME, + ADSTYPE_LARGE_INTEGER, + ADSTYPE_PROV_SPECIFIC, + ADSTYPE_OBJECT_CLASS, + ADSTYPE_CASEIGNORE_LIST, + ADSTYPE_OCTET_LIST, + ADSTYPE_PATH, + ADSTYPE_POSTALADDRESS, + ADSTYPE_TIMESTAMP, + ADSTYPE_BACKLINK, + ADSTYPE_TYPEDNAME, + ADSTYPE_HOLD, + ADSTYPE_NETADDRESS, + ADSTYPE_REPLICAPOINTER, + ADSTYPE_FAXNUMBER, + ADSTYPE_EMAIL, + ADSTYPE_NT_SECURITY_DESCRIPTOR, + ADSTYPE_UNKNOWN, + ADSTYPE_DN_WITH_BINARY, + ADSTYPE_DN_WITH_STRING +} ADSTYPEENUM; + +typedef enum +{ + ADS_PASSWORD_ENCODE_REQUIRE_SSL, + ADS_PASSWORD_ENCODE_CLEAR +} ADS_PASSWORD_ENCODING_ENUM; + +typedef struct _ADS_CASEIGNORE_LIST +{ + struct _ADS_CASEIGNORE_LIST *Next; + LPWSTR String; +} ADS_CASEIGNORE_LIST; + +typedef struct _ADS_OCTET_LIST +{ + struct _ADS_OCTET_LIST *Next; + DWORD Length; + BYTE *Data; +} ADS_OCTET_LIST; + +typedef struct +{ + DWORD Type; + LPWSTR VolumeName; + LPWSTR Path; +} ADS_PATH, *PADS_PATH; + +typedef struct +{ + DWORD WholeSeconds; + DWORD EventID; +} ADS_TIMESTAMP; + + +typedef ADSTYPEENUM ADSTYPE; +typedef LPWSTR ADS_DN_STRING; +typedef LPWSTR *PADS_DN_STRING; +typedef LPWSTR ADS_CASE_EXACT_STRING; +typedef LPWSTR *PADS_CASE_EXACT_STRING; +typedef LPWSTR ADS_CASE_IGNORE_STRING; +typedef LPWSTR *PADS_CASE_IGNORE_STRING; +typedef LPWSTR ADS_PRINTABLE_STRING; +typedef LPWSTR *PADS_PRINTABLE_STRING; +typedef LPWSTR ADS_NUMERIC_STRING; +typedef LPWSTR *PADS_NUMERIC_STRING; +typedef DWORD ADS_BOOLEAN; +typedef DWORD *LPNDS_BOOLEAN; +typedef DWORD ADS_INTEGER; +typedef DWORD *PADS_INTEGER; +typedef SYSTEMTIME ADS_UTC_TIME; +typedef SYSTEMTIME *PADS_UTC_TIME; +typedef LARGE_INTEGER ADS_LARGE_INTEGER; +typedef LARGE_INTEGER *PADS_LARGE_INTEGER; +typedef LPWSTR ADS_OBJECT_CLASS; +typedef LPWSTR *PADS_OBJECT_CLASS; +typedef struct _ADS_OCTET_LIST *PADS_OCTET_LIST; +typedef struct _ADS_CASEIGNORE_LIST *PADS_CASEIGNORE_LIST; +typedef ADS_STATUSENUM ADS_STATUS; +typedef ADS_SEARCHPREF_ENUM ADS_SEARCHPREF; +typedef HANDLE ADS_SEARCH_HANDLE; +typedef HANDLE *PADS_SEARCH_HANDLE; + + +typedef struct +{ + DWORD dwLength; + BYTE *lpValue; +} ADS_OCTET_STRING; + +typedef struct +{ + DWORD dwLength; + BYTE *lpValue; +} ADS_PROV_SPECIFIC; + +typedef struct +{ + LPWSTR PostalAddress[ 6 ]; +} ADS_POSTALADDRESS, *PADS_POSTALADDRESS; + +typedef struct +{ + LPWSTR ObjectName; + DWORD Level; + DWORD Interval; +} ADS_TYPEDNAME, *PADS_TYPEDNAME; + +typedef struct +{ + DWORD RemoteID; + LPWSTR ObjectName; +} ADS_BACKLINK; + +typedef struct +{ + LPWSTR ObjectName; + DWORD Amount; +} ADS_HOLD; + +typedef struct +{ + DWORD AddressType; + DWORD AddressLength; + BYTE *Address; +} ADS_NETADDRESS, *PADS_NETADDRESS; + +typedef struct +{ + LPWSTR ServerName; + DWORD ReplicaType; + DWORD ReplicaNumber; + DWORD Count; + PADS_NETADDRESS ReplicaAddressHints; +} ADS_REPLICAPOINTER, *PADS_REPLICAPOINTER; + +typedef struct +{ + LPWSTR TelephoneNumber; + DWORD NumberOfBits; + BYTE *Parameters; +} ADS_FAXNUMBER, *PADS_FAXNUMBER; + + +typedef struct +{ + LPWSTR Address; + DWORD Type; +} ADS_EMAIL, *PADS_EMAIL; + +typedef struct +{ + DWORD dwLength; + BYTE *lpValue; +} ADS_NT_SECURITY_DESCRIPTOR; + +typedef struct +{ + DWORD dwLength; + BYTE *lpBinaryValue; + LPWSTR pszDNString; +} ADS_DN_WITH_BINARY, *PADS_DN_WITH_BINARY; + +typedef struct +{ + LPWSTR pszStringValue; + LPWSTR pszDNString; +} ADS_DN_WITH_STRING, *PADS_DN_WITH_STRING; + +typedef struct _adsvalue +{ + ADSTYPE dwType; + union + { + ADS_DN_STRING DNString; + ADS_CASE_EXACT_STRING CaseExactString; + ADS_CASE_IGNORE_STRING CaseIgnoreString; + ADS_PRINTABLE_STRING PrintableString; + ADS_NUMERIC_STRING NumericString; + ADS_BOOLEAN Boolean; + ADS_INTEGER Integer; + ADS_OCTET_STRING OctetString; + ADS_UTC_TIME UTCTime; + ADS_LARGE_INTEGER LargeInteger; + ADS_OBJECT_CLASS ClassName; + ADS_PROV_SPECIFIC ProviderSpecific; + PADS_CASEIGNORE_LIST pCaseIgnoreList; + PADS_OCTET_LIST pOctetList; + PADS_PATH pPath; + PADS_POSTALADDRESS pPostalAddress; + ADS_TIMESTAMP Timestamp; + ADS_BACKLINK BackLink; + PADS_TYPEDNAME pTypedName; + ADS_HOLD Hold; + PADS_NETADDRESS pNetAddress; + PADS_REPLICAPOINTER pReplicaPointer; + PADS_FAXNUMBER pFaxNumber; + ADS_EMAIL Email; + ADS_NT_SECURITY_DESCRIPTOR SecurityDescriptor; + PADS_DN_WITH_BINARY pDNWithBinary; + PADS_DN_WITH_STRING pDNWithString; + }; +} ADSVALUE, *PADSVALUE; + +typedef struct ads_searchpref_info +{ + ADS_SEARCHPREF dwSearchPref; + ADSVALUE vValue; + ADS_STATUS dwStatus; +} ADS_SEARCHPREF_INFO; + +typedef struct ads_search_column +{ + LPWSTR pszAttrName; + ADSTYPE dwADsType; + PADSVALUE pADsValues; + DWORD dwNumValues; + HANDLE hReserved; +} ADS_SEARCH_COLUMN, *PADS_SEARCH_COLUMN; + /***************************************************************************** * IADsContainer interface */ @@ -490,3 +753,27 @@ interface IADsUser : IADs [id(0x00000044)] HRESULT ChangePassword([in] BSTR bstrOldPassword, [in] BSTR bstrNewPassword); }; + +/***************************************************************************** + * IDirectorySearch interface + */ +[ + odl, + local, + uuid(109BA8EC-92F0-11D0-A790-00C04FD8D5A8) +] +interface IDirectorySearch : IUnknown +{ + HRESULT SetSearchPreference([in] PADS_SEARCHPREF_INFO pSearchPrefs, [in] DWORD dwNumPrefs); + HRESULT ExecuteSearch([in] LPWSTR pszSearchFilter, [in] LPWSTR* pAttributeNames, + [in] DWORD dwNumberAttributes, [out] PADS_SEARCH_HANDLE phSearchResult); + HRESULT AbandonSearch([in] ADS_SEARCH_HANDLE phSearchResult); + HRESULT GetFirstRow([in] ADS_SEARCH_HANDLE hSearchResult); + HRESULT GetNextRow([in] ADS_SEARCH_HANDLE hSearchResult); + HRESULT GetPreviousRow([in] ADS_SEARCH_HANDLE hSearchResult); + HRESULT GetNextColumnName([in] ADS_SEARCH_HANDLE hSearchHandle, [out] LPWSTR* ppszColumnName); + HRESULT GetColumn( [in] ADS_SEARCH_HANDLE hSearchResult, [in] LPWSTR szColumnName, + [out] PADS_SEARCH_COLUMN pSearchColumn); + HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); + HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); +};

1 0