November 2006 - Wine-commits

James Hawkins : msi: Use the media_info structure instead of passing in individual values to extract_cabinet_file .
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: b81f1ce561f31bf6ae729ba052e3b29508ae3924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81f1ce561f31bf6ae729ba05… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:09:29 2006 -0800 msi: Use the media_info structure instead of passing in individual values to extract_cabinet_file. --- dlls/msi/files.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 2f68467..8d3338c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -57,6 +57,14 @@ extern const WCHAR szRemoveFiles[]; static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; +struct media_info { + UINT last_sequence; + LPWSTR last_volume; + LPWSTR last_path; + DWORD count; + WCHAR source[MAX_PATH]; +}; + /* * This is a helper function for handling embedded cabinet media */ @@ -272,8 +280,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC * * Extract files from a cab file. */ -static BOOL extract_cabinet_file(MSIPACKAGE* package, LPCWSTR source, - LPCWSTR path) +static BOOL extract_cabinet_file(MSIPACKAGE* package, struct media_info *mi) { HFDI hfdi; ERF erf; @@ -283,7 +290,7 @@ static BOOL extract_cabinet_file(MSIPACK static CHAR empty[] = ""; CabData data; - TRACE("Extracting %s to %s\n",debugstr_w(source), debugstr_w(path)); + TRACE("Extracting %s to %s\n",debugstr_w(mi->source), debugstr_w(mi->last_path)); hfdi = FDICreate(cabinet_alloc, cabinet_free, @@ -300,12 +307,12 @@ static BOOL extract_cabinet_file(MSIPACK return FALSE; } - if (!(cabinet = strdupWtoA( source ))) + if (!(cabinet = strdupWtoA( mi->source ))) { FDIDestroy(hfdi); return FALSE; } - if (!(cab_path = strdupWtoA( path ))) + if (!(cab_path = strdupWtoA( mi->last_path ))) { FDIDestroy(hfdi); msi_free(cabinet); @@ -348,14 +355,6 @@ static VOID set_file_source(MSIPACKAGE* file->SourcePath = build_directory_name(2, path, file->File); } -struct media_info { - UINT last_sequence; - LPWSTR last_volume; - LPWSTR last_path; - DWORD count; - WCHAR source[MAX_PATH]; -}; - static struct media_info *create_media_info( void ) { struct media_info *mi; @@ -422,7 +421,7 @@ static UINT msi_extract_remote_cabinet( } msi_free(cabpath); - return !extract_cabinet_file(package, mi->source, mi->last_path); + return !extract_cabinet_file(package, mi); } static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi, LPCWSTR prompt ) @@ -578,7 +577,7 @@ static UINT ready_media_for_file( MSIPAC } else { - rc = !extract_cabinet_file(package, mi->source, mi->last_path); + rc = !extract_cabinet_file(package, mi); } } else

1 0

James Hawkins : msi: Use the file' s component instead of passing an extra parameter to set_file_source.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 988509e1afe1a1993c6c2fc336cff3dde3a06e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988509e1afe1a1993c6c2fc33… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:09:58 2006 -0800 msi: Use the file's component instead of passing an extra parameter to set_file_source. --- dlls/msi/files.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8d3338c..3b6b2a9 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -335,13 +335,12 @@ static BOOL extract_cabinet_file(MSIPACK return ret; } -static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, MSICOMPONENT* - comp, LPCWSTR path) +static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, LPCWSTR path) { if (!file->IsCompressed) { LPWSTR p, path; - p = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); + p = resolve_folder(package, file->Component->Directory, TRUE, FALSE, NULL); path = build_directory_name(2, p, file->ShortName); if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) { @@ -466,7 +465,7 @@ static UINT ready_media_for_file( MSIPAC if (file->Sequence <= mi->last_sequence) { - set_file_source(package,file,comp,mi->last_path); + set_file_source(package, file, mi->last_path); TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence); return ERROR_SUCCESS; } @@ -488,7 +487,7 @@ static UINT ready_media_for_file( MSIPAC if (!file->IsCompressed) { mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); - set_file_source(package,file,comp,mi->last_path); + set_file_source(package, file, mi->last_path); MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, @@ -592,7 +591,7 @@ static UINT ready_media_for_file( MSIPAC MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); } - set_file_source(package, file, comp, mi->last_path); + set_file_source(package, file, mi->last_path); MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume,

1 0

James Hawkins : msi: Add more tests for installing from cabinets.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 84f34ec2101106320263c8df6229c7cccf7a66f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f34ec2101106320263c8df6… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:09:02 2006 -0800 msi: Add more tests for installing from cabinets. --- dlls/msi/tests/install.c | 106 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 102 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 01d0615..86d67b0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -152,7 +152,8 @@ static const CHAR cc_component_dat[] = " "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" - "augustus\t\tMSITESTDIR\t0\t1\taugustus"; + "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" + "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n"; static const CHAR cc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" @@ -163,19 +164,43 @@ static const CHAR cc_feature_comp_dat[] "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" "feature\tmaximus\n" - "feature\taugustus"; + "feature\taugustus\n" + "feature\tcaesar"; static const CHAR cc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" - "augustus\taugustus\taugustus\t50000\t\t\t16384\t1"; + "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t12"; static const CHAR cc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t10\t\ttest1.cab\tDISK1\t\n" - "2\t2\t\ttest2.cab\tDISK2\t\n"; + "2\t2\t\ttest2.cab\tDISK2\t\n" + "3\t12\t\ttest3.cab\tDISK3\t\n"; + +static const CHAR co_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3"; + +static const CHAR co_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t10\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2.cab\tDISK2\t\n" + "3\t3\t\ttest3.cab\tDISK3\t\n"; + +static const CHAR co2_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t10\t\ttest1.cab\tDISK1\t\n" + "2\t12\t\ttest3.cab\tDISK3\t\n" + "3\t2\t\ttest2.cab\tDISK2\t\n"; typedef struct _msi_table { @@ -213,6 +238,30 @@ static const msi_table cc_tables[] = ADD_TABLE(property), }; +static const msi_table co_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(co_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(co_media), + ADD_TABLE(property), +}; + +static const msi_table co2_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(co2_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -766,6 +815,7 @@ static void create_cc_test_files(void) create_file("maximus", 500); create_file("augustus", 50000); + create_file("caesar", 500); set_cab_parameters(&cabParams, "test1.cab", 200); @@ -792,8 +842,11 @@ #endif res = FCIDestroy(hfci); ok(res, "Failed to destroy the cabinet\n"); + create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); + DeleteFile("maximus"); DeleteFile("augustus"); + DeleteFile("caesar"); } static void test_continuouscabs(void) @@ -815,11 +868,13 @@ static void test_continuouscabs(void) { ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); } ok(delete_pf("msitest", FALSE), "File not installed\n"); DeleteFile("test1.cab"); DeleteFile("test2.cab"); + DeleteFile("test3.cab"); DeleteFile(msifile); } @@ -830,6 +885,7 @@ static void test_caborder(void) create_file("imperator", 100); create_file("maximus", 500); create_file("augustus", 50000); + create_file("caesar", 500); create_database(msifile, cc_tables, sizeof(cc_tables) / sizeof(msi_table)); @@ -837,10 +893,12 @@ static void test_caborder(void) create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); create_cab_file("test2.cab", MEDIA_SIZE, "augustus\0"); + create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); todo_wine { ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); @@ -849,14 +907,17 @@ static void test_caborder(void) DeleteFile("test1.cab"); DeleteFile("test2.cab"); + DeleteFile("test3.cab"); create_cab_file("test1.cab", MEDIA_SIZE, "imperator\0"); create_cab_file("test2.cab", MEDIA_SIZE, "maximus\0augustus\0"); + create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); todo_wine { ok(!delete_pf("msitest", FALSE), "File is installed\n"); @@ -864,10 +925,47 @@ static void test_caborder(void) DeleteFile("test1.cab"); DeleteFile("test2.cab"); + DeleteFile("test3.cab"); + DeleteFile(msifile); + + create_cc_test_files(); + create_database(msifile, co_tables, sizeof(co_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, NULL); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); + } + DeleteFile("test1.cab"); + DeleteFile("test2.cab"); + DeleteFile("test3.cab"); + DeleteFile(msifile); + + create_cc_test_files(); + create_database(msifile, co2_tables, sizeof(co2_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, NULL); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); + } + + DeleteFile("test1.cab"); + DeleteFile("test2.cab"); + DeleteFile("test3.cab"); DeleteFile("imperator"); DeleteFile("maximus"); DeleteFile("augustus"); + DeleteFile("caesar"); DeleteFile(msifile); }

1 0

Francois Gouget : Fix ntsecapi.h so it does not depend on winternl.h.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 5cff5038a9fa1910d14984c40bd02ec8aa36afde URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cff5038a9fa1910d14984c40… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 01:20:40 2006 +0100 Fix ntsecapi.h so it does not depend on winternl.h. --- dlls/advapi32/tests/lsa.c | 1 - dlls/advapi32/tests/security.c | 1 - dlls/netapi32/access.c | 1 - dlls/netapi32/ds.c | 1 - dlls/netapi32/local_group.c | 1 - dlls/netapi32/wksta.c | 1 - include/ntsecapi.h | 30 ++++++++++++++++++++++++++++++ include/sspi.h | 11 +++++++++++ include/winternl.h | 9 +++++++++ 9 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index e832a2a..2daf65d 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -26,7 +26,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" -#include "winternl.h" #include "ntsecapi.h" #include "sddl.h" #include "winnls.h" diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 452f0d2..6419864 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -28,7 +28,6 @@ #include "winbase.h" #include "winerror.h" #include "aclapi.h" #include "winnt.h" -#include "winternl.h" #include "sddl.h" #include "ntsecapi.h" diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 4e3e65b..b9155e5 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -30,7 +30,6 @@ #include "lmaccess.h" #include "lmapibuf.h" #include "lmerr.h" #include "winreg.h" -#include "winternl.h" #include "ntsecapi.h" #include "netapi32_misc.h" #include "wine/debug.h" diff --git a/dlls/netapi32/ds.c b/dlls/netapi32/ds.c index 5c6713d..33aa1e0 100644 --- a/dlls/netapi32/ds.c +++ b/dlls/netapi32/ds.c @@ -25,7 +25,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winternl.h" #include "ntsecapi.h" #include "wine/debug.h" #include "dsrole.h" diff --git a/dlls/netapi32/local_group.c b/dlls/netapi32/local_group.c index bb0b7aa..68534ac 100644 --- a/dlls/netapi32/local_group.c +++ b/dlls/netapi32/local_group.c @@ -30,7 +30,6 @@ #include "lmaccess.h" #include "lmapibuf.h" #include "lmerr.h" #include "winreg.h" -#include "winternl.h" #include "ntsecapi.h" #include "netapi32_misc.h" #include "wine/debug.h" diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index d89cd1a..5774344 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -36,7 +36,6 @@ #include "lmwksta.h" #include "iphlpapi.h" #include "winerror.h" #include "winreg.h" -#include "winternl.h" #include "ntsecapi.h" #include "netbios.h" #include "wine/debug.h" diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 4ed878e..8ef6167 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -135,6 +135,36 @@ typedef enum _POLICY_AUDIT_EVENT_TYPE AuditCategoryAccountManagement } POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; +#ifndef __STRING_DEFINED__ +#define __STRING_DEFINED__ +typedef struct _STRING { + USHORT Length; + USHORT MaximumLength; + PCHAR Buffer; +} STRING, *PSTRING; +#endif + +#ifndef __UNICODE_STRING_DEFINED__ +#define __UNICODE_STRING_DEFINED__ +typedef struct _UNICODE_STRING { + USHORT Length; /* bytes */ + USHORT MaximumLength; /* bytes */ + PWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; +#endif + +#ifndef __OBJECT_ATTRIBUTES_DEFINED__ +#define __OBJECT_ATTRIBUTES_DEFINED__ +typedef struct _OBJECT_ATTRIBUTES { + ULONG Length; + HANDLE RootDirectory; + PUNICODE_STRING ObjectName; + ULONG Attributes; + PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */ + PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */ +} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; +#endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; diff --git a/include/sspi.h b/include/sspi.h index e743d99..1a4ce52 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -73,6 +73,17 @@ typedef struct _SECURITY_INTEGER } SECURITY_INTEGER, *PSECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; +#ifndef __UNICODE_STRING_DEFINED__ +#define __UNICODE_STRING_DEFINED__ +typedef struct _UNICODE_STRING { + USHORT Length; /* bytes */ + USHORT MaximumLength; /* bytes */ + PWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; +#endif + +typedef UNICODE_STRING SECURITY_STRING, *PSECURITY_STRING; + typedef struct _SecPkgInfoA { unsigned long fCapabilities; diff --git a/include/winternl.h b/include/winternl.h index 75557dc..9509176 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -42,11 +42,14 @@ typedef CONST char *PCSZ; typedef short CSHORT; typedef CSHORT *PCSHORT; +#ifndef __STRING_DEFINED__ +#define __STRING_DEFINED__ typedef struct _STRING { USHORT Length; USHORT MaximumLength; PCHAR Buffer; } STRING, *PSTRING; +#endif typedef STRING ANSI_STRING; typedef PSTRING PANSI_STRING; @@ -56,11 +59,14 @@ typedef STRING OEM_STRING; typedef PSTRING POEM_STRING; typedef const STRING *PCOEM_STRING; +#ifndef __UNICODE_STRING_DEFINED__ +#define __UNICODE_STRING_DEFINED__ typedef struct _UNICODE_STRING { USHORT Length; /* bytes */ USHORT MaximumLength; /* bytes */ PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; +#endif typedef const UNICODE_STRING *PCUNICODE_STRING; @@ -919,6 +925,8 @@ typedef struct _KEY_VALUE_PARTIAL_INFORM UCHAR Data[1]; } KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; +#ifndef __OBJECT_ATTRIBUTES_DEFINED__ +#define __OBJECT_ATTRIBUTES_DEFINED__ typedef struct _OBJECT_ATTRIBUTES { ULONG Length; HANDLE RootDirectory; @@ -927,6 +935,7 @@ typedef struct _OBJECT_ATTRIBUTES { PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */ PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */ } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; +#endif typedef struct _OBJECT_DATA_INFORMATION { BOOLEAN InheritHandle;

1 0

Francois Gouget : setupapi: setupapi. h must not define HSTRING_TABLE and the StringTable* prototypes.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 7ab6d8522b614f6e9d9773fa86151ab05fb05a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab6d8522b614f6e9d9773fa8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 00:58:43 2006 +0100 setupapi: setupapi.h must not define HSTRING_TABLE and the StringTable* prototypes. --- dlls/setupapi/stringtable.c | 2 ++ dlls/setupapi/tests/stringtable.c | 5 +++++ include/setupapi.h | 13 ------------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 84b1c14..7be6b18 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -37,6 +37,8 @@ #define TABLE_DEFAULT_SIZE 256 WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +DECLARE_HANDLE(HSTRING_TABLE); + typedef struct _TABLE_SLOT { LPWSTR pString; diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 74a19c7..59e49c0 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -34,6 +34,11 @@ #include "setupapi.h" #include "wine/test.h" +DECLARE_HANDLE(HSTRING_TABLE); + +/* Flags for StringTableAddString and StringTableLookUpString */ +#define ST_CASE_SENSITIVE_COMPARE 0x00000001 + static DWORD (WINAPI *pStringTableAddString)(HSTRING_TABLE, LPWSTR, DWORD); static VOID (WINAPI *pStringTableDestroy)(HSTRING_TABLE); static HSTRING_TABLE (WINAPI *pStringTableDuplicate)(HSTRING_TABLE hStringTable); diff --git a/include/setupapi.h b/include/setupapi.h index ada57db..231b30a 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -158,8 +158,6 @@ #define SP_MAX_MACHINENAME_LENGTH (MAX typedef UINT DI_FUNCTION; -DECLARE_HANDLE(HSTRING_TABLE); - typedef struct _SP_CLASSINSTALL_HEADER { DWORD cbSize; @@ -417,9 +415,6 @@ #define SP_COPY_REPLACE_BOOT_FILE #define SP_COPY_NOPRUNE 0x00100000 #define SP_COPY_OEM_F6_INF 0x00200000 -/* Flags for StringTableAddString and StringTableLookUpString */ -#define ST_CASE_SENSITIVE_COMPARE 0x00000001 - #define FLG_ADDREG_DELREG_BIT 0x00008000 #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002 @@ -885,14 +880,6 @@ #define SetupSetFileQueueAlterna BOOL WINAPI SetupSetFileQueueFlags( HSPFILEQ, DWORD, DWORD ); void WINAPI SetupTermDefaultQueueCallback( PVOID ); DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR); -DWORD WINAPI StringTableAddString(HSTRING_TABLE, LPWSTR, DWORD); -VOID WINAPI StringTableDestroy(HSTRING_TABLE); -HSTRING_TABLE WINAPI StringTableDuplicate(HSTRING_TABLE hStringTable); -HSTRING_TABLE WINAPI StringTableInitialize(VOID); -DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); -LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD); -BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); -VOID WINAPI StringTableTrim(HSTRING_TABLE); DWORD WINAPI TakeOwnershipOfFile(PCWSTR); PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage); BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID);

1 0

Francois Gouget : secur32: sspi.h must not include wtypes.h.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: ea483682c5608947140cfe16d1df3f355d27f2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea483682c5608947140cfe16d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 00:59:30 2006 +0100 secur32: sspi.h must not include wtypes.h. --- dlls/rpcrt4/rpc_epmap.c | 2 +- dlls/secur32/tests/ntlm.c | 2 ++ dlls/secur32/tests/secur32.c | 1 + include/sspi.h | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 70e4038..93e3e60 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -251,7 +251,7 @@ typedef unsigned int unsigned32; typedef struct twr_t { unsigned32 tower_length; - /* [size_is] */ byte tower_octet_string[ 1 ]; + /* [size_is] */ BYTE tower_octet_string[ 1 ]; } twr_t; RPC_STATUS WINAPI TowerExplode( diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 7fa9358..47a4888 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -30,6 +30,8 @@ #include <windef.h> #include <winbase.h> #define SECURITY_WIN32 #include <sspi.h> +#include <rpc.h> +#include <rpcdce.h> #include "wine/test.h" diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index da20af3..57f2ee1 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> #define SECURITY_WIN32 #include <security.h> #include <schannel.h> diff --git a/include/sspi.h b/include/sspi.h index 704d1a0..e743d99 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -18,7 +18,7 @@ #ifndef __WINE_SSPI_H__ #define __WINE_SSPI_H__ -#include <wtypes.h> +/* FIXME: #include <sdkddkver.h> */ #ifdef __cplusplus extern "C" {

1 0

Francois Gouget : uxtheme: winerror. h must not define the E_PROP_*_UNSUPPORTED macros.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 7a2bd72b8ad0520f65fe6fb364ce42b6caeb4161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2bd72b8ad0520f65fe6fb36… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 00:57:55 2006 +0100 uxtheme: winerror.h must not define the E_PROP_*_UNSUPPORTED macros. --- dlls/uxtheme/draw.c | 1 + dlls/uxtheme/metric.c | 1 + dlls/uxtheme/msstyles.c | 1 + dlls/uxtheme/property.c | 1 + dlls/uxtheme/system.c | 1 + dlls/uxtheme/tests/system.c | 1 + include/winerror.h | 4 ---- 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index b5be2a7..a2fee03 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index fa3bb61..c683a67 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 0d2210d..919a871 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 0d40f4c..7e52e6f 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 7efe471..83381b0 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 0ece20a..1fd3d97 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include "windows.h" +#include "vfwmsgs.h" #include "uxtheme.h" #include "wine/test.h" diff --git a/include/winerror.h b/include/winerror.h index 20f443c..c04bd96 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2012,10 +2012,6 @@ #define E_HANDLE #define E_OUTOFMEMORY _HRESULT_TYPEDEF_(0x8007000EL) #define E_INVALIDARG _HRESULT_TYPEDEF_(0x80070057L) -/* For IKsPropertySets */ -#define E_PROP_ID_UNSUPPORTED _HRESULT_TYPEDEF_(0x80070490L) -#define E_PROP_SET_UNSUPPORTED _HRESULT_TYPEDEF_(0x80070492L) - #define CO_S_NOTALLINTERFACES _HRESULT_TYPEDEF_(0x00080012L) #define CO_E_CLASS_CREATE_FAILED _HRESULT_TYPEDEF_(0x80080001L)

1 0

Francois Gouget : shell32: Add missing '\n' to Wine trace.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 138e12b3d2b529f326fa68ceec6d9197c5c8d804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138e12b3d2b529f326fa68cee… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 00:54:49 2006 +0100 shell32: Add missing '\n' to Wine trace. --- dlls/shell32/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 479e90f..c618def 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -217,7 +217,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, in pv = SHLockShared(hmem, 0); chars = sprintfW(buf, wszILPtr, pv); if (chars >= sizeof(buf)/sizeof(WCHAR)) - ERR("pidl format buffer too small!"); + ERR("pidl format buffer too small!\n"); used += chars; if (used < len) {

1 0

Francois Gouget : include/objbase.h: Add missing include directives.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: fc765b98bf1dbe910f08dcb41a6ae0d69814957d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc765b98bf1dbe910f08dcb41… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 00:52:15 2006 +0100 include/objbase.h: Add missing include directives. --- include/objbase.h | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index a248e98..85af95a 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -281,13 +281,16 @@ #define __IRpcChannelBuffer_FWD_DEFINED_ typedef interface IRpcChannelBuffer IRpcChannelBuffer; #endif -#include <objidl.h> - #ifndef RC_INVOKED /* For compatibility only, at least for now */ #include <stdlib.h> #endif +#include <wtypes.h> +#include <unknwn.h> +#include <objidl.h> + +#include <guiddef.h> #ifndef INITGUID #include <cguid.h> #endif @@ -511,7 +514,9 @@ #ifdef __cplusplus } #endif -/* FIXME: #include <urlmon.h> */ +#ifndef __WINESRC__ +# include <urlmon.h> +#endif #include <propidl.h> #ifndef __WINESRC__

1 0

Francois Gouget : include: The PSDK does not have the A/ W variants of MAKEINTATOM() so we should not either.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: a7f8195be946abf19976195b93b9ab5736f4d4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f8195be946abf19976195b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 8 01:19:02 2006 +0100 include: The PSDK does not have the A/W variants of MAKEINTATOM() so we should not either. --- dlls/comctl32/theming.c | 8 ++++---- dlls/user/class.c | 2 +- dlls/user/controls.h | 12 +++++------- dlls/user/desktop.c | 2 +- dlls/user/dialog.c | 4 ++-- dlls/user/dialog16.c | 2 +- dlls/user/icontitle.c | 6 +++--- dlls/user/menu.c | 4 ++-- dlls/user/spy.c | 2 +- dlls/user/tests/win.c | 2 +- dlls/uxtheme/draw.c | 4 ++-- dlls/uxtheme/system.c | 10 +++++----- include/winbase.h | 9 ++++++--- include/winuser.h | 4 +--- programs/explorer/desktop.c | 2 +- 15 files changed, 36 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7f8195be946abf199761…

1 0