April 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : ole32: When renaming a storage element, delete from the current iface.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 9c02fda4a920887ca1e2148f45808abbbd62c834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02fda4a920887ca1e2148f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 1 10:22:43 2009 -0500 ole32: When renaming a storage element, delete from the current iface. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9f3148b..2111b90 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -912,7 +912,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( * Invoke Destroy to get rid of the ole property and automatically redo * the linking of its previous and next members... */ - IStorage_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName); + IStorage_DestroyElement(iface, pwcsOldName); } else

1 0

Paul Vriens : kernel32: Fix creation of empty sections in ini files.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 9a10234ef2b5212ba44b82a797c478f190b4dad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a10234ef2b5212ba44b82a79… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 2 12:16:11 2009 +0200 kernel32: Fix creation of empty sections in ini files. --- dlls/kernel32/profile.c | 12 ++++++------ dlls/kernel32/tests/profile.c | 30 ++++++------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index d44e819..8a787da 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -202,9 +202,9 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING for ( ; section; section = section->next) { - int len = 4; + int len = 0; - if (section->name[0]) len += strlenW(section->name); + if (section->name[0]) len += strlenW(section->name) + 4; for (key = section->key; key; key = key->next) { @@ -216,15 +216,15 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING if (!buffer) return; p = buffer; - *p++ = '['; if (section->name[0]) { + *p++ = '['; strcpyW( p, section->name ); p += strlenW(p); + *p++ = ']'; + *p++ = '\r'; + *p++ = '\n'; } - *p++ = ']'; - *p++ = '\r'; - *p++ = '\n'; for (key = section->key; key; key = key->next) { diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 5120ec7..87c0a73 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -972,10 +972,7 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App3", "key5", "string5", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* lpString is NULL, key2 key is deleted */ data = "[App1]\r\n" @@ -987,10 +984,7 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App1", "key2", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* try to delete key2 again */ data = "[App1]\r\n" @@ -1002,10 +996,7 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App1", "key2", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* lpKeyName is NULL, App1 section is deleted */ data = "[App2]\r\n" @@ -1014,29 +1005,20 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App1", NULL, "string1", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* lpString is not needed to delete a section */ data = "[App3]\r\n" "key5=string5\r\n"; ret = WritePrivateProfileStringA("App2", NULL, NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* leave just the section */ data = "[App3]\r\n"; ret = WritePrivateProfileStringA("App3", "key5", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); }

1 0

Michael Stefaniuc : winecfg: Use ULONG for a bitmask variable.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: e09fc21576e51de84d8bdbf993523decca144175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09fc21576e51de84d8bdbf99… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 2 12:05:35 2009 +0200 winecfg: Use ULONG for a bitmask variable. --- programs/winecfg/drive.c | 6 +++--- programs/winecfg/drivedetect.c | 2 +- programs/winecfg/driveui.c | 2 +- programs/winecfg/winecfg.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 9e6077c..1afeced 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -72,9 +72,9 @@ static inline int letter_to_index(char letter) * so the edit dialog can display the currently used drive letter * alongside the available ones. */ -long drive_available_mask(char letter) +ULONG drive_available_mask(char letter) { - long result = 0; + ULONG result = 0; int i; WINE_TRACE("\n"); @@ -89,7 +89,7 @@ long drive_available_mask(char letter) result = ~result; if (letter) result |= DRIVE_MASK_BIT(letter); - WINE_TRACE("finished drive letter loop with %lx\n", result); + WINE_TRACE("finished drive letter loop with %x\n", result); return result; } diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 178520b..8e55f56 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); BOOL gui_mode = TRUE; -static long working_mask = 0; +static ULONG working_mask = 0; typedef struct { diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index acad07a..de54f21 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -300,7 +300,7 @@ static void on_add_click(HWND dialog) then invoke the directory chooser dialog. */ char new = 'C'; /* we skip A and B, they are historically floppy drives */ - long mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */ + ULONG mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */ int i, c; while (mask & (1 << (new - 'A'))) diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index dcfb64d..d730d84 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -107,7 +107,7 @@ struct drive #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A')) -long drive_available_mask(char letter); +ULONG drive_available_mask(char letter); BOOL add_drive(char letter, const char *targetpath, const char *device, const WCHAR *label, DWORD serial, DWORD type); void delete_drive(struct drive *pDrive);

1 0

Paul Vriens : shell32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 22a48d67407f7bf74c2ae4151f486d5ac6eecfe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a48d67407f7bf74c2ae4151… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 2 14:47:03 2009 +0200 shell32/tests: Fix a test failure on Vista and higher. --- dlls/shell32/tests/shellpath.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bf4e4ae..302448e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" +#include "initguid.h" #include "wine/test.h" /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want @@ -537,7 +538,7 @@ static void matchSpecialFolderPathToEnv(int folder, const char *envVar) * fail if it isn't--that check should already have been done. * Fails if the returned PIDL is a GUID whose value does not match guid. */ -static void matchGUID(int folder, const GUID *guid) +static void matchGUID(int folder, const GUID *guid, const GUID *guid_alt) { LPITEMIDLIST pidl; HRESULT hr; @@ -555,11 +556,18 @@ static void matchGUID(int folder, const GUID *guid) pidlLast->mkid.abID[0] == PT_GUID)) { GUID *shellGuid = (GUID *)(pidlLast->mkid.abID + 2); - char shellGuidStr[39], guidStr[39]; - - ok(IsEqualIID(shellGuid, guid), - "%s: got GUID %s, expected %s\n", getFolderName(folder), - printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr)); + char shellGuidStr[39], guidStr[39], guid_altStr[39]; + + if (!guid_alt) + ok(IsEqualIID(shellGuid, guid), + "%s: got GUID %s, expected %s\n", getFolderName(folder), + printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr)); + else + ok(IsEqualIID(shellGuid, guid) || + IsEqualIID(shellGuid, guid_alt), + "%s: got GUID %s, expected %s or %s\n", getFolderName(folder), + printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr), + printGUID(guid_alt, guid_altStr)); } IMalloc_Free(pMalloc, pidl); } @@ -581,16 +589,19 @@ static void testPidlTypes(void) TRUE); } +/* FIXME: Should be in shobjidl.idl */ +DEFINE_GUID(CLSID_NetworkExplorerFolder, 0xF02C1A0D, 0xBE21, 0x4350, 0x88, 0xB0, 0x73, 0x67, 0xFC, 0x96, 0xEF, 0x3C); + /* Verifies various shell virtual folders have the correct well-known GUIDs. */ static void testGUIDs(void) { - matchGUID(CSIDL_BITBUCKET, &CLSID_RecycleBin); - matchGUID(CSIDL_CONTROLS, &CLSID_ControlPanel); - matchGUID(CSIDL_DRIVES, &CLSID_MyComputer); - matchGUID(CSIDL_INTERNET, &CLSID_Internet); - matchGUID(CSIDL_NETWORK, &CLSID_NetworkPlaces); - matchGUID(CSIDL_PERSONAL, &CLSID_MyDocuments); - matchGUID(CSIDL_COMMON_DOCUMENTS, &CLSID_CommonDocuments); + matchGUID(CSIDL_BITBUCKET, &CLSID_RecycleBin, NULL); + matchGUID(CSIDL_CONTROLS, &CLSID_ControlPanel, NULL); + matchGUID(CSIDL_DRIVES, &CLSID_MyComputer, NULL); + matchGUID(CSIDL_INTERNET, &CLSID_Internet, NULL); + matchGUID(CSIDL_NETWORK, &CLSID_NetworkPlaces, &CLSID_NetworkExplorerFolder); /* Vista and higher */ + matchGUID(CSIDL_PERSONAL, &CLSID_MyDocuments, NULL); + matchGUID(CSIDL_COMMON_DOCUMENTS, &CLSID_CommonDocuments, NULL); } /* Verifies various shell paths match the environment variables to which they

1 0

Aric Stewart : winmm: SND_ALIAS and SND_ALIAS_ID overlap so when checking for SND_ALIAS_ID make sure it is SND_ALIAS_ID and not SND_ALIAS .
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 7e8e9c41e9b566c0a4045ec54425800cbc375132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8e9c41e9b566c0a4045ec54… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 2 08:32:59 2009 -0500 winmm: SND_ALIAS and SND_ALIAS_ID overlap so when checking for SND_ALIAS_ID make sure it is SND_ALIAS_ID and not SND_ALIAS. --- dlls/winmm/playsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index bdd12fd..b8d1b71 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -310,7 +310,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } else if (wps->fdwSound & SND_ALIAS) { - if (wps->fdwSound & SND_ALIAS_ID) + if ((wps->fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { static const WCHAR wszSystemAsterisk[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; static const WCHAR wszSystemDefault[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t',0};

1 0

Michael Stefaniuc : comctl32/tests: Use LONG instead of long.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 1513dd2073576508935de88767d752b10010bdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1513dd2073576508935de8876… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 2 12:04:50 2009 +0200 comctl32/tests: Use LONG instead of long. --- dlls/comctl32/tests/datetime.c | 2 +- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/listview.c | 6 +++--- dlls/comctl32/tests/monthcal.c | 4 ++-- dlls/comctl32/tests/tab.c | 4 ++-- dlls/comctl32/tests/trackbar.c | 4 ++-- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/tests/updown.c | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index caef276..8fdbbe5 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -140,7 +140,7 @@ struct subclass_info static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index ec73803..7661253 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -404,7 +404,7 @@ struct subclass_info static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -425,7 +425,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f7b34af..9157ec0 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -153,7 +153,7 @@ struct subclass_info static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -217,7 +217,7 @@ static HWND create_parent_window(void) static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -300,7 +300,7 @@ static HWND create_custom_listview_control(DWORD style) static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f116da5..1ca1997 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -378,7 +378,7 @@ static void test_monthcal(void) static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -456,7 +456,7 @@ static HWND create_parent_window(void) static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 7cee79d..3bf6894 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -310,7 +310,7 @@ create_tabcontrol (DWORD style, DWORD mask) static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -378,7 +378,7 @@ struct subclass_info static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index e2a3c76..d94ffe9 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -392,7 +392,7 @@ struct subclass_info }; static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam){ - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -453,7 +453,7 @@ static HWND create_parent_window(void){ static LRESULT WINAPI trackbar_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam){ struct subclass_info *info = (struct subclass_info *) GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 9ef6a99..5f310b5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -665,7 +665,7 @@ static void TestGetSet(void) /* This function hooks in and records all messages to the treeview control */ static LRESULT WINAPI TreeviewWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; WNDPROC lpOldProc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 2d6d437..433c190 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -193,7 +193,7 @@ static const struct message test_updown_destroy_seq[] = { static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -262,7 +262,7 @@ struct subclass_info static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -310,7 +310,7 @@ static HWND create_edit_control(void) static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg;

1 0

Aric Stewart : winmm: Properly cleanup in return from proc_PlaySound if system sound is not found .
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: c08b0a0a9d99393930f1869663e97b14b755dd2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08b0a0a9d99393930f186966… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 2 08:21:16 2009 -0500 winmm: Properly cleanup in return from proc_PlaySound if system sound is not found. Prevents hanging in Outlook 2000 on sound cleanup. --- dlls/winmm/playsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 143f4a9..bdd12fd 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -338,7 +338,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) wps->pszSound = wszSystemStart; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMWELCOME) wps->pszSound = wszSystemWelcome; - else return FALSE; + else goto errCleanUp; } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); }

1 0

Henri Verbeet : wined3d: Avoid comparing against WINED3DSIO_* in the ARB shader backend.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: d633b6d47e03b43b64317301fc21de251daa7958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d633b6d47e03b43b64317301f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Avoid comparing against WINED3DSIO_* in the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 111 ++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4eee164..bf0c114 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -907,33 +907,33 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) char arguments[256]; unsigned int i; - switch (curOpcode->opcode) + switch (ins->handler_idx) { - case WINED3DSIO_ABS: instruction = "ABS"; break; - case WINED3DSIO_ADD: instruction = "ADD"; break; - case WINED3DSIO_CRS: instruction = "XPD"; break; - case WINED3DSIO_DP3: instruction = "DP3"; break; - case WINED3DSIO_DP4: instruction = "DP4"; break; - case WINED3DSIO_DST: instruction = "DST"; break; - case WINED3DSIO_EXP: instruction = "EX2"; break; - case WINED3DSIO_EXPP: instruction = "EXP"; break; - case WINED3DSIO_FRC: instruction = "FRC"; break; - case WINED3DSIO_LIT: instruction = "LIT"; break; - case WINED3DSIO_LOG: instruction = "LG2"; break; - case WINED3DSIO_LOGP: instruction = "LOG"; break; - case WINED3DSIO_LRP: instruction = "LRP"; break; - case WINED3DSIO_MAD: instruction = "MAD"; break; - case WINED3DSIO_MAX: instruction = "MAX"; break; - case WINED3DSIO_MIN: instruction = "MIN"; break; - case WINED3DSIO_MOV: instruction = "MOV"; break; - case WINED3DSIO_MUL: instruction = "MUL"; break; - case WINED3DSIO_NOP: instruction = "NOP"; break; - case WINED3DSIO_POW: instruction = "POW"; break; - case WINED3DSIO_SGE: instruction = "SGE"; break; - case WINED3DSIO_SLT: instruction = "SLT"; break; - case WINED3DSIO_SUB: instruction = "SUB"; break; + case WINED3DSIH_ABS: instruction = "ABS"; break; + case WINED3DSIH_ADD: instruction = "ADD"; break; + case WINED3DSIH_CRS: instruction = "XPD"; break; + case WINED3DSIH_DP3: instruction = "DP3"; break; + case WINED3DSIH_DP4: instruction = "DP4"; break; + case WINED3DSIH_DST: instruction = "DST"; break; + case WINED3DSIH_EXP: instruction = "EX2"; break; + case WINED3DSIH_EXPP: instruction = "EXP"; break; + case WINED3DSIH_FRC: instruction = "FRC"; break; + case WINED3DSIH_LIT: instruction = "LIT"; break; + case WINED3DSIH_LOG: instruction = "LG2"; break; + case WINED3DSIH_LOGP: instruction = "LOG"; break; + case WINED3DSIH_LRP: instruction = "LRP"; break; + case WINED3DSIH_MAD: instruction = "MAD"; break; + case WINED3DSIH_MAX: instruction = "MAX"; break; + case WINED3DSIH_MIN: instruction = "MIN"; break; + case WINED3DSIH_MOV: instruction = "MOV"; break; + case WINED3DSIH_MUL: instruction = "MUL"; break; + case WINED3DSIH_NOP: instruction = "NOP"; break; + case WINED3DSIH_POW: instruction = "POW"; break; + case WINED3DSIH_SGE: instruction = "SGE"; break; + case WINED3DSIH_SLT: instruction = "SLT"; break; + case WINED3DSIH_SUB: instruction = "SUB"; break; default: instruction = ""; - FIXME("Unhandled opcode %s\n", curOpcode->name); + FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; } @@ -1018,12 +1018,12 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if ((WINED3DSHADER_VERSION_MAJOR(ins->reg_maps->shader_version) == 1 && !shader_is_pshader_version(ins->reg_maps->shader_version) && shader_get_regtype(ins->dst) == WINED3DSPR_ADDR) - || ins->opcode->opcode == WINED3DSIO_MOVA) + || ins->handler_idx == WINED3DSIH_MOVA) { SHADER_BUFFER *buffer = ins->buffer; char src0_param[256]; - if (ins->opcode->opcode == WINED3DSIO_MOVA) + if (ins->handler_idx == WINED3DSIH_MOVA) FIXME("mova should round\n"); src0_param[0] = '\0'; @@ -1271,7 +1271,7 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, reg_dest_code, reg_coord, "TMP", FALSE, FALSE); - if (ins->opcode->opcode == WINED3DSIO_TEXBEML && has_luminance) + if (ins->handler_idx == WINED3DSIH_TEXBEML && has_luminance) { shader_addline(buffer, "MAD TMP, T%u.z, luminance%d.x, luminance%d.y;\n", src, reg_dest_code, reg_dest_code); @@ -1554,30 +1554,30 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) tmp_ins.src_addr[1] = ins->src_addr[1]; tmp_ins.reg_maps = ins->reg_maps; - switch(ins->opcode->opcode) + switch(ins->handler_idx) { - case WINED3DSIO_M4x4: - nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); - break; - case WINED3DSIO_M4x3: - nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); - break; - case WINED3DSIO_M3x4: - nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); - break; - case WINED3DSIO_M3x3: - nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); - break; - case WINED3DSIO_M3x2: - nComponents = 2; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); - break; - default: - break; + case WINED3DSIH_M4x4: + nComponents = 4; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + break; + case WINED3DSIH_M4x3: + nComponents = 3; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + break; + case WINED3DSIH_M3x4: + nComponents = 4; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + break; + case WINED3DSIH_M3x3: + nComponents = 3; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + break; + case WINED3DSIH_M3x2: + nComponents = 2; + tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + break; + default: + break; } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; @@ -1590,7 +1590,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { - CONST SHADER_OPCODE *curOpcode = ins->opcode; SHADER_BUFFER *buffer = ins->buffer; DWORD dst = ins->dst; DWORD src = ins->src[0]; @@ -1599,12 +1598,12 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) char tmpLine[256]; - switch(curOpcode->opcode) + switch(ins->handler_idx) { - case WINED3DSIO_RSQ: instruction = "RSQ"; break; - case WINED3DSIO_RCP: instruction = "RCP"; break; + case WINED3DSIH_RSQ: instruction = "RSQ"; break; + case WINED3DSIH_RCP: instruction = "RCP"; break; default: instruction = ""; - FIXME("Unhandled opcode %s\n", curOpcode->name); + FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; }

1 0

Vincent Povirk : gdiplus: GdipDrawString: Handle either a width or height of 0 sanely.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 0879b767aef1d295083dcb448fcc63ef2c00364b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879b767aef1d295083dcb448… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 1 14:08:12 2009 -0500 gdiplus: GdipDrawString: Handle either a width or height of 0 sanely. Based on Aric's recent patch. --- dlls/gdiplus/graphics.c | 27 ++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5d1cbd6..2a98ee5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2011,20 +2011,35 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); - if(roundr(rect->Width) == 0 && roundr(rect->Height) == 0){ - rel_width = rel_height = 1.0; - nwidth = nheight = INT_MAX; + if (roundr(rect->Width) == 0) + { + rel_width = 1.0; + nwidth = INT_MAX; } - else{ + else + { rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) / rect->Width; + nwidth = roundr(rel_width * rect->Width); + } + + if (roundr(rect->Height) == 0) + { + rel_height = 1.0; + nheight = INT_MAX; + } + else + { rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) / rect->Height; - - nwidth = roundr(rel_width * rect->Width); nheight = roundr(rel_height * rect->Height); + } + + if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) + { + /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); SelectClipRgn(graphics->hdc, rgn); } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8091a9a..7199151 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -935,6 +935,57 @@ static void test_textcontrast(void) ReleaseDC(0, hdc); } +static void test_GdipDrawString(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpFont *fnt = NULL; + RectF rect; + GpStringFormat *format; + GpBrush *brush; + LOGFONTA logfont; + HDC hdc = GetDC(0); + static const WCHAR string[] = {'T','e','s','t',0}; + + memset(&logfont,0,sizeof(logfont)); + strcpy(logfont.lfFaceName,"Arial"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateFontFromLogfontA(hdc, &logfont, &fnt); + if (status == FileNotFound) + { + skip("Arial not installed.\n"); + return; + } + expect(Ok, status); + + status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush); + expect(Ok, status); + + status = GdipCreateStringFormat(0,0,&format); + expect(Ok, status); + + rect.X = 0; + rect.Y = 0; + rect.Width = 0; + rect.Height = 12; + + status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush(brush); + GdipDeleteFont(fnt); + GdipDeleteStringFormat(format); + + ReleaseDC(0, hdc); +} + + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -954,6 +1005,7 @@ START_TEST(graphics) test_GdipDrawArcI(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_GdipDrawString(); test_Get_Release_DC(); test_transformpoints(); test_get_set_clip();

1 0

Jacek Caban : urlmon: Register CLSID_DeCompMimeFilter.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: eb32e9ec1a1da37a81c99ca162251ade3408abf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb32e9ec1a1da37a81c99ca16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 00:16:31 2009 +0200 urlmon: Register CLSID_DeCompMimeFilter. --- dlls/urlmon/regsvr.c | 23 ++++++++++++----------- dlls/urlmon/urlmon.inf | 21 ++++++++++++++++++--- include/urlmon.idl | 1 + 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 2728ced..9561a23 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -513,10 +513,10 @@ static struct regsvr_interface const interface_list[] = { #define INF_SET_CLSID(clsid) \ do \ { \ - static CHAR name[] = "CLSID_" #clsid; \ + static CHAR name[] = #clsid; \ \ pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ + clsids[i++] = &clsid; \ } while (0) static HRESULT register_inf(BOOL doregister) @@ -525,19 +525,20 @@ static HRESULT register_inf(BOOL doregister) HMODULE hAdvpack; HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; - STRENTRYA pse[7]; - static CLSID const *clsids[34]; + STRENTRYA pse[8]; + static CLSID const *clsids[8]; unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - INF_SET_CLSID(CdlProtocol); - INF_SET_CLSID(FileProtocol); - INF_SET_CLSID(FtpProtocol); - INF_SET_CLSID(GopherProtocol); - INF_SET_CLSID(HttpProtocol); - INF_SET_CLSID(HttpSProtocol); - INF_SET_CLSID(MkProtocol); + INF_SET_CLSID(CLSID_CdlProtocol); + INF_SET_CLSID(CLSID_FileProtocol); + INF_SET_CLSID(CLSID_FtpProtocol); + INF_SET_CLSID(CLSID_GopherProtocol); + INF_SET_CLSID(CLSID_HttpProtocol); + INF_SET_CLSID(CLSID_HttpSProtocol); + INF_SET_CLSID(CLSID_MkProtocol); + INF_SET_CLSID(CLSID_DeCompMimeFilter); for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { pse[i].pszValue = heap_alloc(39); diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf index efdf4ef..63d88c4 100644 --- a/dlls/urlmon/urlmon.inf +++ b/dlls/urlmon/urlmon.inf @@ -3,11 +3,19 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg [UnregisterDll] -DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg + + +[Classes.Reg] + +;; CLSID_DeCompMimeFilter +HKCR,"CLSID\%CLSID_DeCompMimeFilter%",,,"AP lzdhtml encoding/decoding Filter" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32","ThreadingModel",,"Apartment" [Protocols.Reg] @@ -26,7 +34,12 @@ HKCR,"PROTOCOLS\Handler\http","CLSID",,"%CLSID_HttpProtocol%" HKCR,"PROTOCOLS\Handler\https",,,"https: Asynchronous Pluggable Protocol Handler" HKCR,"PROTOCOLS\Handler\https","CLSID",,"%CLSID_HttpsProtocol%" HKCR,"PROTOCOLS\Handler\mk",,,"mk: Asynchronous Pluggable Protocol Handler" -HKCR,"PROTOCOLS\Handler\mk","CLSID",,"%CLSID_MkProtocol%" +HKCR,"PROTOCOLS\Filter\deflate",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\deflate","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\gzip",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\gzip","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\lzdhtml",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\lzdhtml","CLSID",,"%CLSID_DeCompMimeFilter%" [ZoneMap.Reg] @@ -448,6 +461,8 @@ HKLM,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000 [Strings] +MODULE="urlmon.dll" + PATH_ZONEMAP="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap" PATH_ZONEMAP_PROTOCOLS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\ProtocolDefaults" PATH_ZONEMAP_DOMAINS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains" diff --git a/include/urlmon.idl b/include/urlmon.idl index 1244ca4..93bdd0f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1521,6 +1521,7 @@ cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(IID_IAsyncBindCtx, 0x79EAC9D4, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(CLSID_StdURLMoniker, 0x79EAC9E0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") +cpp_quote("DEFINE_GUID(CLSID_DeCompMimeFilter, 0x8f6b0360, 0xb80d, 0x11d0, 0xa9,0xb3, 0x00,0x60,0x97,0x94,0x23,0x11);") cpp_quote("DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02);") cpp_quote("DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);")

1 0