wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Christian Costa : d3dx9_36: Implement D3DXGetImageInfoFromFileInMemory using WindowsCodecs ( based on work from Tony Wasserka).
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 3a98a6295a0540a67783db0d4ac7ef0cd239c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a98a6295a0540a67783db0d4… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Apr 9 08:43:17 2010 +0200 d3dx9_36: Implement D3DXGetImageInfoFromFileInMemory using WindowsCodecs (based on work from Tony Wasserka). --- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/surface.c | 113 +++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/texture.c | 40 ++++++-------- 3 files changed, 127 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a98a6295a0540a67783d…

1 0

Nikolay Sivov : user32: Block TrackPopupMenu if menu is already active.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: e9bae2cfafcfaa0388eeaf311a106ce46bc8133d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bae2cfafcfaa0388eeaf311… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 19:47:45 2010 +0400 user32: Block TrackPopupMenu if menu is already active. --- dlls/user32/menu.c | 23 +++++++---- dlls/user32/tests/menu.c | 103 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 96 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9bae2cfafcfaa0388eea…

1 0

Alexandre Julliard : oleaut32: Use the x87 assembly code for rounding on x86_64 too.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 2e5d1f192fdc028b18fbce3c5f3690a3ef16d466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5d1f192fdc028b18fbce3c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 11:14:47 2010 +0200 oleaut32: Use the x87 assembly code for rounding on x86_64 too. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index da1288d..cfd5e8f 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3503,7 +3503,7 @@ HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromR8(double dblIn, CY* pCyOut) { -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) /* This code gives identical results to Win32 on Intel. * Here we use fp exceptions to catch overflows when storing the value. */

1 0

Alexandre Julliard : oleaut32: Query the path of the correct kind of typelib when unregistering it.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 3681a280249a855a25872460e1043dde9b3c2b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3681a280249a855a25872460e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 11:14:16 2010 +0200 oleaut32: Query the path of the correct kind of typelib when unregistering it. --- dlls/oleaut32/typelib.c | 54 ++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index be0c221..5792cc5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -283,30 +283,9 @@ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); -/**************************************************************************** - * QueryPathOfRegTypeLib [OLEAUT32.164] - * - * Gets the path to a registered type library. - * - * PARAMS - * guid [I] referenced guid - * wMaj [I] major version - * wMin [I] minor version - * lcid [I] locale id - * path [O] path of typelib - * - * RETURNS - * Success: S_OK. - * Failure: If the type library is not registered then TYPE_E_LIBNOTREGISTERED - * or TYPE_E_REGISTRYACCESS if the type library registration key couldn't be - * opened. - */ -HRESULT WINAPI QueryPathOfRegTypeLib( - REFGUID guid, - WORD wMaj, - WORD wMin, - LCID lcid, - LPBSTR path ) +/* Get the path to a registered type library. Helper for QueryPathOfRegTypeLib. */ +static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, + SYSKIND syskind, LCID lcid, LPBSTR path ) { HRESULT hr = TYPE_E_LIBNOTREGISTERED; LCID myLCID = lcid; @@ -336,7 +315,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( { LONG dwPathLen = sizeof(Path); - get_lcid_subkey( myLCID, SYS_WIN32, buffer ); + get_lcid_subkey( myLCID, syskind, buffer ); if (RegQueryValueW(hkey, buffer, Path, &dwPathLen)) { @@ -368,6 +347,29 @@ HRESULT WINAPI QueryPathOfRegTypeLib( return hr; } +/**************************************************************************** + * QueryPathOfRegTypeLib [OLEAUT32.164] + * + * Gets the path to a registered type library. + * + * PARAMS + * guid [I] referenced guid + * wMaj [I] major version + * wMin [I] minor version + * lcid [I] locale id + * path [O] path of typelib + * + * RETURNS + * Success: S_OK. + * Failure: If the type library is not registered then TYPE_E_LIBNOTREGISTERED + * or TYPE_E_REGISTRYACCESS if the type library registration key couldn't be + * opened. + */ +HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) +{ + return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path ); +} + /****************************************************************************** * CreateTypeLib [OLEAUT32.160] creates a typelib * @@ -799,7 +801,7 @@ HRESULT WINAPI UnRegisterTypeLib( } /* get the path to the typelib on disk */ - if (QueryPathOfRegTypeLib(libid, wVerMajor, wVerMinor, lcid, &tlibPath) != S_OK) { + if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath) != S_OK) { result = E_INVALIDARG; goto end; }

1 0

Alexandre Julliard : ntdll: Fix affinity mask check for 64-bit.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 5189eef6bbd6a452f02bceaa1d6d4fd113171b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5189eef6bbd6a452f02bceaa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 21:16:29 2010 +0200 ntdll: Fix affinity mask check for 64-bit. --- dlls/kernel32/tests/thread.c | 12 +++++++++++- dlls/ntdll/thread.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index afa6759..4c4e764 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -814,9 +814,19 @@ static VOID test_thread_processor(void) ok(SetThreadAffinityMask(curthread,processMask+1)==0, "SetThreadAffinityMask passed for an illegal processor\n"); /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ - retMask = SetThreadAffinityMask(curthread,~0UL); + retMask = SetThreadAffinityMask(curthread,~0); ok(broken(retMask==0) || retMask==processMask, "SetThreadAffinityMask(thread,-1) failed to request all processors.\n"); + if (retMask == processMask && sizeof(ULONG_PTR) > sizeof(ULONG)) + { + /* only the low 32-bits matter */ + retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0); + ok(retMask == processMask, "SetThreadAffinityMask failed\n"); + retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0 >> 3); + ok(retMask == processMask, "SetThreadAffinityMask failed\n"); + retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)1); + ok(retMask == 0, "SetThreadAffinityMask succeeded\n"); + } /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) { SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d632f39..36f1499 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1138,7 +1138,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; - if (req_aff == ~0UL) req_aff = affinity_mask; + if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; else if (!req_aff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info )

1 0

Alexandre Julliard : inetcomm: Rewrite MimeMessage_FindFirst/ Next to iterate correctly and avoid invalid pointer conversions.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: fc81e45af6dcedabd658f3c4172f8dcc94f9415a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc81e45af6dcedabd658f3c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 21:15:15 2010 +0200 inetcomm: Rewrite MimeMessage_FindFirst/Next to iterate correctly and avoid invalid pointer conversions. --- dlls/inetcomm/mimeole.c | 53 ++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 42cc2a1..f297c29 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2002,38 +2002,35 @@ static HRESULT WINAPI MimeMessage_CountBodies( return S_OK; } -static HRESULT find_next(IMimeMessage *msg, LPFINDBODY find_body, HBODY *out) +static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY *out) { - HRESULT hr; - IMimeBody *mime_body; + MimeMessage *This = (MimeMessage *)msg; + struct list *ptr; HBODY next; - if(find_body->dwReserved == 0) - find_body->dwReserved = (DWORD)HBODY_ROOT; - else + for (;;) { - hr = IMimeMessage_GetBody(msg, IBL_FIRST, (HBODY)find_body->dwReserved, &next); - if(hr == S_OK) - find_body->dwReserved = (DWORD)next; + if (!body) ptr = list_head( &This->body_tree ); else { - hr = IMimeMessage_GetBody(msg, IBL_NEXT, (HBODY)find_body->dwReserved, &next); - if(hr == S_OK) - find_body->dwReserved = (DWORD)next; - else - return MIME_E_NOT_FOUND; + ptr = list_head( &body->children ); + while (!ptr) + { + if (!body->parent) return MIME_E_NOT_FOUND; + if (!(ptr = list_next( &body->parent->children, &body->entry ))) body = body->parent; + } } - } - hr = IMimeMessage_BindToObject(msg, (HBODY)find_body->dwReserved, &IID_IMimeBody, (void**)&mime_body); - if(IMimeBody_IsContentType(mime_body, find_body->pszPriType, find_body->pszSubType) == S_OK) - { - IMimeBody_Release(mime_body); - *out = (HBODY)find_body->dwReserved; - return S_OK; + body = LIST_ENTRY( ptr, body_t, entry ); + next = UlongToHandle( body->index ); + find->dwReserved = body->index; + if (IMimeBody_IsContentType(body->mime_body, find->pszPriType, find->pszSubType) == S_OK) + { + *out = next; + return S_OK; + } } - IMimeBody_Release(mime_body); - return find_next(msg, find_body, out); + return MIME_E_NOT_FOUND; } static HRESULT WINAPI MimeMessage_FindFirst( @@ -2044,7 +2041,7 @@ static HRESULT WINAPI MimeMessage_FindFirst( TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); pFindBody->dwReserved = 0; - return find_next(iface, pFindBody, phBody); + return find_next( iface, NULL, pFindBody, phBody ); } static HRESULT WINAPI MimeMessage_FindNext( @@ -2052,9 +2049,15 @@ static HRESULT WINAPI MimeMessage_FindNext( LPFINDBODY pFindBody, LPHBODY phBody) { + MimeMessage *This = (MimeMessage *)iface; + body_t *body; + HRESULT hr; + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); - return find_next(iface, pFindBody, phBody); + hr = find_body( &This->body_tree, UlongToHandle( pFindBody->dwReserved ), &body ); + if (hr != S_OK) return MIME_E_NOT_FOUND; + return find_next( iface, body, pFindBody, phBody ); } static HRESULT WINAPI MimeMessage_ResolveURL(

1 0

Alexandre Julliard : inetcomm: Store an index instead of a handle for mime bodies to avoid pointer conversion warnings .
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: c1043428caaca150c240264da88c3cf656572a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1043428caaca150c240264da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 21:14:15 2010 +0200 inetcomm: Store an index instead of a handle for mime bodies to avoid pointer conversion warnings. --- dlls/inetcomm/mimeintl.c | 2 +- dlls/inetcomm/mimeole.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 6d37147..97b482e 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -268,7 +268,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR if(SUCCEEDED(hr)) *phCharset = add_charset(&This->charsets, &mlang_info, - (HCHARSET)InterlockedIncrement(&This->next_charset_handle)); + UlongToHandle(InterlockedIncrement(&This->next_charset_handle))); } LeaveCriticalSection(&This->cs); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 992949a..42cc2a1 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1419,7 +1419,7 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I typedef struct body_t { struct list entry; - HBODY hbody; + DWORD index; IMimeBody *mime_body; struct body_t *parent; @@ -1434,7 +1434,7 @@ typedef struct MimeMessage IStream *stream; struct list body_tree; - HBODY next_hbody; + DWORD next_index; } MimeMessage; static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) @@ -1512,13 +1512,13 @@ static HRESULT WINAPI MimeMessage_IsDirty( return E_NOTIMPL; } -static body_t *new_body_entry(IMimeBody *mime_body, HBODY hbody, body_t *parent) +static body_t *new_body_entry(IMimeBody *mime_body, DWORD index, body_t *parent) { body_t *body = HeapAlloc(GetProcessHeap(), 0, sizeof(*body)); if(body) { body->mime_body = mime_body; - body->hbody = hbody; + body->index = index; list_init(&body->children); body->parent = parent; } @@ -1630,8 +1630,7 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); - body = new_body_entry(mime_body, msg->next_hbody, parent); - msg->next_hbody = (HBODY)((DWORD)msg->next_hbody + 1); + body = new_body_entry(mime_body, msg->next_index++, parent); if(IMimeBody_IsContentType(mime_body, "multipart", NULL) == S_OK) { @@ -1812,7 +1811,7 @@ static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) LIST_FOR_EACH_ENTRY(cur, list, body_t, entry) { - if(cur->hbody == hbody) + if(cur->index == HandleToUlong(hbody)) { *body = cur; return S_OK; @@ -1948,7 +1947,7 @@ static HRESULT WINAPI MimeMessage_GetBody( hr = get_body(This, location, hPivot, &body); - if(hr == S_OK) *phBody = body->hbody; + if(hr == S_OK) *phBody = UlongToHandle(body->index); return hr; } @@ -2562,7 +2561,7 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) This->refs = 1; This->stream = NULL; list_init(&This->body_tree); - This->next_hbody = (HBODY)1; + This->next_index = 1; *obj = &This->lpVtbl; return S_OK;

1 0

Alexandre Julliard : urlmon: Forward the DllMain call to the dlldata. c generated function.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 5c632145e84a9dfc4f7ff6f2ff7fa5a05a512fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c632145e84a9dfc4f7ff6f2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 19:24:04 2010 +0200 urlmon: Forward the DllMain call to the dlldata.c generated function. --- dlls/urlmon/bindprot.c | 4 ++-- dlls/urlmon/regsvr.c | 2 +- dlls/urlmon/urlmon_main.c | 4 ++-- dlls/urlmon/urlmon_main.h | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 07d6fc2..29b8532 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -155,7 +155,7 @@ HWND get_notif_hwnd(void) NULL }; - wndclass.hInstance = URLMON_hInstance; + wndclass.hInstance = hProxyDll; wnd_class = RegisterClassExW(&wndclass); if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) @@ -164,7 +164,7 @@ HWND get_notif_hwnd(void) tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, URLMON_hInstance, NULL); + NULL, hProxyDll, NULL); if(tls_data->notif_hwnd) tls_data->notif_hwnd_cnt++; diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 9e27825..6e417ac 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -560,7 +560,7 @@ static HRESULT register_inf(BOOL doregister) hAdvpack = LoadLibraryW(wszAdvpack); pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); + hres = pRegInstall(hProxyDll, doregister ? "RegisterDll" : "UnregisterDll", &strtable); for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) heap_free(pse[i].pszValue); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 272884e..edaad42 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); LONG URLMON_refCount = 0; -HINSTANCE URLMON_hInstance = 0; static HMODULE hCabinet = NULL; static DWORD urlmon_tls = TLS_OUT_OF_INDEXES; @@ -144,9 +143,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + URLMON_DllMain( hinstDLL, fdwReason, fImpLoad ); + switch(fdwReason) { case DLL_PROCESS_ATTACH: - URLMON_hInstance = hinstDLL; init_session(TRUE); break; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 8db786b..071af8d 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -36,7 +36,7 @@ #include "wine/unicode.h" #include "wine/list.h" -extern HINSTANCE URLMON_hInstance; +extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); @@ -48,6 +48,7 @@ extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllUnregisterServer(void) DECLSPEC_HIDDEN;

1 0

Roderick Colenbrander : wined3d: Remove remaining redundant code from d3dfmt_get_conv.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 1c02a909e59de60159ece427550f93f7aac47d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c02a909e59de60159ece4275… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 7 23:12:23 2010 +0200 wined3d: Remove remaining redundant code from d3dfmt_get_conv. --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc44070..a82d52a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2237,8 +2237,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } else { /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ *target_bpp = 2; - *format = GL_RGB; - *type = GL_UNSIGNED_SHORT_5_6_5; } break; @@ -2253,9 +2251,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ * the needed type and format parameter, so the internal format contains a * 4th component, which is returned as alpha */ - } else { - *format = GL_BGRA; - *type = GL_UNSIGNED_INT_8_8_8_8_REV; } break;

1 0

Rico Schüller : d3d10: Implement ID3DEffectVariable:: GetOutputSignatureElementDesc().
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 2b17e2918354bb7f7751b8feb366c904ceed6084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b17e2918354bb7f7751b8feb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 7 18:34:36 2010 +0200 d3d10: Implement ID3DEffectVariable::GetOutputSignatureElementDesc(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 0cad484..2cdd329 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -80,6 +80,7 @@ struct d3d10_effect_shader_signature struct d3d10_effect_shader_variable { struct d3d10_effect_shader_signature input_signature; + struct d3d10_effect_shader_signature output_signature; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9c98b2c..59b6c31 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define D3D10_FX10_TYPE_COLUMN_SHIFT 11 #define D3D10_FX10_TYPE_COLUMN_MASK (0x7 << D3D10_FX10_TYPE_COLUMN_SHIFT) @@ -288,12 +289,16 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag switch(tag) { case TAG_ISGN: + case TAG_OSGN: { /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ UINT size = 44 + data_size; - struct d3d10_effect_shader_signature *sig = &s->input_signature; + struct d3d10_effect_shader_signature *sig; char *ptr; + if (tag == TAG_ISGN) sig = &s->input_signature; + else sig = &s->output_signature; + sig->signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (!sig->signature) { @@ -325,7 +330,7 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag write_dword(&ptr, (ptr - sig->signature) + 4); /* chunk */ - write_dword(&ptr, TAG_ISGN); + write_dword(&ptr, tag); write_dword(&ptr, data_size); memcpy(ptr, data, data_size); @@ -1864,6 +1869,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->input_signature); + shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->output_signature); break; default: @@ -5296,10 +5302,56 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, shader_index %u, element_index %u, desc %p stub!\n", + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_shader_variable *s; + D3D10_SIGNATURE_PARAMETER_DESC *d; + + TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); - return E_NOTIMPL; + if (!iface->lpVtbl->IsValid(iface)) + { + WARN("Null variable specified\n"); + return E_FAIL; + } + + /* Check shader_index, this crashes on W7/DX10 */ + if (shader_index >= This->effect->used_shader_count) + { + WARN("This should crash on W7/DX10!\n"); + return E_FAIL; + } + + s = This->effect->used_shaders[shader_index]->data; + if (!s->output_signature.signature) + { + WARN("No shader signature\n"); + return D3DERR_INVALIDCALL; + } + + /* Check desc for NULL, this crashes on W7/DX10 */ + if (!desc) + { + WARN("This should crash on W7/DX10!\n"); + return E_FAIL; + } + + if (element_index >= s->output_signature.element_count) + { + WARN("Invalid element index specified\n"); + return E_INVALIDARG; + } + + d = &s->output_signature.elements[element_index]; + desc->SemanticName = d->SemanticName; + desc->SemanticIndex = d->SemanticIndex; + desc->SystemValueType = d->SystemValueType; + desc->ComponentType = d->ComponentType; + desc->Register = d->Register; + desc->ReadWriteMask = d->ReadWriteMask; + desc->Mask = d->Mask; + + return S_OK; }

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
90
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 2010