wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Aric Stewart : winmm: Properly cleanup in return from proc_PlaySound if system sound is not found .
by Alexandre Julliard 02 Apr '09

02 Apr '09

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

Paul Vriens : shell32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard 02 Apr '09

02 Apr '09

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

Paul Vriens : kernel32: Fix creation of empty sections in ini files.
by Alexandre Julliard 02 Apr '09

02 Apr '09

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 02 Apr '09

02 Apr '09

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

Michael Stefaniuc : comctl32/tests: Use LONG instead of long.
by Alexandre Julliard 02 Apr '09

02 Apr '09

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

Vincent Povirk : ole32: When renaming a storage element, delete from the current iface.
by Alexandre Julliard 02 Apr '09

02 Apr '09

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

Rein Klazes : user32/tests: In sysparams fix another case where a test changes a users desktop setting .
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: ebbf99abce391fb08467616cf07d91c2256be780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbf99abce391fb08467616cf… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 2 11:37:13 2009 +0200 user32/tests: In sysparams fix another case where a test changes a users desktop setting. Made several tests pass on NT4 (no SP), Vista and Win2k8. --- dlls/user32/tests/sysparams.c | 53 ++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d7adfa4..165226a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -709,11 +709,15 @@ static void test_SPI_SETBORDER( void ) /* 6 */ BOOL rc; UINT old_border; NONCLIENTMETRICSA ncmsave; - INT CaptionWidth; + INT CaptionWidth, + PaddedBorderWidth; ncmsave.cbSize = sizeof( ncmsave); rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); - ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); + if( !rc) { + win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); + return; + } /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP). * Fix this so we can safely restore settings with the nonclientmetrics */ @@ -735,8 +739,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ if (!test_error_msg(rc,"SPI_{GET,SET}BORDER")) return; /* FIXME: include new PaddedBorderWidth parameter */ - if( old_border != ncmsave.iBorderWidth){ - win_skip( "Can not reliable restore border width yet\n"); + PaddedBorderWidth = ncmsave.iBorderWidth - old_border; + if( PaddedBorderWidth){ + win_skip( "Can not reliable restore border width yet (PaddedBorderWidth = %d)\n", + PaddedBorderWidth); return; } /* This will restore sane values if the test hang previous run. */ @@ -1395,6 +1401,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ Ncmstart.cbSize = sizeof(NONCLIENTMETRICSA); trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n"); + change_counter = 0; SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, FALSE ); if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) @@ -1448,7 +1455,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmcur) - /* test the systemm metrics with these settings */ + /* test the system metrics with these settings */ test_GetSystemMetrics(); /* now for something invalid: increase the {menu|caption|smcaption} fonts by a large amount will increase the {menu|caption|smcaption} height*/ @@ -1483,19 +1490,22 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ "SmCaptionHeight: %d expected %d\n", Ncmcur.iSmCaptionHeight, expect); ok( Ncmcur.iCaptionWidth == 8 || + Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ - "CaptionWidth: %d expected 8\n", Ncmcur.iCaptionWidth); + "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); ok( Ncmcur.iScrollWidth == 8, "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); ok( Ncmcur.iScrollHeight == 8, "ScrollHeight: %d expected 8\n", Ncmcur.iScrollHeight); - /* test the systemm metrics with these settings */ + /* test the system metrics with these settings */ test_GetSystemMetrics(); /* restore */ rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); test_change_message( SPI_SETNONCLIENTMETRICS, 0 ); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); + /* test the system metrics with these settings */ + test_GetSystemMetrics(); } static void test_SPI_SETMINIMIZEDMETRICS( void ) /* 44 */ @@ -2414,6 +2424,14 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETMOUSEBUTTONSWAP(); /* 33 */ test_SPI_SETFASTTASKSWITCH(); /* 36 */ test_SPI_SETDRAGFULLWINDOWS(); /* 37 */ + /* test_WM_DISPLAYCHANGE seems to be somewhat buggy on + * some versions of Windows (Vista, Win2k8, Win7B) in that + * not all metrics are properly restored. Problems are + * SM_CXMAXTRACK, SM_CYMAXTRACK + * Fortunately setting the Non-Client metrics like in + * test_SPI_SETNONCLIENTMETRICS will corect this. That is why + * we do the DISPLAY change now... */ + test_WM_DISPLAYCHANGE(); test_SPI_SETNONCLIENTMETRICS(); /* 42 */ test_SPI_SETMINIMIZEDMETRICS(); /* 44 */ test_SPI_SETICONMETRICS(); /* 46 */ @@ -2433,7 +2451,6 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETWHEELSCROLLCHARS(); /* 108 */ test_SPI_SETWALLPAPER(); /* 115 */ - test_WM_DISPLAYCHANGE(); SendMessageA( ghTestWnd, WM_DESTROY, 0, 0 ); return 0; @@ -2514,10 +2531,11 @@ static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; UINT IconSpacing, IconVerticalSpacing; + BOOL rc; HDC hdc = CreateIC( "Display", 0, 0, 0); UINT avcwCaption; - INT CaptionWidth; + INT CaptionWidthfromreg; MINIMIZEDMETRICS minim; NONCLIENTMETRICS ncm; SIZE screen; @@ -2525,11 +2543,14 @@ static void test_GetSystemMetrics( void) minim.cbSize = sizeof( minim); ncm.cbSize = sizeof( ncm); SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); - SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); - + rc = SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + if( !rc) { + win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); + return; + } /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP) */ - CaptionWidth = metricfromreg( + CaptionWidthfromreg = metricfromreg( "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); get_text_metr_size( hdc, &ncm.lfMenuFont, &tmMenuFont, NULL); get_text_metr_size( hdc, &ncm.lfCaptionFont, NULL, &avcwCaption); @@ -2573,8 +2594,8 @@ static void test_GetSystemMetrics( void) /* SM_RESERVED2 */ /* SM_RESERVED3 */ /* SM_RESERVED4 */ - ok_gsm( SM_CXMIN, 3 * max( CaptionWidth, 8) + GetSystemMetrics( SM_CYSIZE) + - 4 + 4 * avcwCaption + 2 * GetSystemMetrics( SM_CXFRAME)); + ok_gsm( SM_CXMIN, 3 * max( CaptionWidthfromreg >= 0 ? CaptionWidthfromreg : ncm.iCaptionWidth, 8) + + GetSystemMetrics( SM_CYSIZE) + 4 + 4 * avcwCaption + 2 * GetSystemMetrics( SM_CXFRAME)); ok_gsm( SM_CYMIN, GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME)); ok_gsm_2( SM_CXSIZE, @@ -2661,8 +2682,8 @@ static void test_GetSystemMetrics( void) ncm.iBorderWidth, ncm.iCaptionWidth, ncm.iCaptionHeight, IconSpacing, IconVerticalSpacing); trace( "MenuHeight %d MenuWidth %d ScrollHeight %d ScrollWidth %d SmCaptionHeight %d SmCaptionWidth %d\n", ncm.iMenuHeight, ncm.iMenuWidth, ncm.iScrollHeight, ncm.iScrollWidth, ncm.iSmCaptionHeight, ncm.iSmCaptionWidth); - trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d\n", - avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidth); + trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", + avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } ReleaseDC( 0, hdc); }

1 0

Henri Verbeet : wined3d: Store the source and destination parameter count in struct wined3d_shader_instruction .
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 7bde2792c2122704d7b89cbbe76c041461107fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bde2792c2122704d7b89cbbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Store the source and destination parameter count in struct wined3d_shader_instruction. --- dlls/wined3d/arb_program_shader.c | 2 ++ dlls/wined3d/baseshader.c | 6 ++++-- dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bf0c114..a30041e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1581,6 +1581,8 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; + tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; + tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; i++) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL)|(WINED3DSP_WRITEMASK_0<<i); tmp_ins.src[1] = ins->src[1]+i; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a8fe8c3..71c5420 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -845,7 +845,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, ins.coissue = opcode_token & WINED3DSI_COISSUE; /* Destination token */ - if (curOpcode->dst_token) + ins.dst_count = curOpcode->dst_token ? 1 : 0; + if (ins.dst_count) { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); @@ -857,7 +858,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) ins.predicate = *pToken++; /* Other source tokens */ - for (i = 0; i < (curOpcode->num_params - curOpcode->dst_token); ++i) + ins.src_count = curOpcode->num_params - curOpcode->dst_token; + for (i = 0; i < ins.src_count; ++i) { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 615b90e..72c07ea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1293,7 +1293,7 @@ void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instructi { DWORD mask = ins->dst & WINED3DSP_DSTMOD_MASK; - if (ins->opcode->dst_token && mask) + if (ins->dst_count && mask) { glsl_dst_param_t dst_param; @@ -1712,7 +1712,6 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { - CONST SHADER_OPCODE *curOpcode = ins->opcode; SHADER_BUFFER *buffer = ins->buffer; glsl_src_param_t src_param; const char *instruction; @@ -1741,12 +1740,13 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(", instruction); - if (curOpcode->num_params > 1) + if (ins->src_count) { shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param); shader_addline(buffer, "%s", src_param.param_str); - for (i = 2; i < curOpcode->num_params; ++i) { - shader_glsl_add_src_param(ins, ins->src[i-1], ins->src_addr[i-1], write_mask, &src_param); + for (i = 1; i < ins->src_count; ++i) + { + shader_glsl_add_src_param(ins, ins->src[i], ins->src_addr[i], write_mask, &src_param); shader_addline(buffer, ", %s", src_param.param_str); } } @@ -2076,6 +2076,8 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; + tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; + tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; ++i) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f557509..fe71327 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -464,6 +464,8 @@ struct wined3d_shader_instruction DWORD src[4]; DWORD src_addr[4]; SHADER_BUFFER *buffer; + UINT dst_count; + UINT src_count; }; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *);

1 0

Henri Verbeet : wined3d: Avoid comparing against WINED3DSIO_* in the ARB shader backend.
by Alexandre Julliard 02 Apr '09

02 Apr '09

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

Henri Verbeet : wined3d: Store the instruction handler index in struct wined3d_shader_instruction.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 44648b2b91fb01b2b2b1ab0140ce4a67c77913ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=44648b2b91fb01b2b2b1ab014… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Store the instruction handler index in struct wined3d_shader_instruction. This allows us to avoid comparing against WINED3DSIO_*, which is specific to the bytecode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 42 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44648b2b91fb01b2b2b1a…

1 0

← Newer
1
...
60
61
62
63
64
65
66
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009