October 2006 - Wine-commits

Jeff Latimer : ole32: Remove dead code in errorinfo.c (Coverity).
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 6a355aec1b1c88cfe2927b072c48c57b5e5946dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a355aec1b1c88cfe2927b072… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Oct 14 19:51:43 2006 +1000 ole32: Remove dead code in errorinfo.c (Coverity). --- dlls/ole32/errorinfo.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 62e27e0..b7ce50a 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -83,14 +83,10 @@ static BSTR WINAPI ERRORINFO_SysAllocStr newBuffer++; /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. + * Copy the information in the buffer. It is not possible to pass + * a NULL pointer here. */ - if (in != 0) - memcpy(newBuffer, in, bufferSize); - else - memset(newBuffer, 0, bufferSize); + memcpy(newBuffer, in, bufferSize); /* * Make sure that there is a nul character at the end of the

1 0

Mikołaj Zalewski : comctl32: toolbar: Change the dwData from DWORD to DWORD_PTR.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 992310e4be3ed089038155c809b3e3c01d2493f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992310e4be3ed089038155c80… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 19:52:46 2006 +0200 comctl32: toolbar: Change the dwData from DWORD to DWORD_PTR. --- dlls/comctl32/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6a70292..5d82a1d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -96,7 +96,7 @@ typedef struct BYTE fsStyle; BYTE bHot; BYTE bDropDownPressed; - DWORD dwData; + DWORD_PTR dwData; INT_PTR iString; INT nRow; RECT rect; @@ -272,7 +272,7 @@ static void TOOLBAR_DumpButton(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *bP, INT btn_num, BOOL internal) { if (TRACE_ON(toolbar)){ - TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08x, stringid=0x%08x\n", + TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08x\n", btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), bP->fsState, bP->fsStyle, bP->dwData, bP->iString); TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP)));

1 0

Alexandre Julliard : ntdll: More workarounds for more kernel bugs in VFAT ioctl mapping on x86-64.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 9719b45bb27a0599d3f8533646becdcb89d72952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9719b45bb27a0599d3f853364… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 20:24:07 2006 +0200 ntdll: More workarounds for more kernel bugs in VFAT ioctl mapping on x86-64. --- dlls/ntdll/directory.c | 105 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 73 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 145fc00..29541af 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -915,19 +915,61 @@ static FILE_BOTH_DIR_INFORMATION *append } +#ifdef VFAT_IOCTL_READDIR_BOTH + +/*********************************************************************** + * start_vfat_ioctl + * + * Wrapper for the VFAT ioctl to work around various kernel bugs. + * dir_section must be held by caller. + */ +static KERNEL_DIRENT *start_vfat_ioctl( int fd ) +{ + static KERNEL_DIRENT *de; + int res; + + if (!de) + { + const size_t page_size = getpagesize(); + SIZE_T size = 2 * sizeof(*de) + page_size; + void *addr = NULL; + + if (NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_RESERVE, PAGE_READWRITE )) + return NULL; + /* commit only the size needed for the dir entries */ + /* this leaves an extra unaccessible page, which should make the kernel */ + /* fail with -EFAULT before it stomps all over our memory */ + de = addr; + size = 2 * sizeof(*de); + NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_COMMIT, PAGE_READWRITE ); + } + + /* set d_reclen to 65535 to work around an AFS kernel bug */ + de[0].d_reclen = 65535; + res = ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ); + if (res == -1) + { + if (errno != ENOENT) return NULL; /* VFAT ioctl probably not supported */ + de[0].d_reclen = 0; /* eof */ + } + else if (!res && de[0].d_reclen == 65535) return NULL; /* AFS bug */ + + return de; +} + + /*********************************************************************** * read_directory_vfat * * Read a directory using the VFAT ioctl; helper for NtQueryDirectoryFile. */ -#ifdef VFAT_IOCTL_READDIR_BOTH static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG length, BOOLEAN single_entry, const UNICODE_STRING *mask, BOOLEAN restart_scan ) { - int res; - KERNEL_DIRENT de[2]; + size_t len; + KERNEL_DIRENT *de; FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; static const unsigned int max_dir_info_size = sizeof(*info) + (MAX_DIR_ENTRY_LEN-1) * sizeof(WCHAR); @@ -939,18 +981,16 @@ static int read_directory_vfat( int fd, { off_t old_pos = lseek( fd, 0, SEEK_CUR ); - /* Set d_reclen to 65535 to work around an AFS kernel bug */ - de[0].d_reclen = 65535; - res = ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ); - if (res == -1 && errno != ENOENT) return -1; /* VFAT ioctl probably not supported */ - if (!res && de[0].d_reclen == 65535) return -1; /* AFS bug */ + if (!(de = start_vfat_ioctl( fd ))) return -1; /* not supported */ - while (res != -1) + while (de[0].d_reclen) { - if (!de[0].d_reclen) break; /* make sure names are null-terminated to work around an x86-64 kernel bug */ - if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0; - if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0; + len = min(de[0].d_reclen, sizeof(de[0].d_name) - 1 ); + de[0].d_name[len] = 0; + len = min(de[1].d_reclen, sizeof(de[1].d_name) - 1 ); + de[1].d_name[len] = 0; + if (de[1].d_name[0]) info = append_entry( buffer, &io->Information, length, de[1].d_name, de[0].d_name, mask ); @@ -968,23 +1008,21 @@ static int read_directory_vfat( int fd, break; } old_pos = lseek( fd, 0, SEEK_CUR ); - res = ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ); + if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) break; } } else /* we'll only return full entries, no need to worry about overflow */ { - /* Set d_reclen to 65535 to work around an AFS kernel bug */ - de[0].d_reclen = 65535; - res = ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ); - if (res == -1 && errno != ENOENT) return -1; /* VFAT ioctl probably not supported */ - if (!res && de[0].d_reclen == 65535) return -1; /* AFS bug */ + if (!(de = start_vfat_ioctl( fd ))) return -1; /* not supported */ - while (res != -1) + while (de[0].d_reclen) { - if (!de[0].d_reclen) break; /* make sure names are null-terminated to work around an x86-64 kernel bug */ - if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0; - if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0; + len = min(de[0].d_reclen, sizeof(de[0].d_name) - 1 ); + de[0].d_name[len] = 0; + len = min(de[1].d_reclen, sizeof(de[1].d_name) - 1 ); + de[1].d_name[len] = 0; + if (de[1].d_name[0]) info = append_entry( buffer, &io->Information, length, de[1].d_name, de[0].d_name, mask ); @@ -998,7 +1036,7 @@ static int read_directory_vfat( int fd, /* check if we still have enough space for the largest possible entry */ if (io->Information + max_dir_info_size > length) break; } - res = ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ); + if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) break; } } @@ -1355,20 +1393,19 @@ #ifdef VFAT_IOCTL_READDIR_BOTH int fd = open( unix_name, O_RDONLY | O_DIRECTORY ); if (fd != -1) { - KERNEL_DIRENT de[2]; + KERNEL_DIRENT *de; - /* Set d_reclen to 65535 to work around an AFS kernel bug */ - de[0].d_reclen = 65535; - if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) != -1 && - de[0].d_reclen != 65535) + RtlEnterCriticalSection( &dir_section ); + if ((de = start_vfat_ioctl( fd ))) { unix_name[pos - 1] = '/'; - for (;;) + while (de[0].d_reclen) { - if (!de[0].d_reclen) break; /* make sure names are null-terminated to work around an x86-64 kernel bug */ - if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0; - if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0; + size_t len = min(de[0].d_reclen, sizeof(de[0].d_name) - 1 ); + de[0].d_name[len] = 0; + len = min(de[1].d_reclen, sizeof(de[1].d_name) - 1 ); + de[1].d_name[len] = 0; if (de[1].d_name[0]) { @@ -1377,6 +1414,7 @@ #ifdef VFAT_IOCTL_READDIR_BOTH if (ret == length && !memicmpW( buffer, name, length)) { strcpy( unix_name + pos, de[1].d_name ); + RtlLeaveCriticalSection( &dir_section ); close( fd ); return STATUS_SUCCESS; } @@ -1387,16 +1425,19 @@ #ifdef VFAT_IOCTL_READDIR_BOTH { strcpy( unix_name + pos, de[1].d_name[0] ? de[1].d_name : de[0].d_name ); + RtlLeaveCriticalSection( &dir_section ); close( fd ); return STATUS_SUCCESS; } if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) { + RtlLeaveCriticalSection( &dir_section ); close( fd ); goto not_found; } } } + RtlLeaveCriticalSection( &dir_section ); close( fd ); } /* fall through to normal handling */

1 0

Peter Oberndorfer : configure: Detect mingw cross compiler in gentoo.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 5af9402ef188d484921d204b8b9d5325363a8a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af9402ef188d484921d204b8… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Fri Oct 13 16:09:29 2006 +0200 configure: Detect mingw cross compiler in gentoo. --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 33746d1..3ea21f2 100755 --- a/configure +++ b/configure @@ -16185,7 +16185,7 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; } if test "$cross_compiling" = "no" then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw-gcc + for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -16228,7 +16228,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw-dlltool + for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -16271,7 +16271,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw-windres + for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 diff --git a/configure.ac b/configure.ac index f465b3e..84fdf0d 100644 --- a/configure.ac +++ b/configure.ac @@ -1082,9 +1082,9 @@ case $host_os in AC_SUBST(CROSSTEST,"") if test "$cross_compiling" = "no" then - AC_CHECK_PROGS(CROSSCC,i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw-gcc,false) - AC_CHECK_PROGS(DLLTOOL,i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw-dlltool,false) - AC_CHECK_PROGS(CROSSWINDRES,i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw-windres,false) + AC_CHECK_PROGS(CROSSCC,i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc,false) + AC_CHECK_PROGS(DLLTOOL,i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool,false) + AC_CHECK_PROGS(CROSSWINDRES,i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres,false) if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi fi ;;

1 0

James Hawkins : msi: Also set the SOURCEDIR property in MSI_InstallPackage.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 3797e6cadaf9fa1cb8e0995a06c79d71e217d35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3797e6cadaf9fa1cb8e0995a0… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 13 14:08:52 2006 -0700 msi: Also set the SOURCEDIR property in MSI_InstallPackage. --- dlls/msi/action.c | 4 +++ dlls/msi/tests/install.c | 57 +++++++++++++++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a7db050..4bf505c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -592,6 +592,10 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac if (!check) MSI_SetPropertyW(package, cszSourceDir, path); + check = msi_dup_property( package, cszSOURCEDIR ); + if (!check) + MSI_SetPropertyW(package, cszSOURCEDIR, path); + package->PackagePath = path; msi_free(check); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 223ac41..06805e3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -71,7 +71,8 @@ static const CHAR component_dat[] = "Com "One\t{783B242E-E185-4A56-AF86-C09815EC053C}\tMSITESTDIR\t2\t\tone.txt\n" "Three\t{010B6ADD-B27D-4EDD-9B3D-34C4F7D61684}\tCHANGEDDIR\t2\t\tthree.txt\n" "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" - "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata"; + "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" + "component\t\tTARGETDIR\t0\t1\tfile"; static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -91,7 +92,8 @@ static const CHAR feature_dat[] = "Featu "Four\t\tFour\tThe Four Feature\t4\t3\tCABOUTDIR\t0\n" "One\t\tOne\tThe One Feature\t1\t3\tMSITESTDIR\t0\n" "Three\t\tThree\tThe Three Feature\t3\t3\tCHANGEDDIR\t0\n" - "Two\t\tTwo\tThe Two Feature\t2\t3\tFIRSTDIR\t0"; + "Two\t\tTwo\tThe Two Feature\t2\t3\tFIRSTDIR\t0\n" + "feature\t\t\t\t2\t1\tTARGETDIR\t0"; static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -100,7 +102,8 @@ static const CHAR feature_comp_dat[] = " "Four\tFour\n" "One\tOne\n" "Three\tThree\n" - "Two\tTwo"; + "Two\tTwo\n" + "feature\tcomponent"; static const CHAR file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -109,7 +112,8 @@ static const CHAR file_dat[] = "File\tCo "four.txt\tFour\tfour.txt\t1000\t\t\t16384\t4\n" "one.txt\tOne\tone.txt\t1000\t\t\t0\t1\n" "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" - "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2"; + "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" + "file\tcomponent\tfilename\t100\t\t\t8192\t1"; static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -123,7 +127,7 @@ static const CHAR install_exec_seq_dat[] "InstallInitialize\t\t1500\n" "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n" - "WriteRegistryValues\t\t5000"; + "WriteRegistryValues\tSourceDir And SOURCEDIR\t5000"; static const CHAR media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -153,7 +157,8 @@ static const CHAR registry_dat[] = "Regi "Registry\tRegistry\n" "Apples\t2\tSOFTWARE\\Wine\\msitest\tName\timaname\tOne\n" "Oranges\t2\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo\n" - "regdata\t2\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler"; + "regdata\t2\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n" + "OrderTest\t2\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent"; typedef struct _msi_table { @@ -473,14 +478,6 @@ static void create_file(const CHAR *name static void create_test_files(void) { - int len; - - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - len = lstrlenA(CURR_DIR); - - if(len && (CURR_DIR[len-1] == '\\')) - CURR_DIR[len - 1] = 0; - get_program_files_dir(PROG_FILES_DIR); CreateDirectoryA("msitest", NULL); @@ -494,6 +491,8 @@ static void create_test_files(void) create_file("five.txt"); create_cab_file("msitest.cab"); + create_file("filename"); + DeleteFileA("four.txt"); DeleteFileA("five.txt"); } @@ -514,6 +513,7 @@ static BOOL delete_pf(const CHAR *rel_pa static void delete_test_files(void) { + DeleteFileA("filename"); DeleteFileA("msitest.msi"); DeleteFileA("msitest.cab"); DeleteFileA("msitest\\second\\three.txt"); @@ -601,6 +601,9 @@ static void test_MsiInstallProduct(void) HKEY hkey; DWORD num, size, type; + create_test_files(); + create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); + r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -641,7 +644,16 @@ static void test_MsiInstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(num == 314, "Expected 314, got %d\n", num); + size = MAX_PATH; + type = REG_SZ; + res = RegQueryValueExA(hkey, "OrderTestName", NULL, &type, (LPBYTE)path, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(!lstrcmpA(path, "OrderTestValue"), "Expected imaname, got %s\n", path); + + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); + + delete_test_files(); } static void test_MsiSetComponentState(void) @@ -650,6 +662,8 @@ static void test_MsiSetComponentState(vo char path[MAX_PATH]; UINT r; + create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); + CoInitialize(NULL); lstrcpy(path, CURR_DIR); @@ -673,6 +687,8 @@ static void test_MsiSetComponentState(vo MsiCloseHandle(package); CoUninitialize(); + + DeleteFileA(msifile); } static void test_packagecoltypes(void) @@ -682,6 +698,8 @@ static void test_packagecoltypes(void) LPCSTR query; UINT r, count; + create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); + CoInitialize(NULL); lstrcpy(path, CURR_DIR); @@ -729,15 +747,18 @@ static void test_packagecoltypes(void) START_TEST(install) { + DWORD len; + if (!init_function_pointers()) return; - create_test_files(); - create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + len = lstrlenA(CURR_DIR); + + if(len && (CURR_DIR[len-1] == '\\')) + CURR_DIR[len - 1] = 0; test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); - - delete_test_files(); }

1 0

James Hawkins : include: Move cfgmgr32.h to include/ to match the SDK.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 3b6017ae1894648f478ab242207e1153c20c8b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6017ae1894648f478ab2422… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 13 14:05:01 2006 -0700 include: Move cfgmgr32.h to include/ to match the SDK. --- dlls/cfgmgr32/main.c | 2 +- dlls/setupapi/devinst.c | 2 +- include/Makefile.in | 2 +- include/{ddk => }/cfgmgr32.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 8f44961..9f27a29 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -23,7 +23,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winnt.h" -#include "ddk/cfgmgr32.h" +#include "cfgmgr32.h" #include "wine/debug.h" diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 86bcca1..fbf6ded 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -34,7 +34,7 @@ #include "winnls.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "ddk/cfgmgr32.h" +#include "cfgmgr32.h" #include "initguid.h" #include "winioctl.h" #include "rpc.h" diff --git a/include/Makefile.in b/include/Makefile.in index 2dc8fb0..4b959bc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -76,6 +76,7 @@ WINDOWS_INCLUDES = \ basetsd.h \ basetyps.h \ cderr.h \ + cfgmgr32.h \ cguid.h \ cierror.h \ clusapi.h \ @@ -104,7 +105,6 @@ WINDOWS_INCLUDES = \ dciman.h \ dde.h \ ddeml.h \ - ddk/cfgmgr32.h \ ddk/compstui.h \ ddk/ntddcdvd.h \ ddk/ntddser.h \ diff --git a/include/ddk/cfgmgr32.h b/include/cfgmgr32.h similarity index 100% rename from include/ddk/cfgmgr32.h rename to include/cfgmgr32.h

1 0

James Hawkins : clusapi: Add the clusapi.h public header.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 3cb50048760afefc61d8dcb6df599a857bb069c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb50048760afefc61d8dcb6d… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 13 14:03:55 2006 -0700 clusapi: Add the clusapi.h public header. --- dlls/clusapi/clusapi.c | 1 + include/Makefile.in | 1 + include/clusapi.h | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index 4c34ed3..78dfd0f 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "clusapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(clusapi); diff --git a/include/Makefile.in b/include/Makefile.in index 931c75c..2dc8fb0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -78,6 +78,7 @@ WINDOWS_INCLUDES = \ cderr.h \ cguid.h \ cierror.h \ + clusapi.h \ commctrl.h \ commdlg.h \ compobj.h \ diff --git a/include/clusapi.h b/include/clusapi.h new file mode 100644 index 0000000..f79c150 --- /dev/null +++ b/include/clusapi.h @@ -0,0 +1,24 @@ +/* + * Copyright 2006 James Hawkins + * + * 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 + */ + +#ifndef __WINE_CLUSAPI_H +#define __WINE_CLUSAPI_H + +DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, DWORD *pdwClusterState); + +#endif /* __WINE_CLUSAPI_H */

1 0

Michael Stefaniuc : ntdll/tests: Win64 printf format warning fixes.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 8ddaf6cc211dce2169892f04a92182bbf4e8564c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddaf6cc211dce2169892f04a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 13 23:33:02 2006 +0200 ntdll/tests: Win64 printf format warning fixes. --- dlls/ntdll/tests/Makefile.in | 1 dlls/ntdll/tests/atom.c | 184 +++++++++++++++++----------------- dlls/ntdll/tests/env.c | 18 ++- dlls/ntdll/tests/error.c | 8 + dlls/ntdll/tests/exception.c | 14 +-- dlls/ntdll/tests/info.c | 230 +++++++++++++++++++++--------------------- dlls/ntdll/tests/large_int.c | 24 ++-- dlls/ntdll/tests/om.c | 100 +++++++++--------- dlls/ntdll/tests/path.c | 2 dlls/ntdll/tests/port.c | 18 ++- dlls/ntdll/tests/reg.c | 40 ++++--- dlls/ntdll/tests/rtl.c | 94 +++++++++-------- dlls/ntdll/tests/rtlbitmap.c | 10 +- dlls/ntdll/tests/rtlstr.c | 64 ++++++------ dlls/ntdll/tests/string.c | 28 +++-- 15 files changed, 417 insertions(+), 418 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ddaf6cc211dce2169892…

1 0

Mike McCormack : winetest: Avoid calling fclose twice on the same file ( Coverity).
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: a4fff8b2e0dba99bb4078d99a61b55e3931dbe5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fff8b2e0dba99bb4078d99a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Oct 14 09:55:40 2006 +0900 winetest: Avoid calling fclose twice on the same file (Coverity). --- programs/winetest/send.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 26b9961..ec54e15 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -178,7 +178,7 @@ #define SEP "--8<--cut-here--8<--" if (send_buf (s, body2, sizeof body2 - 1)) { report (R_WARNING, "Error sending trailer: %d, %d", errno, WSAGetLastError ()); - goto abort2; + goto abort1; } report (R_DELTA, 0, "Network transfer: Done");

1 0

Michael Ploujnikov : ole32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 14 Oct '06

14 Oct '06

Module: wine Branch: master Commit: 9d2a804f9b470979ca8f178860855d1e844a54e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2a804f9b470979ca8f17886… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Fri Oct 13 22:54:46 2006 -0400 ole32/tests: Win64 printf format warning fixes. --- dlls/ole32/tests/Makefile.in | 1 dlls/ole32/tests/clipboard.c | 10 +-- dlls/ole32/tests/compobj.c | 38 +++++----- dlls/ole32/tests/hglobalstream.c | 10 +-- dlls/ole32/tests/marshal.c | 70 +++++++++--------- dlls/ole32/tests/moniker.c | 72 ++++++++++--------- dlls/ole32/tests/ole2.c | 2 - dlls/ole32/tests/propvariant.c | 8 +- dlls/ole32/tests/stg_prop.c | 144 +++++++++++++++++++------------------- dlls/ole32/tests/storage32.c | 62 ++++++++-------- 10 files changed, 208 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d2a804f9b470979ca8f1…

1 0