November 2007 - Wine-Commits

James Hawkins : msi: Downgrade a FIXME to a WARN.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 8912798fb5d4d70c22386be07d0e8141a99ff79a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8912798fb5d4d70c22386be07… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:04:25 2007 -0600 msi: Downgrade a FIXME to a WARN. --- dlls/msi/custom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a44b918..269aa3a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -226,7 +226,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (type & msidbCustomActionTypeInScript) { if (type & msidbCustomActionTypeNoImpersonate) - FIXME("msidbCustomActionTypeNoImpersonate not handled\n"); + WARN("msidbCustomActionTypeNoImpersonate not handled\n"); if (type & msidbCustomActionTypeRollback) {

1 0

James Hawkins : msi: Only check the volume label if it' s different than the first media's volume label.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: ca9a4dc0d96f7f368ea9def4124780c8ff49e78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9a4dc0d96f7f368ea9def41… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:02:55 2007 -0600 msi: Only check the volume label if it's different than the first media's volume label. --- dlls/msi/files.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6662e4a..229525e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -62,6 +62,7 @@ struct media_info { UINT last_sequence; LPWSTR disk_prompt; LPWSTR cabinet; + LPWSTR first_volume; LPWSTR volume_label; BOOL is_continuous; BOOL is_extracted; @@ -284,6 +285,9 @@ static UINT msi_media_get_disk_info( MSIPACKAGE *package, struct media_info *mi mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); + if (!mi->first_volume) + mi->first_volume = strdupW(mi->volume_label); + ptr = strrchrW(mi->source, '\\') + 1; lstrcpyW(ptr, mi->cabinet); msiobj_release(&row->hdr); @@ -491,6 +495,7 @@ static void free_media_info( struct media_info *mi ) msi_free( mi->disk_prompt ); msi_free( mi->cabinet ); msi_free( mi->volume_label ); + msi_free( mi->first_volume ); msi_free( mi ); } @@ -563,6 +568,9 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); msiobj_release(&row->hdr); + if (!mi->first_volume) + mi->first_volume = strdupW(mi->volume_label); + source_dir = msi_dup_property(package, cszSourceDir); if (mi->cabinet && mi->cabinet[0] == '#') @@ -618,7 +626,8 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1) + if (mi->volume_label && mi->disk_id > 1 && + lstrcmpW(mi->first_volume, mi->volume_label)) { LPWSTR source = msi_dup_property(package, cszSourceDir); BOOL matches;

1 0

James Hawkins : msi: Add tests for MsiGetFileHash and clean up the existing tests.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: ef7d16c8168a511a35e0547a2b364198026e507d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7d16c8168a511a35e0547a2… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 17:57:37 2007 -0600 msi: Add tests for MsiGetFileHash and clean up the existing tests. --- dlls/msi/tests/msi.c | 130 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 89 insertions(+), 41 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 446f497..40de221 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -28,17 +28,12 @@ #include "wine/test.h" -typedef struct test_MSIFILEHASHINFO { - ULONG dwFileHashInfoSize; - ULONG dwData[4]; -} test_MSIFILEHASHINFO, *test_PMSIFILEHASHINFO; - static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static INSTALLSTATE (WINAPI *pMsiGetComponentPathA) (LPCSTR, LPCSTR, LPSTR, DWORD*); static UINT (WINAPI *pMsiGetFileHashA) - (LPCSTR, DWORD, test_PMSIFILEHASHINFO); + (LPCSTR, DWORD, PMSIFILEHASHINFO); static UINT (WINAPI *pMsiOpenPackageExA) (LPCSTR, DWORD, MSIHANDLE*); static UINT (WINAPI *pMsiOpenPackageExW) @@ -229,58 +224,111 @@ static void test_getcomponentpath(void) ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); } -static void test_filehash(void) +static void create_file(LPCSTR name, LPCSTR data, DWORD size) +{ + HANDLE file; + DWORD written; + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); + WriteFile(file, data, strlen(data), &written, NULL); + + if (size) + { + SetFilePointer(file, size, NULL, FILE_BEGIN); + SetEndOfFile(file); + } + + CloseHandle(file); +} + +#define HASHSIZE sizeof(MSIFILEHASHINFO) + +static const struct +{ + LPCSTR data; + DWORD size; + MSIFILEHASHINFO hash; +} hash_data[] = +{ + { "abc", 0, + { HASHSIZE, + { 0x98500190, 0xb04fd23c, 0x7d3f96d6, 0x727fe128 }, + }, + }, + + { "C:\\Program Files\\msitest\\caesar\n", 0, + { HASHSIZE, + { 0x2b566794, 0xfd42181b, 0x2514d6e4, 0x5768b4e2 }, + }, + }, + + { "C:\\Program Files\\msitest\\caesar\n", 500, + { HASHSIZE, + { 0x58095058, 0x805efeff, 0x10f3483e, 0x0147d653 }, + }, + }, +}; + +static void test_MsiGetFileHash(void) { const char name[] = "msitest.bin"; - const char data[] = {'a','b','c'}; - HANDLE handle; UINT r; - test_MSIFILEHASHINFO hash; - DWORD count = 0; + MSIFILEHASHINFO hash; + DWORD i; if (!pMsiGetFileHashA) + { + skip("MsiGetFileHash not implemented."); return; + } - DeleteFile(name); + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); - memset(&hash, 0, sizeof hash); - r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + /* szFilePath is NULL */ + r = pMsiGetFileHashA(NULL, 0, &hash); + todo_wine + { + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } - r = pMsiGetFileHashA(name, 0, NULL); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + /* szFilePath is empty */ + r = pMsiGetFileHashA("", 0, &hash); + todo_wine + { + ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); + } - memset(&hash, 0, sizeof hash); - hash.dwFileHashInfoSize = sizeof hash; + /* szFilePath is nonexistent */ r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_FILE_NOT_FOUND, "wrong error %d\n", r); - - handle = CreateFile(name, GENERIC_READ|GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_ARCHIVE, NULL); - ok(handle != INVALID_HANDLE_VALUE, "failed to create file\n"); + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - WriteFile(handle, data, sizeof data, &count, NULL); - CloseHandle(handle); + /* dwOptions is non-zero */ + r = pMsiGetFileHashA(name, 1, &hash); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - memset(&hash, 0, sizeof hash); + /* pHash.dwFileHashInfoSize is not correct */ + hash.dwFileHashInfoSize = 0; r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - memset(&hash, 0, sizeof hash); - hash.dwFileHashInfoSize = sizeof hash; - r = pMsiGetFileHashA(name, 1, &hash); - ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + /* pHash is NULL */ + r = pMsiGetFileHashA(name, 0, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - r = pMsiGetFileHashA(name, 0, &hash); - ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + for (i = 0; i < sizeof(hash_data) / sizeof(hash_data[0]); i++) + { + create_file(name, hash_data[i].data, hash_data[i].size); - ok(hash.dwFileHashInfoSize == sizeof hash, "hash size changed\n"); - ok(hash.dwData[0] == 0x98500190 && - hash.dwData[1] == 0xb04fd23c && - hash.dwData[2] == 0x7d3f96d6 && - hash.dwData[3] == 0x727fe128, "hash of abc incorrect\n"); + memset(&hash, 0, sizeof(MSIFILEHASHINFO)); + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); - DeleteFile(name); + r = pMsiGetFileHashA(name, 0, &hash); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!memcmp(&hash, &hash_data[i].hash, HASHSIZE), "Hash incorrect\n"); + + DeleteFile(name); + } } /* copied from dlls/msi/registry.c */ @@ -941,7 +989,7 @@ START_TEST(msi) test_usefeature(); test_null(); test_getcomponentpath(); - test_filehash(); + test_MsiGetFileHash(); test_MsiQueryProductState(); test_MsiQueryFeatureState(); test_MsiQueryComponentState();

1 0

James Hawkins : msi: Check the destination file' s hash and skip that file if the hash matches.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 4160722b07c4cdd98a46cbe93b7c059c395b8864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4160722b07c4cdd98a46cbe93… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:01:19 2007 -0600 msi: Check the destination file's hash and skip that file if the hash matches. --- dlls/msi/action.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msi/files.c | 22 ++++++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 5 +---- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3066308..89f7bd7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1394,6 +1394,41 @@ static LPWSTR folder_split_path(LPWSTR p, WCHAR ch) return p+1; } +static UINT load_file_hash(MSIPACKAGE *package, MSIFILE *file) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', + '`','M','s','i','F','i','l','e','H','a','s','h','`',' ', + 'W','H','E','R','E',' ','`','F','i','l','e','_','`',' ','=',' ','\'','%','s','\'',0}; + MSIQUERY *view = NULL; + MSIRECORD *row; + UINT r; + + TRACE("%s\n", debugstr_w(file->File)); + + r = MSI_OpenQuery(package->db, &view, query, file->File); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewExecute(view, NULL); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewFetch(view, &row); + if (r != ERROR_SUCCESS) + goto done; + + file->hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); + file->hash.dwData[0] = MSI_RecordGetInteger(row, 3); + file->hash.dwData[1] = MSI_RecordGetInteger(row, 4); + file->hash.dwData[2] = MSI_RecordGetInteger(row, 5); + file->hash.dwData[3] = MSI_RecordGetInteger(row, 6); + +done: + if (view) msiobj_release(&view->hdr); + return r; +} + static UINT load_file(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = (MSIPACKAGE*)param; @@ -1444,6 +1479,8 @@ static UINT load_file(MSIRECORD *row, LPVOID param) file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED; } + load_file_hash(package, file); + TRACE("File Loaded (%s)\n",debugstr_w(file->File)); list_add_tail( &package->files, &file->entry ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index c50e420..6662e4a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -733,6 +733,22 @@ static UINT copy_install_file(MSIFILE *file) return gle; } +static BOOL check_dest_hash_matches(MSIFILE *file) +{ + MSIFILEHASHINFO hash; + UINT r; + + if (!file->hash.dwFileHashInfoSize) + return FALSE; + + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); + r = MsiGetFileHashW(file->TargetPath, 0, &hash); + if (r != ERROR_SUCCESS) + return FALSE; + + return !memcmp(&hash, &file->hash, sizeof(MSIFILEHASHINFO)); +} + /* * ACTION_InstallFiles() * @@ -776,6 +792,12 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; + if (check_dest_hash_matches(file)) + { + TRACE("File hashes match, not overwriting\n"); + continue; + } + if (file->Sequence > mi->last_sequence || mi->is_continuous || (file->IsCompressed && !mi->is_extracted)) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4c7565b..d541260 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -424,6 +424,7 @@ typedef struct tagMSIFILE LPWSTR SourcePath; LPWSTR TargetPath; BOOL IsCompressed; + MSIFILEHASHINFO hash; } MSIFILE; typedef struct tagMSITEMPFILE diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 34fc126..fd8184b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3540,10 +3540,7 @@ static void test_missingcab(void) create_pf_data("msitest\\caesar", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");

1 0

James Hawkins : msi: Set the file contents of the file hash test file explicitly.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 6a6a21854888a51721da0a15ed2248698a9ed7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6a21854888a51721da0a15e… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:00:14 2007 -0600 msi: Set the file contents of the file hash test file explicitly. --- dlls/msi/tests/install.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b8817d9..34fc126 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -557,7 +557,7 @@ static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" "s72\ti2\ti4\ti4\ti4\ti4\n" "MsiFileHash\tFile_\n" - "caesar\t0\t1477005400\t-2141257985\t284379198\t21485139"; + "caesar\t0\t850433704\t-241429251\t675791761\t-1221108824"; typedef struct _msi_table { @@ -1100,24 +1100,26 @@ static BOOL get_program_files_dir(LPSTR buf, LPSTR buf2) return TRUE; } -static void create_file(const CHAR *name, DWORD size) +static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) { HANDLE file; - DWORD written, left; + DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, name, strlen(name), &written, NULL); - WriteFile(file, "\n", strlen("\n"), &written, NULL); + WriteFile(file, data, strlen(data), &written, NULL); - left = size - lstrlen(name) - 1; + if (size) + { + SetFilePointer(file, size, NULL, FILE_BEGIN); + SetEndOfFile(file); + } - SetFilePointer(file, left, NULL, FILE_CURRENT); - SetEndOfFile(file); - CloseHandle(file); } +#define create_file(name, size) create_file_data(name, name, size) + static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -3286,7 +3288,7 @@ static void test_adminprops(void) RemoveDirectory("msitest"); } -static void create_pf(LPCSTR file, BOOL is_file) +static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) { CHAR path[MAX_PATH]; @@ -3295,11 +3297,13 @@ static void create_pf(LPCSTR file, BOOL is_file) lstrcatA(path, file); if (is_file) - create_file(path, 500); + create_file_data(path, data, 500); else CreateDirectoryA(path, NULL); } +#define create_pf(file, is_file) create_pf_data(file, file, is_file) + static void test_removefiles(void) { UINT r; @@ -3533,7 +3537,7 @@ static void test_missingcab(void) create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); create_pf("msitest", FALSE); - create_pf("msitest\\caesar", TRUE); + create_pf_data("msitest\\caesar", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); todo_wine @@ -3547,7 +3551,7 @@ static void test_missingcab(void) ok(delete_pf("msitest", FALSE), "File not installed\n"); create_pf("msitest", FALSE); - create_pf("msitest\\caesar", TRUE); + create_pf_data("msitest\\caesar", "abcdefgh", TRUE); create_pf("msitest\\gaius", TRUE); r = MsiInstallProductA(msifile, "GAIUS=1");

1 0

James Hawkins : msi: Verify the szFilePath parameter of MsiGetFileHash.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: e10028893472cbc63489515222b5d7d67d505c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10028893472cbc6348951522… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 17:58:57 2007 -0600 msi: Verify the szFilePath parameter of MsiGetFileHash. --- dlls/msi/msi.c | 6 ++++++ dlls/msi/tests/msi.c | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7faccaf..72e52af 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2277,6 +2277,12 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, TRACE("%s %08x %p\n", debugstr_w(szFilePath), dwOptions, pHash ); + if (!szFilePath) + return ERROR_INVALID_PARAMETER; + + if (!*szFilePath) + return ERROR_PATH_NOT_FOUND; + if (dwOptions) return ERROR_INVALID_PARAMETER; if (!pHash) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 40de221..2e5dc85 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -287,17 +287,11 @@ static void test_MsiGetFileHash(void) /* szFilePath is NULL */ r = pMsiGetFileHashA(NULL, 0, &hash); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* szFilePath is empty */ r = pMsiGetFileHashA("", 0, &hash); - todo_wine - { - ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); - } + ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); /* szFilePath is nonexistent */ r = pMsiGetFileHashA(name, 0, &hash);

1 0

Vitaliy Margolen : dinput: Fix dead zone handling.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 1ed3a815edc0edca2c077a1a2795414fca187cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed3a815edc0edca2c077a1a2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 25 11:17:28 2007 -0700 dinput: Fix dead zone handling. --- dlls/dinput/joystick_linuxinput.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 18417fb..13e413b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -88,23 +88,30 @@ DWORD joystick_map_pov(POINTL *p) /* * This maps the read value (from the input event) to a value in the * 'wanted' range. + * Notes: + * Dead zone is in % multiplied by a 100 (range 0..10000) */ LONG joystick_map_axis(ObjProps *props, int val) { LONG ret; - LONG center = (props->lMax - props->lMin) / 2; + LONG dead_zone = MulDiv( props->lDeadZone, props->lDevMax - props->lDevMin, 10000 ); + LONG dev_range = props->lDevMax - props->lDevMin - dead_zone; - /* map the value from the hmin-hmax range into the wmin-wmax range */ - ret = MulDiv( val - props->lDevMin, props->lMax - props->lMin, - props->lDevMax - props->lDevMin ); + /* Center input */ + val -= (props->lDevMin + props->lDevMax) / 2; - if (abs( ret - center ) <= props->lDeadZone / 2 ) - ret = center; + /* Remove dead zone */ + if (abs( val ) <= dead_zone / 2) + val = 0; + else + val = val < 0 ? val + dead_zone / 2 : val - dead_zone / 2; - ret += props->lMin; + /* Scale and map the value from the device range into the required range */ + ret = MulDiv( val, props->lMax - props->lMin, dev_range ) + + (props->lMin + props->lMax) / 2; - TRACE( "(%d %d) -> (%d <%d> %d): val=%d ret=%d\n", - props->lDevMin, props->lDevMax, + TRACE( "(%d <%d> %d) -> (%d <%d> %d): val=%d ret=%d\n", + props->lDevMin, dead_zone, props->lDevMax, props->lMin, props->lDeadZone, props->lMax, val, ret );

1 0

Andrew Talbot : user32: Constify some variables.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: f394970edb6de42d1f8e63caf84f496a37638ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f394970edb6de42d1f8e63caf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 16:19:58 2007 +0000 user32: Constify some variables. --- dlls/user32/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3a93121..cb60ffc 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -216,7 +216,7 @@ const struct builtin_class_descr MENU_builtin_class = if (flags & (bit)) { flags &= ~(bit); MENUOUT ((text)); } \ } while (0) -static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp, +static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, const char *postfix) { static const char * const hbmmenus[] = { "HBMMENU_CALLBACK", "", "HBMMENU_SYSTEM", @@ -1095,7 +1095,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, * MENU_GetMaxPopupHeight */ static UINT -MENU_GetMaxPopupHeight(LPPOPUPMENU lppop) +MENU_GetMaxPopupHeight(const POPUPMENU *lppop) { if (lppop->cyMax) return lppop->cyMax; @@ -1268,7 +1268,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, * Draw scroll arrows. */ static void -MENU_DrawScrollArrows(LPPOPUPMENU lppop, HDC hdc) +MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc) { HDC hdcMem = CreateCompatibleDC(hdc); HBITMAP hOrigBitmap;

1 0

Andrew Talbot : comctl32: Fix a typo.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 04ff9664fd00ce7ce961557e5dbf3f7d1cf7a167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ff9664fd00ce7ce961557e5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 20:07:53 2007 +0000 comctl32: Fix a typo. --- dlls/comctl32/theme_combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index af6eee8..477138e 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -106,7 +106,7 @@ static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, const COMBOBOXINFO *c clipRegion=NULL; } - if (!IsWindowEnabled(hwnd) & WS_DISABLED) itemState |= ODS_DISABLED; + if (!IsWindowEnabled(hwnd)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid;

1 0

Andrew Talbot : comdlg32: Use logical OR not bitwise OR.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 3d5cc3b2e2176542afa0b5e0274523e7cd7050ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5cc3b2e2176542afa0b5e02… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:34:55 2007 +0000 comdlg32: Use logical OR not bitwise OR. --- dlls/comdlg32/filedlgbrowser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 11608f0..55ef65b 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -868,8 +868,8 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr ulAttr = SFGAO_HIDDEN | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR | SFGAO_LINK; IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr); - if( (ulAttr & SFGAO_HIDDEN) /* hidden */ - | !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */ + if( (ulAttr & SFGAO_HIDDEN) || /* hidden */ + !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */ return S_FALSE; /* always include directories and links */

1 0