wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Rob Shearman : ole32: In 16-bit OLE, LPOLESTR uses multibyte, not Unicode characters so make LoadTypeLib16 take an LPSTR instead of LPOLESTR .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 15a1723c1a504b5e3e5da913bd8b6e36581e8a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a1723c1a504b5e3e5da913b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 19:54:54 2007 +0100 ole32: In 16-bit OLE, LPOLESTR uses multibyte, not Unicode characters so make LoadTypeLib16 take an LPSTR instead of LPOLESTR. --- dlls/oleaut32/typelib16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c index b746810..69b4f65 100644 --- a/dlls/oleaut32/typelib16.c +++ b/dlls/oleaut32/typelib16.c @@ -120,10 +120,10 @@ QueryPathOfRegTypeLib16( * Both parameters are FAR pointers. */ HRESULT WINAPI LoadTypeLib16( - LPOLESTR szFile, /* [in] Name of file to load from */ + LPSTR szFile, /* [in] Name of file to load from */ ITypeLib** pptLib) /* [out] Destination for loaded ITypeLib interface */ { - FIXME("(%s,%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib); + FIXME("(%s,%p): stub\n",debugstr_a(szFile),pptLib); if (pptLib!=0) *pptLib=0;

1 0

Rob Shearman : ole32: Keep a list of the loaded dlls for each apartment.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: ab7f796fcb5627b0d33909186877da1b5039c18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7f796fcb5627b0d33909186… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 18:57:31 2007 +0100 ole32: Keep a list of the loaded dlls for each apartment. Use it to make CoFreeUnusedLibraries per-apartment. --- dlls/ole32/compobj.c | 111 ++++++++++++++++++++++++++++++----------- dlls/ole32/compobj_private.h | 1 + dlls/ole32/tests/compobj.c | 1 - 3 files changed, 82 insertions(+), 31 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b990a69..330b8e1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -175,6 +175,12 @@ static CRITICAL_SECTION_DEBUG dll_cs_debug = }; static CRITICAL_SECTION csOpenDllList = { &dll_cs_debug, -1, 0, 0, 0, 0 }; +struct apartment_loaded_dll +{ + struct list entry; + OpenDll *dll; +}; + static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',' ', '0','x','#','#','#','#','#','#','#','#',' ',0}; static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -184,7 +190,6 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret); static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name); static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry); -static void COMPOBJ_DllList_FreeUnused(int Timeout); static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen); @@ -244,6 +249,7 @@ static APARTMENT *apartment_construct(DWORD model) list_init(&apt->proxies); list_init(&apt->stubmgrs); list_init(&apt->psclsids); + list_init(&apt->loaded_dlls); apt->ipidc = 0; apt->refs = 1; apt->remunk_exported = FALSE; @@ -389,6 +395,14 @@ DWORD apartment_release(struct apartment *apt) if (apt->filter) IUnknown_Release(apt->filter); + while ((cursor = list_head(&apt->loaded_dlls))) + { + struct apartment_loaded_dll *apartment_loaded_dll = LIST_ENTRY(cursor, struct apartment_loaded_dll, entry); + COMPOBJ_DllList_ReleaseRef(apartment_loaded_dll->dll); + list_remove(cursor); + HeapFree(GetProcessHeap(), 0, apartment_loaded_dll); + } + DEBUG_CLEAR_CRITSEC_NAME(&apt->cs); DeleteCriticalSection(&apt->cs); @@ -569,21 +583,69 @@ void apartment_joinmta(void) static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, REFCLSID rclsid, REFIID riid, void **ppv) { - OpenDll *open_dll_entry; - HRESULT hr; + HRESULT hr = S_OK; + BOOL found = FALSE; + struct apartment_loaded_dll *apartment_loaded_dll; - hr = COMPOBJ_DllList_Add( dllpath, &open_dll_entry ); - if (FAILED(hr)) - return hr; + EnterCriticalSection(&apt->cs); - hr = open_dll_entry->DllGetClassObject(rclsid, riid, ppv); + LIST_FOR_EACH_ENTRY(apartment_loaded_dll, &apt->loaded_dlls, struct apartment_loaded_dll, entry) + if (!strcmpiW(dllpath, apartment_loaded_dll->dll->library_name)) + { + TRACE("found %s already loaded\n", debugstr_w(dllpath)); + found = TRUE; + break; + } - if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x\n", hr); + if (!found) + { + apartment_loaded_dll = HeapAlloc(GetProcessHeap(), 0, sizeof(*apartment_loaded_dll)); + if (!apartment_loaded_dll) + hr = E_OUTOFMEMORY; + if (SUCCEEDED(hr)) + { + hr = COMPOBJ_DllList_Add( dllpath, &apartment_loaded_dll->dll ); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, apartment_loaded_dll); + } + if (SUCCEEDED(hr)) + { + TRACE("added new loaded dll %s\n", debugstr_w(dllpath)); + list_add_tail(&apt->loaded_dlls, &apartment_loaded_dll->entry); + } + } + + LeaveCriticalSection(&apt->cs); + + if (SUCCEEDED(hr)) + { + TRACE("calling DllGetClassObject %p\n", apartment_loaded_dll->dll->DllGetClassObject); + /* OK: get the ClassObject */ + hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv); + + if (hr != S_OK) + ERR("DllGetClassObject returned error 0x%08x\n", hr); + } return hr; } +static void apartment_freeunusedlibraries(struct apartment *apt) +{ + struct apartment_loaded_dll *entry, *next; + EnterCriticalSection(&apt->cs); + LIST_FOR_EACH_ENTRY_SAFE(entry, next, &apt->loaded_dlls, struct apartment_loaded_dll, entry) + { + if (entry->dll->DllCanUnloadNow && (entry->dll->DllCanUnloadNow() == S_OK)) + { + list_remove(&entry->entry); + COMPOBJ_DllList_ReleaseRef(entry->dll); + HeapFree(GetProcessHeap(), 0, entry); + } + } + LeaveCriticalSection(&apt->cs); +} + /***************************************************************************** * This section contains OpenDllList implementation */ @@ -668,7 +730,8 @@ static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name) EnterCriticalSection(&csOpenDllList); LIST_FOR_EACH_ENTRY(ptr, &openDllList, OpenDll, entry) { - if (!strcmpiW(library_name, ptr->library_name)) + if (!strcmpiW(library_name, ptr->library_name) && + (InterlockedIncrement(&ptr->refs) != 1) /* entry is being destroy if == 1 */) { ret = ptr; break; @@ -694,23 +757,6 @@ static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry) } } -static void COMPOBJ_DllList_FreeUnused(int Timeout) -{ - OpenDll *curr, *next; - - TRACE("\n"); - - EnterCriticalSection( &csOpenDllList ); - - LIST_FOR_EACH_ENTRY_SAFE(curr, next, &openDllList, OpenDll, entry) - { - if ( (curr->DllCanUnloadNow != NULL) && (curr->DllCanUnloadNow() == S_OK) ) - COMPOBJ_DllList_ReleaseRef(curr); - } - - LeaveCriticalSection( &csOpenDllList ); -} - /****************************************************************************** * CoBuildVersion [OLE32.@] * CoBuildVersion [COMPOBJ.1] @@ -2314,9 +2360,14 @@ void WINAPI CoFreeAllLibraries(void) */ void WINAPI CoFreeUnusedLibraries(void) { - /* FIXME: Calls to CoFreeUnusedLibraries from any thread always route - * through the main apartment's thread to call DllCanUnloadNow */ - COMPOBJ_DllList_FreeUnused(0); + struct apartment *apt = COM_CurrentApt(); + if (!apt) + { + ERR("apartment not initialised\n"); + return; + } + + apartment_freeunusedlibraries(apt); } /*********************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index d99f41c..4a81c91 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -154,6 +154,7 @@ struct apartment BOOL remunk_exported; /* has the IRemUnknown interface for this apartment been created yet? (CS cs) */ LONG remoting_started; /* has the RPC system been started for this apartment? (LOCK) */ struct list psclsids; /* list of registered PS CLSIDs (CS cs) */ + struct list loaded_dlls; /* list of dlls loaded by this apartment (CS cs) */ /* FIXME: OID's should be given out by RPCSS */ OID oidc; /* object ID counter, starts at 1, zero is invalid OID (CS cs) */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 284d1bd..43891e6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -742,7 +742,6 @@ static void test_CoFreeUnusedLibraries(void) WaitForSingleObject(thread, INFINITE); CloseHandle(thread); - todo_wine ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n"); CoFreeUnusedLibraries();

1 0

Rob Shearman : ole32: Cache the address for the library' s DllGetClassObject and DllCanUnloadNow in the OpenDll list entry.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 30721a88e3091c2ccdef3b058d0c87eaf7be2303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30721a88e3091c2ccdef3b058… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 18:56:51 2007 +0100 ole32: Cache the address for the library's DllGetClassObject and DllCanUnloadNow in the OpenDll list entry. --- dlls/ole32/compobj.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b992c4a..b990a69 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -151,11 +151,16 @@ static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, * next unload-call but not before 600 sec. */ +typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); +typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void); + typedef struct tagOpenDll { LONG refs; LPWSTR library_name; HANDLE library; + DllGetClassObjectFunc DllGetClassObject; + DllCanUnloadNowFunc DllCanUnloadNow; struct list entry; } OpenDll; @@ -564,27 +569,14 @@ void apartment_joinmta(void) static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, REFCLSID rclsid, REFIID riid, void **ppv) { - typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); - DllGetClassObjectFunc DllGetClassObject; OpenDll *open_dll_entry; HRESULT hr; hr = COMPOBJ_DllList_Add( dllpath, &open_dll_entry ); if (FAILED(hr)) - { - ERR("couldn't load in-process dll %s\n", debugstr_w(dllpath)); return hr; - } - - if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(open_dll_entry->library, "DllGetClassObject"))) - { - /* failure: the dll did not export DllGetClassObject */ - ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllpath)); - return CO_E_DLLNOTFOUND; - } - /* OK: get the ClassObject */ - hr = DllGetClassObject(rclsid, riid, ppv); + hr = open_dll_entry->DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) ERR("DllGetClassObject returned error 0x%08x\n", hr); @@ -603,6 +595,8 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) int len; HRESULT hr = S_OK; HANDLE hLibrary; + DllCanUnloadNowFunc DllCanUnloadNow; + DllGetClassObjectFunc DllGetClassObject; TRACE("\n"); @@ -614,10 +608,22 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) hLibrary = LoadLibraryExW(library_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if (!hLibrary) { + ERR("couldn't load in-process dll %s\n", debugstr_w(library_name)); /* failure: DLL could not be loaded */ return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ } + DllCanUnloadNow = GetProcAddress(hLibrary, "DllCanUnloadNow"); + /* Note: failing to find DllCanUnloadNow is not a failure */ + DllGetClassObject = GetProcAddress(hLibrary, "DllGetClassObject"); + if (!DllGetClassObject) + { + /* failure: the dll did not export DllGetClassObject */ + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(library_name)); + FreeLibrary(hLibrary); + return CO_E_DLLNOTFOUND; + } + EnterCriticalSection( &csOpenDllList ); *ret = COMPOBJ_DllList_Get(library_name); @@ -638,6 +644,8 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) memcpy(entry->library_name, library_name, (len + 1)*sizeof(WCHAR)); entry->library = hLibrary; entry->refs = 1; + entry->DllCanUnloadNow = DllCanUnloadNow; + entry->DllGetClassObject = DllGetClassObject; list_add_tail(&openDllList, &entry->entry); } else @@ -689,8 +697,6 @@ static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry) static void COMPOBJ_DllList_FreeUnused(int Timeout) { OpenDll *curr, *next; - typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void); - DllCanUnloadNowFunc DllCanUnloadNow; TRACE("\n"); @@ -698,9 +704,7 @@ static void COMPOBJ_DllList_FreeUnused(int Timeout) LIST_FOR_EACH_ENTRY_SAFE(curr, next, &openDllList, OpenDll, entry) { - DllCanUnloadNow = (DllCanUnloadNowFunc) GetProcAddress(curr->library, "DllCanUnloadNow"); - - if ( (DllCanUnloadNow != NULL) && (DllCanUnloadNow() == S_OK) ) + if ( (curr->DllCanUnloadNow != NULL) && (curr->DllCanUnloadNow() == S_OK) ) COMPOBJ_DllList_ReleaseRef(curr); }

1 0

Rob Shearman : ole32: Add a test that shows CoFreeUnusedLibraries only frees unused libraries from the current apartment .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 1d8879bcccdcb94c4c1851e8fd2676a0c9bb6ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8879bcccdcb94c4c1851e8f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 18:56:14 2007 +0100 ole32: Add a test that shows CoFreeUnusedLibraries only frees unused libraries from the current apartment. --- dlls/ole32/tests/compobj.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e9b2ca9..284d1bd 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "objbase.h" #include "shlguid.h" +#include "urlmon.h" /* for CLSID_FileProtocol */ #include "wine/test.h" @@ -701,6 +702,57 @@ static void test_CoRegisterClassObject(void) CoUninitialize(); } +static DWORD CALLBACK free_libraries_thread(LPVOID p) +{ + CoFreeUnusedLibraries(); + return 0; +} + +static inline BOOL is_module_loaded(const char *module) +{ + return GetModuleHandle(module) ? TRUE : FALSE; +} + +static void test_CoFreeUnusedLibraries(void) +{ + HRESULT hr; + IUnknown *pUnk; + DWORD tid; + HANDLE thread; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + ok(!is_module_loaded("urlmon.dll"), "urlmon.dll shouldn't be loaded\n"); + + hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("IE not installed so can't run CoFreeUnusedLibraries test\n"); + return; + } + ok_ole_success(hr, "CoCreateInstance"); + + ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n"); + + IUnknown_Release(pUnk); + + ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n"); + + thread = CreateThread(NULL, 0, free_libraries_thread, NULL, 0, &tid); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + todo_wine + ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n"); + + CoFreeUnusedLibraries(); + + ok(!is_module_loaded("urlmon.dll"), "urlmon.dll shouldn't be loaded\n"); + + CoUninitialize(); +} + + START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); @@ -724,4 +776,5 @@ START_TEST(compobj) test_CoMarshalInterface(); test_CoMarshalInterThreadInterfaceInStream(); test_CoRegisterClassObject(); + test_CoFreeUnusedLibraries(); }

1 0

Rob Shearman : ole32: Move the handling of loading a dll and getting an in-process object from it to an apartment-specific function .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: c40f1b665963da138a4fed8568633ea8c2541180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40f1b665963da138a4fed856… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 18:55:23 2007 +0100 ole32: Move the handling of loading a dll and getting an in-process object from it to an apartment-specific function. Use it to implement apartment_hostobject in a cleaner way so that it is guaranteed to not recurse. --- dlls/ole32/compobj.c | 80 ++++++++++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 31 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b77c0c4..b992c4a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -173,12 +173,16 @@ static CRITICAL_SECTION csOpenDllList = { &dll_cs_debug, -1, 0, 0, 0, 0 }; static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',' ', '0','x','#','#','#','#','#','#','#','#',' ',0}; static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, + REFCLSID rclsid, REFIID riid, void **ppv); static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret); static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name); static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry); static void COMPOBJ_DllList_FreeUnused(int Timeout); +static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen); + static void COMPOBJ_InitProcess( void ) { WNDCLASSW wclass; @@ -479,15 +483,24 @@ struct host_object_params IStream *stream; /* stream that the object will be marshaled into */ }; -static HRESULT apartment_hostobject(const struct host_object_params *params) +static HRESULT apartment_hostobject(struct apartment *apt, + const struct host_object_params *params) { IUnknown *object; HRESULT hr; static const LARGE_INTEGER llZero; + WCHAR dllpath[MAX_PATH+1]; TRACE("\n"); - hr = get_inproc_class_object(params->hkeydll, &params->clsid, &params->iid, (void **)&object); + if (COM_RegReadPath(params->hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + { + /* failure: CLSID is not found in registry */ + WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); + return REGDB_E_CLASSNOTREG; + } + + hr = apartment_getclassobject(apt, dllpath, &params->clsid, &params->iid, (void **)&object); if (FAILED(hr)) return hr; @@ -507,7 +520,7 @@ static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LP RPC_ExecuteCall((struct dispatch_params *)lParam); return 0; case DM_HOSTOBJECT: - return apartment_hostobject((const struct host_object_params *)lParam); + return apartment_hostobject(COM_CurrentApt(), (const struct host_object_params *)lParam); default: return DefWindowProcW(hWnd, msg, wParam, lParam); } @@ -548,6 +561,37 @@ void apartment_joinmta(void) COM_CurrentInfo()->apt = MTA; } +static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, + REFCLSID rclsid, REFIID riid, void **ppv) +{ + typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); + DllGetClassObjectFunc DllGetClassObject; + OpenDll *open_dll_entry; + HRESULT hr; + + hr = COMPOBJ_DllList_Add( dllpath, &open_dll_entry ); + if (FAILED(hr)) + { + ERR("couldn't load in-process dll %s\n", debugstr_w(dllpath)); + return hr; + } + + if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(open_dll_entry->library, "DllGetClassObject"))) + { + /* failure: the dll did not export DllGetClassObject */ + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllpath)); + return CO_E_DLLNOTFOUND; + } + + /* OK: get the ClassObject */ + hr = DllGetClassObject(rclsid, riid, ppv); + + if (hr != S_OK) + ERR("DllGetClassObject returned error 0x%08x\n", hr); + + return hr; +} + /***************************************************************************** * This section contains OpenDllList implementation */ @@ -1769,18 +1813,15 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; static const WCHAR wszFree[] = {'F','r','e','e',0}; static const WCHAR wszBoth[] = {'B','o','t','h',0}; - typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); - DllGetClassObjectFunc DllGetClassObject; WCHAR dllpath[MAX_PATH+1]; WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; HRESULT hr; - OpenDll *open_dll_entry; + APARTMENT *apt = COM_CurrentApt(); get_threading_model(hkeydll, threading_model, ARRAYSIZE(threading_model)); /* "Apartment" */ if (!strcmpiW(threading_model, wszApartment)) { - APARTMENT *apt = COM_CurrentApt(); if (apt->multi_threaded) { /* try to find an STA */ @@ -1809,7 +1850,6 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii /* "Free" */ else if (!strcmpiW(threading_model, wszFree)) { - APARTMENT *apt = COM_CurrentApt(); if (!apt->multi_threaded) { FIXME("should create object %s in multi-threaded apartment\n", @@ -1819,8 +1859,6 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii /* everything except "Apartment", "Free" and "Both" */ else if (strcmpiW(threading_model, wszBoth)) { - APARTMENT *apt = COM_CurrentApt(); - /* everything else is main-threaded */ if (threading_model[0]) FIXME("unrecognised threading model %s for object %s, should be main-threaded?\n", @@ -1859,27 +1897,7 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii return REGDB_E_CLASSNOTREG; } - hr = COMPOBJ_DllList_Add( dllpath, &open_dll_entry ); - if (FAILED(hr)) - { - ERR("couldn't load in-process dll %s\n", debugstr_w(dllpath)); - return hr; - } - - if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(open_dll_entry->library, "DllGetClassObject"))) - { - /* failure: the dll did not export DllGetClassObject */ - ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllpath)); - return CO_E_DLLNOTFOUND; - } - - /* OK: get the ClassObject */ - hr = DllGetClassObject(rclsid, riid, ppv); - - if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x\n", hr); - - return hr; + return apartment_getclassobject(apt, dllpath, rclsid, riid, ppv); } /***********************************************************************

1 0

Rob Shearman : ole32: Move the in-process module loading to COMPOBJ_DllList_Add.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 679bfdab28d5af8d9a02d0d5cb60c604a56d33ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=679bfdab28d5af8d9a02d0d5c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 18:54:27 2007 +0100 ole32: Move the in-process module loading to COMPOBJ_DllList_Add. --- dlls/ole32/compobj.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 177e17f..b77c0c4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -174,7 +174,7 @@ static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r',' '0','x','#','#','#','#','#','#','#','#',' ',0}; static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); -static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, HANDLE hLibrary, OpenDll **ret); +static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret); static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name); static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry); static void COMPOBJ_DllList_FreeUnused(int Timeout); @@ -553,18 +553,37 @@ void apartment_joinmta(void) */ /* caller must ensure that library_name is not already in the open dll list */ -static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, HANDLE hLibrary, OpenDll **ret) +static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) { OpenDll *entry; int len; HRESULT hr = S_OK; + HANDLE hLibrary; TRACE("\n"); + *ret = COMPOBJ_DllList_Get(library_name); + if (*ret) return S_OK; + + /* do this outside the csOpenDllList to avoid creating a lock dependency on + * the loader lock */ + hLibrary = LoadLibraryExW(library_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + if (!hLibrary) + { + /* failure: DLL could not be loaded */ + return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ + } + EnterCriticalSection( &csOpenDllList ); *ret = COMPOBJ_DllList_Get(library_name); - if (!*ret) + if (*ret) + { + /* another caller to this function already added the dll while we + * weren't in the critical section */ + FreeLibrary(hLibrary); + } + else { len = strlenW(library_name); entry = HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll)); @@ -578,7 +597,10 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, HANDLE hLibrary, OpenDl list_add_tail(&openDllList, &entry->entry); } else + { hr = E_OUTOFMEMORY; + FreeLibrary(hLibrary); + } *ret = entry; } @@ -1747,7 +1769,6 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; static const WCHAR wszFree[] = {'F','r','e','e',0}; static const WCHAR wszBoth[] = {'B','o','t','h',0}; - HINSTANCE hLibrary; typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); DllGetClassObjectFunc DllGetClassObject; WCHAR dllpath[MAX_PATH+1]; @@ -1838,20 +1859,17 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii return REGDB_E_CLASSNOTREG; } - if ((hLibrary = LoadLibraryExW(dllpath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) + hr = COMPOBJ_DllList_Add( dllpath, &open_dll_entry ); + if (FAILED(hr)) { - /* failure: DLL could not be loaded */ ERR("couldn't load in-process dll %s\n", debugstr_w(dllpath)); - return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ + return hr; } - COMPOBJ_DllList_Add( dllpath, hLibrary, &open_dll_entry ); - - if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) + if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(open_dll_entry->library, "DllGetClassObject"))) { /* failure: the dll did not export DllGetClassObject */ ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllpath)); - FreeLibrary( hLibrary ); return CO_E_DLLNOTFOUND; }

1 0

Rob Shearman : ole32: Convert the OpenDll list to a standard Wine list.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 247255568cb5f77db5f255ecf79599901380b2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=247255568cb5f77db5f255ecf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 4 18:53:36 2007 +0100 ole32: Convert the OpenDll list to a standard Wine list. Store the library name and make it reference counted. --- dlls/ole32/compobj.c | 125 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 75 insertions(+), 50 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 28bd184..177e17f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -151,12 +151,15 @@ static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, * next unload-call but not before 600 sec. */ -typedef struct tagOpenDll { - HINSTANCE hLibrary; - struct tagOpenDll *next; +typedef struct tagOpenDll +{ + LONG refs; + LPWSTR library_name; + HANDLE library; + struct list entry; } OpenDll; -static OpenDll *openDllList = NULL; /* linked list of open dlls */ +static struct list openDllList = LIST_INIT(openDllList); static CRITICAL_SECTION csOpenDllList; static CRITICAL_SECTION_DEBUG dll_cs_debug = @@ -171,7 +174,9 @@ static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r',' '0','x','#','#','#','#','#','#','#','#',' ',0}; static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); -static void COMPOBJ_DLLList_Add(HANDLE hLibrary); +static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, HANDLE hLibrary, OpenDll **ret); +static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name); +static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry); static void COMPOBJ_DllList_FreeUnused(int Timeout); static void COMPOBJ_InitProcess( void ) @@ -547,44 +552,77 @@ void apartment_joinmta(void) * This section contains OpenDllList implementation */ -static void COMPOBJ_DLLList_Add(HANDLE hLibrary) +/* caller must ensure that library_name is not already in the open dll list */ +static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, HANDLE hLibrary, OpenDll **ret) { - OpenDll *ptr; - OpenDll *tmp; + OpenDll *entry; + int len; + HRESULT hr = S_OK; TRACE("\n"); EnterCriticalSection( &csOpenDllList ); - if (openDllList == NULL) { - /* empty list -- add first node */ - openDllList = HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll)); - openDllList->hLibrary=hLibrary; - openDllList->next = NULL; - } else { - /* search for this dll */ - int found = FALSE; - for (ptr = openDllList; ptr->next != NULL; ptr=ptr->next) { - if (ptr->hLibrary == hLibrary) { - found = TRUE; - break; - } + *ret = COMPOBJ_DllList_Get(library_name); + if (!*ret) + { + len = strlenW(library_name); + entry = HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll)); + if (entry) + entry->library_name = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + if (entry && entry->library_name) + { + memcpy(entry->library_name, library_name, (len + 1)*sizeof(WCHAR)); + entry->library = hLibrary; + entry->refs = 1; + list_add_tail(&openDllList, &entry->entry); } - if (!found) { - /* dll not found, add it */ - tmp = openDllList; - openDllList = HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll)); - openDllList->hLibrary = hLibrary; - openDllList->next = tmp; - } + else + hr = E_OUTOFMEMORY; + *ret = entry; } LeaveCriticalSection( &csOpenDllList ); + + return hr; +} + +static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name) +{ + OpenDll *ptr; + OpenDll *ret = NULL; + EnterCriticalSection(&csOpenDllList); + LIST_FOR_EACH_ENTRY(ptr, &openDllList, OpenDll, entry) + { + if (!strcmpiW(library_name, ptr->library_name)) + { + ret = ptr; + break; + } + } + LeaveCriticalSection(&csOpenDllList); + return ret; +} + +static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry) +{ + if (!InterlockedDecrement(&entry->refs)) + { + EnterCriticalSection(&csOpenDllList); + list_remove(&entry->entry); + LeaveCriticalSection(&csOpenDllList); + + TRACE("freeing %p\n", entry->library); + FreeLibrary(entry->library); + + HeapFree(GetProcessHeap(), 0, entry->library_name); + HeapFree(GetProcessHeap(), 0, entry); + } } static void COMPOBJ_DllList_FreeUnused(int Timeout) { - OpenDll *curr, *next, *prev = NULL; + OpenDll *curr, *next; typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void); DllCanUnloadNowFunc DllCanUnloadNow; @@ -592,27 +630,12 @@ static void COMPOBJ_DllList_FreeUnused(int Timeout) EnterCriticalSection( &csOpenDllList ); - for (curr = openDllList; curr != NULL; ) { - DllCanUnloadNow = (DllCanUnloadNowFunc) GetProcAddress(curr->hLibrary, "DllCanUnloadNow"); - - if ( (DllCanUnloadNow != NULL) && (DllCanUnloadNow() == S_OK) ) { - next = curr->next; - - TRACE("freeing %p\n", curr->hLibrary); - FreeLibrary(curr->hLibrary); - - HeapFree(GetProcessHeap(), 0, curr); - if (curr == openDllList) { - openDllList = next; - } else { - prev->next = next; - } + LIST_FOR_EACH_ENTRY_SAFE(curr, next, &openDllList, OpenDll, entry) + { + DllCanUnloadNow = (DllCanUnloadNowFunc) GetProcAddress(curr->library, "DllCanUnloadNow"); - curr = next; - } else { - prev = curr; - curr = curr->next; - } + if ( (DllCanUnloadNow != NULL) && (DllCanUnloadNow() == S_OK) ) + COMPOBJ_DllList_ReleaseRef(curr); } LeaveCriticalSection( &csOpenDllList ); @@ -1730,6 +1753,7 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii WCHAR dllpath[MAX_PATH+1]; WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; HRESULT hr; + OpenDll *open_dll_entry; get_threading_model(hkeydll, threading_model, ARRAYSIZE(threading_model)); /* "Apartment" */ @@ -1821,6 +1845,8 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ } + COMPOBJ_DllList_Add( dllpath, hLibrary, &open_dll_entry ); + if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) { /* failure: the dll did not export DllGetClassObject */ @@ -1830,7 +1856,6 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii } /* OK: get the ClassObject */ - COMPOBJ_DLLList_Add( hLibrary ); hr = DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK)

1 0

Fabian Bieler : wined3d: Add support for float texture formats back in.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 7df5deab23acf47e662d2eaede22d3e69b4fe6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df5deab23acf47e662d2eaed… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 19:53:52 2007 +0200 wined3d: Add support for float texture formats back in. --- dlls/wined3d/directx.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dea1d43..2d4024f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1702,6 +1702,23 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + + BOOL half_pixel_support = GL_SUPPORT(ARB_HALF_FLOAT_PIXEL); + + switch (CheckFormat) { + case WINED3DFMT_R16F: + case WINED3DFMT_A16B16G16R16F: + if (!half_pixel_support) break; + case WINED3DFMT_R32F: + case WINED3DFMT_A32B32G32R32F: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + default: + break; /* Avoid compiler warnings */ + } + } + /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as * supported (tested with the dxCapsViewer) and pretending to

1 0

Fabian Bieler : wined3d: Fix GLSL cnd instruction for INF and NAN arguments .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 91df23062445f9146e3f28a29c4aaf076f56d981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91df23062445f9146e3f28a29… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 19:59:11 2007 +0200 wined3d: Fix GLSL cnd instruction for INF and NAN arguments. --- dlls/wined3d/glsl_shader.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04f45..3ceb935 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1156,26 +1156,35 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; - DWORD write_mask; - size_t mask_size; - - write_mask = shader_glsl_append_dst(arg->buffer, arg); + DWORD write_mask, cmp_channel = 0; + unsigned int i, j; if (shader->baseShader.hex_version < WINED3DPS_VERSION(1, 4)) { - mask_size = 1; + write_mask = shader_glsl_append_dst(arg->buffer, arg); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); - } else { - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", + src0_param.param_str, src1_param.param_str, src2_param.param_str); + return; } + /* Cycle through all source0 channels */ + for (i=0; i<4; i++) { + write_mask = 0; + /* Find the destination channels which use the current source0 channel */ + for (j=0; j<4; j++) { + if ( ((arg->src[0] >> (WINED3DSP_SWIZZLE_SHIFT + 2*j)) & 0x3) == i ) { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } + } + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; - shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); - shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - if (mask_size > 1) { - shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.5)))));\n", - src2_param.param_str, src1_param.param_str, mask_size, src0_param.param_str, mask_size); - } else { shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); }

1 0

Fabian Bieler : wined3d: Fix GLSL cmp instruction for INF and NAN arguments .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 2843b0f9296fa93a85e8bf58418f411ce3094ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2843b0f9296fa93a85e8bf584… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 19:57:41 2007 +0200 wined3d: Fix GLSL cmp instruction for INF and NAN arguments. --- dlls/wined3d/glsl_shader.c | 46 ++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 707c325..3d04f45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -784,18 +784,26 @@ static DWORD shader_glsl_add_dst_param(SHADER_OPCODE_ARG* arg, const DWORD param } /* Append the destination part of the instruction to the buffer, return the effective write mask */ -static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { +static DWORD shader_glsl_append_dst_ext(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg, const DWORD param) { glsl_dst_param_t dst_param; DWORD mask; int shift; - shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - mask = shader_glsl_add_dst_param(arg, arg->dst, arg->dst_addr, &dst_param); - shader_addline(buffer, "%s%s = %s(", dst_param.reg_name, dst_param.mask_str, shift_glsl_tab[shift]); + mask = shader_glsl_add_dst_param(arg, param, arg->dst_addr, &dst_param); + + if(mask) { + shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + shader_addline(buffer, "%s%s = %s(", dst_param.reg_name, dst_param.mask_str, shift_glsl_tab[shift]); + } return mask; } +/* Append the destination part of the instruction to the buffer, return the effective write mask */ +static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { + return shader_glsl_append_dst_ext(buffer, arg, arg->dst); +} + /** Process GLSL instruction modifiers */ void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG* arg) { @@ -1115,20 +1123,26 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; - DWORD write_mask; - size_t mask_size; - - write_mask = shader_glsl_append_dst(arg->buffer, arg); - mask_size = shader_glsl_get_write_mask_size(write_mask); + DWORD write_mask, cmp_channel = 0; + unsigned int i, j; + + /* Cycle through all source0 channels */ + for (i=0; i<4; i++) { + write_mask = 0; + /* Find the destination channels which use the current source0 channel */ + for (j=0; j<4; j++) { + if ( ((arg->src[0] >> (WINED3DSP_SWIZZLE_SHIFT + 2*j)) & 0x3) == i ) { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } + } + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; - shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, &src0_param); - shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); - shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - if (mask_size > 1) { - shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.0)))));\n", - src1_param.param_str, src2_param.param_str, mask_size, src0_param.param_str, mask_size); - } else { shader_addline(arg->buffer, "%s >= 0.0 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
69
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 2007