September 2008 - Wine-commits

Dmitry Timoshkov : user32: Fix the work area test to pass on Windows when the taskbar is on top.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 077cd6a9f5ecded0681098d6d89026a98983fe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077cd6a9f5ecded0681098d6d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 11 13:38:21 2008 +0900 user32: Fix the work area test to pass on Windows when the taskbar is on top. --- dlls/user32/tests/monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 65d922e..a66868f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -360,7 +360,7 @@ static void test_work_area(void) wp.ptMaxPosition.x, wp.ptMaxPosition.y, wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); - OffsetRect(&rc_normal, -rc_work.left, -rc_work.top); + OffsetRect(&wp.rcNormalPosition, rc_work.left, rc_work.top); if (!EqualRect(&mi.rcMonitor, &mi.rcWork)) /* FIXME: remove once Wine is fixed */ todo_wine ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); else

1 0

Alexandre Julliard : mstask/tests: Use case-insensitive compare for file names.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 67a25b57fb61e1e3ee4bf738e2b78971e32bc30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a25b57fb61e1e3ee4bf738e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 11:49:27 2008 +0200 mstask/tests: Use case-insensitive compare for file names. --- dlls/mstask/tests/task.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 7cb7673..46635ae 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -121,7 +121,7 @@ static void test_SetApplicationName_GetApplicationName(void) ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - ok(!lstrcmpW(stored_name, empty), + ok(!lstrcmpiW(stored_name, empty), "Got %s, expected empty string\n", dbgstr_w(stored_name)); CoTaskMemFree(stored_name); } @@ -136,7 +136,7 @@ static void test_SetApplicationName_GetApplicationName(void) if (hres == S_OK) { full_name = path_resolve_name(non_application_name); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -151,7 +151,7 @@ static void test_SetApplicationName_GetApplicationName(void) if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -165,7 +165,7 @@ static void test_SetApplicationName_GetApplicationName(void) if (hres == S_OK) { full_name = path_resolve_name(notepad); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -181,7 +181,7 @@ static void test_SetApplicationName_GetApplicationName(void) if (hres == S_OK) { full_name = path_resolve_name(non_application_name); - ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -193,7 +193,7 @@ static void test_SetApplicationName_GetApplicationName(void) ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - ok(!lstrcmpW(stored_name, empty), + ok(!lstrcmpiW(stored_name, empty), "Got %s, expected empty string\n", dbgstr_w(stored_name)); CoTaskMemFree(stored_name); }

1 0

Rob Shearman : widl: Remove redundant code.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: e0dd72162ac1c7ba0eb8856e1c8fd5ce2a1410be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dd72162ac1c7ba0eb8856e1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 10 22:31:39 2008 +0100 widl: Remove redundant code. dispinterfaces now have a type of RPC_FC_IP instead of 0, so this code will never be reached. --- tools/widl/write_msft.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 28a74f2..30ed251 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1005,10 +1005,7 @@ static int encode_type( add_coclass_typeinfo(typelib, type); break; case 0: - if (type->kind == TKIND_DISPATCH) - add_dispinterface_typeinfo(typelib, type); - else - error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); + error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); break; default: error("encode_type: VT_USERDEFINED - unhandled type %d\n", type->type);

1 0

Roy Shea : shell32: Use default system icons if PrivateExtractIconsW in SHGetFileInfoW fails.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 5b6806922aedc00e445f009389b2832c5da690ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6806922aedc00e445f00938… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Sep 10 14:33:02 2008 -0700 shell32: Use default system icons if PrivateExtractIconsW in SHGetFileInfoW fails. --- dlls/shell32/shell32_main.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 9c400e4..a0d3fe7 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -596,18 +596,22 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } else { - IconNotYetLoaded=FALSE; + UINT ret; if (flags & SHGFI_SMALLICON) - PrivateExtractIconsW( sTemp,icon_idx, + ret = PrivateExtractIconsW( sTemp,icon_idx, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), &psfi->hIcon, 0, 1, 0); else - PrivateExtractIconsW( sTemp, icon_idx, + ret = PrivateExtractIconsW( sTemp, icon_idx, GetSystemMetrics( SM_CXICON), GetSystemMetrics( SM_CYICON), &psfi->hIcon, 0, 1, 0); - psfi->iIcon = icon_idx; + if (ret != 0 && ret != 0xFFFFFFFF) + { + IconNotYetLoaded=FALSE; + psfi->iIcon = icon_idx; + } } } }

1 0

Dmitry Timoshkov : winex11.drv: Fix the scan codes keypad keys section to match the vkeys one.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 73569a95c19cdb5d6231730ac0df703c72d6111f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73569a95c19cdb5d6231730ac… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 11 11:59:32 2008 +0900 winex11.drv: Fix the scan codes keypad keys section to match the vkeys one. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index bf399c9..fe0e840 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1063,7 +1063,7 @@ static const WORD nonchar_key_scan[256] = /*?*/ 0, /*?*/ 0, 0x38, 0x146, 0x00, 0x00, 0x00, 0x00, /* FF68 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF70 */ /* keypad keys */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x138, 0x145, /* FF78 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x145, /* FF78 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF80 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x11C, 0x00, 0x00, /* FF88 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x4B, 0x48, /* FF90 */

1 0

Dmitry Timoshkov : kernel32: Use a kernel error code.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 4d672ba090bc6d6d6f66cffce09ec0e1ad2167bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d672ba090bc6d6d6f66cffce… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 11 12:55:09 2008 +0900 kernel32: Use a kernel error code. --- dlls/kernel32/tests/profile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 9cccac2..8a3e83b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -183,13 +183,14 @@ static void test_profile_sections(void) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* And a real one */ + SetLastError(0xdeadbeef); ret=GetPrivateProfileSectionA("section1", buf, sizeof(buf), testfile4); for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) p[-1] = ','; ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", ret, buf); ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - ok( GetLastError() == S_OK, "expected S_OK, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", GetLastError()); DeleteFileA( testfile4 ); }

1 0

Dmitry Timoshkov : winedevice: Wine PE loader is able to resolve forwards to not yet loaded modules.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: a2a3c59a45c1f849ced2ed8901e04cdbfa4b7df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a3c59a45c1f849ced2ed890… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 11 13:00:40 2008 +0900 winedevice: Wine PE loader is able to resolve forwards to not yet loaded modules. --- programs/winedevice/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index d48017a..5a1ba99 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -186,9 +186,6 @@ static BOOL load_driver(void) HeapFree( GetProcessHeap(), 0, str ); if (!path) return FALSE; - /* make sure msvcrt is loaded to resolve the ntoskrnl.exe forwards */ - LoadLibraryA( "msvcrt.dll" ); - /* GameGuard uses an NT-style path name */ str = path; if (!strncmpW( path, ntprefixW, 4 )) str += 4;

1 0

Juan Lang : user32: Return error if memory allocation fails. Fixes Coverity id 115.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 1a5374065fe31e4a1363d5bd25c6e998d387e2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5374065fe31e4a1363d5bd2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 10 10:14:13 2008 -0700 user32: Return error if memory allocation fails. Fixes Coverity id 115. --- dlls/user32/listbox.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index ee326c6..0c24e71 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2658,6 +2658,8 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + else + return LB_ERRSPACE; } wParam = LISTBOX_FindStringPos( descr, textW, FALSE ); ret = LISTBOX_InsertString( descr, wParam, textW ); @@ -2682,6 +2684,8 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + else + return LB_ERRSPACE; } ret = LISTBOX_InsertString( descr, wParam, textW ); if(!unicode && HAS_STRINGS(descr)) @@ -2704,6 +2708,8 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + else + return LB_ERRSPACE; } wParam = LISTBOX_FindFileStrPos( descr, textW ); ret = LISTBOX_InsertString( descr, wParam, textW );

1 0

Juan Lang : riched20: Use helper function rather than goto to return found position.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: fb30d61c97641c82b2a5dc2e130bd951709f5f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb30d61c97641c82b2a5dc2e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 10 11:08:46 2008 -0700 riched20: Use helper function rather than goto to return found position. --- dlls/riched20/caret.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 376318e..1780bc0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -889,6 +889,23 @@ static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, return para; } +static BOOL ME_ReturnFoundPos(ME_TextEditor *editor, ME_DisplayItem *found, + ME_Cursor *result, int rx, BOOL isExact) +{ + assert(found); + assert(found->type == diRun); + if ((found->member.run.nFlags & MERF_ENDPARA) || rx < 0) + rx = 0; + result->pRun = found; + result->nOffset = ME_CharFromPointCursor(editor, rx, &found->member.run); + if (editor->pCursors[0].nOffset == found->member.run.strText->nLen && rx) + { + result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); + result->nOffset = 0; + } + return isExact; +} + /* Finds the run and offset from the pixel position. * * x & y are pixel positions in virtual coordinates into the rich edit control, @@ -963,34 +980,21 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, case diRun: rx = x - p->member.run.pt.x; if (rx < p->member.run.nWidth) - { - found_here: - assert(p->type == diRun); - if ((p->member.run.nFlags & MERF_ENDPARA) || rx < 0) - rx = 0; - result->pRun = p; - result->nOffset = ME_CharFromPointCursor(editor, rx, &p->member.run); - if (editor->pCursors[0].nOffset == p->member.run.strText->nLen && rx) - { - result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); - result->nOffset = 0; - } - return isExact; - } + return ME_ReturnFoundPos(editor, p, result, rx, isExact); break; case diStartRow: isExact = FALSE; p = ME_FindItemFwd(p, diRun); if (is_eol) *is_eol = 1; rx = 0; /* FIXME not sure */ - goto found_here; + return ME_ReturnFoundPos(editor, p, result, rx, isExact); case diCell: case diParagraph: case diTextEnd: isExact = FALSE; rx = 0; /* FIXME not sure */ p = last; - goto found_here; + return ME_ReturnFoundPos(editor, p, result, rx, isExact); default: assert(0); } last = p;

1 0

Juan Lang : crypt32: Don't set salt's cbData unless allocation succeeds. Fixes Coverity id 133.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: c958a71df9b5dfe0292de8608219baffb6e0e196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c958a71df9b5dfe0292de8608… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 10 09:39:23 2008 -0700 crypt32: Don't set salt's cbData unless allocation succeeds. Fixes Coverity id 133. --- dlls/crypt32/protectdata.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index d3e0034..d86dd8e 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -607,8 +607,7 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, pInfo->hash_len=CRYPT32_PROTECTDATA_HASH_LEN; /* allocate memory to hold a salt */ - pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN; - if ((pInfo->salt.pbData=CryptMemAlloc(pInfo->salt.cbData))) + if ((pInfo->salt.pbData=CryptMemAlloc(CRYPT32_PROTECTDATA_SALT_LEN))) { /* generate random salt */ if (!CryptGenRandom(hProv, pInfo->salt.cbData, pInfo->salt.pbData)) @@ -617,6 +616,7 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, free_protect_data(pInfo); return FALSE; } + pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN; } /* debug: show our salt */

1 0