September 2013 - Wine-Commits

André Hentschel : include: Add delayloadhandler.h.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: a5abebf6add7fc635035907d57f0d02667a52bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5abebf6add7fc635035907d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 22 19:03:27 2013 +0200 include: Add delayloadhandler.h. --- include/Makefile.in | 1 + include/delayloadhandler.h | 55 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d6e08e0..3da2977 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -247,6 +247,7 @@ SRCDIR_INCLUDES = \ ddraw.h \ ddrawgdi.h \ ddrawi.h \ + delayloadhandler.h \ devenum.idl \ devguid.h \ devpkey.h \ diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h new file mode 100644 index 0000000..06b6589 --- /dev/null +++ b/include/delayloadhandler.h @@ -0,0 +1,55 @@ +/* + * Copyright 2013 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DELAYLOADHANDLER_H +#define __WINE_DELAYLOADHANDLER_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DELAYLOAD_GPA_FAILURE 4 + +typedef struct _DELAYLOAD_PROC_DESCRIPTOR +{ + ULONG ImportDescribedByName; + union { + LPCSTR Name; + ULONG Ordinal; + } Description; +} DELAYLOAD_PROC_DESCRIPTOR, *PDELAYLOAD_PROC_DESCRIPTOR; + +typedef struct _DELAYLOAD_INFO +{ + ULONG Size; + PCIMAGE_DELAYLOAD_DESCRIPTOR DelayloadDescriptor; + PIMAGE_THUNK_DATA ThunkAddress; + LPCSTR TargetDllName; + DELAYLOAD_PROC_DESCRIPTOR TargetApiDescriptor; + PVOID TargetModuleBase; + PVOID Unused; + ULONG LastError; +} DELAYLOAD_INFO, *PDELAYLOAD_INFO; + +typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_DLL_CALLBACK)(ULONG, PDELAYLOAD_INFO); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DELAYLOADHANDLER_H */

1 0

Nikolay Sivov : shell32: Remove asserts on invalid parameters.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 1c13e6221a9092121f8e05b1aaf9ccc1c202a74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c13e6221a9092121f8e05b1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 11:36:36 2013 +0400 shell32: Remove asserts on invalid parameters. --- dlls/shell32/assoc.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 848bf87..d28fa20 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #include "windef.h" @@ -224,7 +223,6 @@ static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD * DWORD size; LONG ret; - assert(data); ret = RegQueryValueExW(hkey, name, 0, NULL, NULL, &size); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); @@ -337,8 +335,6 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, WCHAR *pszEnd; HRESULT hr; - assert(len); - hr = ASSOC_GetCommand(This, pszExtra, &pszCommand); if (FAILED(hr)) return hr; @@ -376,8 +372,6 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, static HRESULT ASSOC_ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen) { - assert(outlen); - if (out) { if (*outlen < datalen)

1 0

Bruno Jesus : ws2_32: Implement WSADuplicateSocket[A|W] using a helper function.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 0816f85b6b69dc1fa4f141c72a31d69b2e1ae1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0816f85b6b69dc1fa4f141c72… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Sep 8 01:47:46 2013 -0300 ws2_32: Implement WSADuplicateSocket[A|W] using a helper function. --- dlls/ws2_32/socket.c | 51 ++++++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ed55b64..833c713 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1546,6 +1546,27 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws return res; } +static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOW lpProtocolInfo) +{ + HANDLE hProcess; + + TRACE("(unicode %d, socket %04lx, processid %x, buffer %p)\n", + unicode, s, dwProcessId, lpProtocolInfo); + memset(lpProtocolInfo, 0, unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); + /* FIXME: WS_getsockopt(s, WS_SOL_SOCKET, SO_PROTOCOL_INFO, lpProtocolInfo, sizeof(*lpProtocolInfo)); */ + /* I don't know what the real Windoze does next, this is a hack */ + /* ...we could duplicate and then use ConvertToGlobalHandle on the duplicate, then let + * the target use the global duplicate, or we could copy a reference to us to the structure + * and let the target duplicate it from us, but let's do it as simple as possible */ + hProcess = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwProcessId); + DuplicateHandle(GetCurrentProcess(), SOCKET2HANDLE(s), + hProcess, (LPHANDLE)&lpProtocolInfo->dwCatalogEntryId, + 0, FALSE, DUPLICATE_SAME_ACCESS); + CloseHandle(hProcess); + lpProtocolInfo->dwServiceFlags4 = 0xff00ff00; /* magic */ + return 0; +} + /***************************************************************************** * WS_EnterSingleProtocolW [internal] * @@ -6405,22 +6426,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, */ int WINAPI WSADuplicateSocketA( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOA lpProtocolInfo ) { - HANDLE hProcess; - - TRACE("(%ld,%x,%p)\n", s, dwProcessId, lpProtocolInfo); - memset(lpProtocolInfo, 0, sizeof(*lpProtocolInfo)); - /* FIXME: WS_getsockopt(s, WS_SOL_SOCKET, SO_PROTOCOL_INFO, lpProtocolInfo, sizeof(*lpProtocolInfo)); */ - /* I don't know what the real Windoze does next, this is a hack */ - /* ...we could duplicate and then use ConvertToGlobalHandle on the duplicate, then let - * the target use the global duplicate, or we could copy a reference to us to the structure - * and let the target duplicate it from us, but let's do it as simple as possible */ - hProcess = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwProcessId); - DuplicateHandle(GetCurrentProcess(), SOCKET2HANDLE(s), - hProcess, (LPHANDLE)&lpProtocolInfo->dwCatalogEntryId, - 0, FALSE, DUPLICATE_SAME_ACCESS); - CloseHandle(hProcess); - lpProtocolInfo->dwServiceFlags4 = 0xff00ff00; /* magic */ - return 0; + return WS_DuplicateSocket(FALSE, s, dwProcessId, (LPWSAPROTOCOL_INFOW) lpProtocolInfo); } /*********************************************************************** @@ -6428,18 +6434,7 @@ int WINAPI WSADuplicateSocketA( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOA */ int WINAPI WSADuplicateSocketW( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOW lpProtocolInfo ) { - HANDLE hProcess; - - TRACE("(%ld,%x,%p)\n", s, dwProcessId, lpProtocolInfo); - - memset(lpProtocolInfo, 0, sizeof(*lpProtocolInfo)); - hProcess = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwProcessId); - DuplicateHandle(GetCurrentProcess(), SOCKET2HANDLE(s), - hProcess, (LPHANDLE)&lpProtocolInfo->dwCatalogEntryId, - 0, FALSE, DUPLICATE_SAME_ACCESS); - CloseHandle(hProcess); - lpProtocolInfo->dwServiceFlags4 = 0xff00ff00; /* magic */ - return 0; + return WS_DuplicateSocket(TRUE, s, dwProcessId, lpProtocolInfo); } /***********************************************************************

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: fe0a1a23fa7901ebcfba9943c62a29df98fd1f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0a1a23fa7901ebcfba9943c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 6 20:40:02 2013 +0200 loader: Update French translation of wine manpage. --- loader/wine.fr.man.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in index 54807fc..2d4c543 100644 --- a/loader/wine.fr.man.in +++ b/loader/wine.fr.man.in @@ -51,6 +51,10 @@ un shell, par exemple : .PP wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMonProg\(rs\(rstest.exe .PP +Il peut également s'agir d'un des exécutables Windows livrés avec Wine, +auquel cas la spécification d'un chemin complet n'est pas obligatoire, +p.ex. \fIwine explorer\fR ou \fIwine notepad\fR. +.PP .SH ENVIRONNEMENT .B wine passe les variables d'environnement du shell depuis lequel il

1 0

Henri Verbeet : d3drm: Avoid LPSTR.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: a9f3bc43e54b765f1e320d974540c964e489a433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f3bc43e54b765f1e320d974… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:20 2013 +0200 d3drm: Avoid LPSTR. --- dlls/d3drm/d3drm.c | 20 ++----- dlls/d3drm/device.c | 46 ++++++---------- dlls/d3drm/face.c | 29 ++++------- dlls/d3drm/frame.c | 30 ++++------- dlls/d3drm/light.c | 14 ++---- dlls/d3drm/material.c | 10 ++-- dlls/d3drm/meshbuilder.c | 57 ++++++++----------- dlls/d3drm/texture.c | 26 ++++------ dlls/d3drm/viewport.c | 30 ++++------- include/d3drm.h | 6 +- include/d3drmobj.h | 134 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 4 +- 12 files changed, 166 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9f3bc43e54b765f1e320…

1 0

André Hentschel : winedump: Add and use IMAGE_DELAYLOAD_DESCRIPTOR.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: d9a6deff4b66277e51eef8e42271e7d113a8a2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a6deff4b66277e51eef8e42… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 22 18:58:59 2013 +0200 winedump: Add and use IMAGE_DELAYLOAD_DESCRIPTOR. --- include/winnt.h | 22 ++++++++++++++++++++++ tools/winedump/pe.c | 26 ++++++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1f71423..be55d9c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_SIZEOF_RELOCATION 10 +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR +{ + union + { + DWORD AllAttributes; + struct + { + DWORD RvaBased:1; + DWORD ReservedAttributes:31; + } DUMMYSTRUCTNAME; + } Attributes; + + DWORD DllNameRVA; + DWORD ModuleHandleRVA; + DWORD ImportAddressTableRVA; + DWORD ImportNameTableRVA; + DWORD BoundImportAddressTableRVA; + DWORD UnloadInformationTableRVA; + DWORD TimeDateStamp; +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR; +typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; + /* generic relocation types */ #define IMAGE_REL_BASED_ABSOLUTE 0 #define IMAGE_REL_BASED_HIGH 1 diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c26ae69..6721898 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -864,17 +864,7 @@ static void dump_dir_imported_functions(void) static void dump_dir_delay_imported_functions(void) { unsigned directorySize; - const struct ImgDelayDescr - { - DWORD grAttrs; - DWORD szName; - DWORD phmod; - DWORD pIAT; - DWORD pINT; - DWORD pBoundIAT; - DWORD pUnloadIAT; - DWORD dwTimeStamp; - } *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize); + const IMAGE_DELAYLOAD_DESCRIPTOR *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize); if (!importDesc) return; @@ -883,19 +873,19 @@ static void dump_dir_delay_imported_functions(void) for (;;) { const IMAGE_THUNK_DATA32* il; - int offset = (importDesc->grAttrs & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase; + int offset = (importDesc->Attributes.AllAttributes & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase; - if (!importDesc->szName || !importDesc->pIAT || !importDesc->pINT) break; + if (!importDesc->DllNameRVA || !importDesc->ImportAddressTableRVA || !importDesc->ImportNameTableRVA) break; - printf(" grAttrs %08x offset %08lx %s\n", importDesc->grAttrs, Offset(importDesc), - (const char *)RVA(importDesc->szName - offset, sizeof(DWORD))); - printf(" Hint/Name Table: %08x\n", importDesc->pINT); + printf(" grAttrs %08x offset %08lx %s\n", importDesc->Attributes.AllAttributes, Offset(importDesc), + (const char *)RVA(importDesc->DllNameRVA - offset, sizeof(DWORD))); + printf(" Hint/Name Table: %08x\n", importDesc->ImportNameTableRVA); printf(" TimeDateStamp: %08X (%s)\n", - importDesc->dwTimeStamp, get_time_str(importDesc->dwTimeStamp)); + importDesc->TimeDateStamp, get_time_str(importDesc->TimeDateStamp)); printf(" Ordn Name\n"); - il = RVA(importDesc->pINT - offset, sizeof(DWORD)); + il = RVA(importDesc->ImportNameTableRVA - offset, sizeof(DWORD)); if (!il) printf("Can't grab thunk data, going to next imported DLL\n");

1 0

Nikolay Sivov : shell32: Fix handle leak on consecutive Init() calls.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: f0d17b5c171c8814851f740280e103681bce0c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d17b5c171c8814851f74028… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 11:35:37 2013 +0400 shell32: Fix handle leak on consecutive Init() calls. --- dlls/shell32/assoc.c | 11 +++++++++-- dlls/shell32/tests/assoc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 77b0a2d..848bf87 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -184,6 +184,10 @@ static HRESULT WINAPI IQueryAssociations_fnInit( FIXME("hwnd != NULL not supported\n"); if (cfFlags != 0) FIXME("unsupported flags: %x\n", cfFlags); + + RegCloseKey(This->hkeySource); + RegCloseKey(This->hkeyProgID); + This->hkeySource = This->hkeyProgID = NULL; if (pszAssoc != NULL) { ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, @@ -191,8 +195,8 @@ static HRESULT WINAPI IQueryAssociations_fnInit( 0, KEY_READ, &This->hkeySource); - if (ret != ERROR_SUCCESS) - return E_FAIL; + if (ret) + return S_OK; /* if this is not a prog id */ if ((*pszAssoc == '.') || (*pszAssoc == '{')) { @@ -468,6 +472,9 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (!pcchOut) return E_UNEXPECTED; + if (!This->hkeySource && !This->hkeyProgID) + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + switch (str) { case ASSOCSTR_COMMAND: diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index abfe6d4..ff999e9 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -103,6 +103,8 @@ struct assoc_getstring_test }; static const WCHAR httpW[] = {'h','t','t','p',0}; +static const WCHAR httpsW[] = {'h','t','t','p','s',0}; +static const WCHAR badW[] = {'b','a','d','b','a','d',0}; static struct assoc_getstring_test getstring_tests[] = { @@ -163,6 +165,31 @@ static void test_IQueryAssociations_GetString(void) IQueryAssociations_Release(assoc); } +static void test_IQueryAssociations_Init(void) +{ + IQueryAssociations *assoc; + HRESULT hr; + DWORD len; + + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); + ok(hr == S_OK, "failed to create object, 0x%x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Init failed, 0x%08x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + ok(hr == S_OK, "Init failed, 0x%08x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, badW, NULL, NULL); + ok(hr == S_OK || broken(hr == S_FALSE) /* pre-vista */, "Init failed, 0x%08x\n", hr); + + len = 0; + hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || broken(hr == E_FAIL) /* pre-vista */, "got 0x%08x\n", hr); + + IQueryAssociations_Release(assoc); +} + START_TEST(assoc) { IQueryAssociations *qa; @@ -176,6 +203,7 @@ START_TEST(assoc) { test_IQueryAssociations_QueryInterface(); test_IQueryAssociations_GetString(); + test_IQueryAssociations_Init(); IQueryAssociations_Release(qa); }

1 0

Vincent Povirk : winsta: Stub WinStationGetAllProcesses.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: ac5faea093234addc718a72dbd8b381c0ce67361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5faea093234addc718a72db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 6 14:38:48 2013 -0500 winsta: Stub WinStationGetAllProcesses. --- dlls/winsta/main.c | 9 +++++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 867d3c9..71e1dda 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -67,6 +67,15 @@ BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, return FALSE; } +BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, + ULONG *process_count, void *info ) +{ + FIXME( "%p %u %p %p\n", server, level, process_count, info ); + *process_count = 0; + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, PFILETIME process_start_time, PBYTE process_user_sid, PDWORD sid_size) { diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 46162c0..9505615 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -35,7 +35,7 @@ @ stub WinStationFreeGAPMemory @ stub WinStationFreeMemory @ stub WinStationGenerateLicense -@ stub WinStationGetAllProcesses +@ stdcall WinStationGetAllProcesses(ptr long ptr ptr) @ stub WinStationGetLanAdapterNameA @ stub WinStationGetLanAdapterNameW @ stub WinStationGetMachinePolicy

1 0

Detlef Riekenberg : d3dx11_43: Add stub dll.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: e10b687dbfd26a8222a90c6f5d988900c3be790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10b687dbfd26a8222a90c6f5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 4 09:51:36 2013 +0200 d3dx11_43: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dx11_43/Makefile.in | 7 +++++ dlls/d3dx11_43/d3dx11_43.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 44 ++++++++++++++++++++++++++++++++ dlls/d3dx11_43/version.rc | 26 +++++++++++++++++++ 6 files changed, 134 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3143509..b041ce7 100755 --- a/configure +++ b/configure @@ -15993,6 +15993,7 @@ wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 wine_fn_config_dll d3dx9_26 enable_d3dx9_26 diff --git a/configure.ac b/configure.ac index 7b662b4..707e8bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2675,6 +2675,7 @@ WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) WINE_CONFIG_DLL(d3dx9_26) diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in new file mode 100644 index 0000000..3f15f46 --- /dev/null +++ b/dlls/d3dx11_43/Makefile.in @@ -0,0 +1,7 @@ +MODULE = d3dx11_43.dll + +C_SRCS = d3dx11_43.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c new file mode 100644 index 0000000..a609613 --- /dev/null +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -0,0 +1,55 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" +#include "d3d11.h" + +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + + return TRUE; +} + +/*********************************************************************** + * D3DX11CheckVersion + * + * Checks whether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +{ + if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 43)) + return TRUE; + + return FALSE; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec new file mode 100644 index 0000000..3fd291c --- /dev/null +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -0,0 +1,44 @@ +@ stdcall D3DX11CheckVersion(long long) +@ stub D3DX11CompileFromFileA +@ stub D3DX11CompileFromFileW +@ stub D3DX11CompileFromMemory +@ stub D3DX11CompileFromResourceA +@ stub D3DX11CompileFromResourceW +@ stub D3DX11ComputeNormalMap +@ stub D3DX11CreateAsyncCompilerProcessor +@ stub D3DX11CreateAsyncFileLoaderA +@ stub D3DX11CreateAsyncFileLoaderW +@ stub D3DX11CreateAsyncMemoryLoader +@ stub D3DX11CreateAsyncResourceLoaderA +@ stub D3DX11CreateAsyncResourceLoaderW +@ stub D3DX11CreateAsyncShaderPreprocessProcessor +@ stub D3DX11CreateAsyncShaderResourceViewProcessor +@ stub D3DX11CreateAsyncTextureInfoProcessor +@ stub D3DX11CreateAsyncTextureProcessor +@ stub D3DX11CreateShaderResourceViewFromFileA +@ stub D3DX11CreateShaderResourceViewFromFileW +@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromResourceA +@ stub D3DX11CreateShaderResourceViewFromResourceW +@ stub D3DX11CreateTextureFromFileA +@ stub D3DX11CreateTextureFromFileW +@ stub D3DX11CreateTextureFromMemory +@ stub D3DX11CreateTextureFromResourceA +@ stub D3DX11CreateTextureFromResourceW +@ stub D3DX11CreateThreadPump +@ stub D3DX11FilterTexture +@ stub D3DX11GetImageInfoFromFileA +@ stub D3DX11GetImageInfoFromFileW +@ stub D3DX11GetImageInfoFromMemory +@ stub D3DX11GetImageInfoFromResourceA +@ stub D3DX11GetImageInfoFromResourceW +@ stub D3DX11LoadTextureFromTexture +@ stub D3DX11PreprocessShaderFromFileA +@ stub D3DX11PreprocessShaderFromFileW +@ stub D3DX11PreprocessShaderFromMemory +@ stub D3DX11PreprocessShaderFromResourceA +@ stub D3DX11PreprocessShaderFromResourceW +@ stub D3DX11SHProjectCubeMap +@ stub D3DX11SaveTextureToFileA +@ stub D3DX11SaveTextureToFileW +@ stub D3DX11SaveTextureToMemory diff --git a/dlls/d3dx11_43/version.rc b/dlls/d3dx11_43/version.rc new file mode 100644 index 0000000..622875e --- /dev/null +++ b/dlls/d3dx11_43/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DX11" +#define WINE_FILENAME_STR "d3dx11_43.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : wined3d: Get rid of the "dirty" flag to wined3d_texture_set_dirty().
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: c44012f0c1d75e999206a67af607473ea3b3ecae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44012f0c1d75e999206a67af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:17 2013 +0200 wined3d: Get rid of the "dirty" flag to wined3d_texture_set_dirty(). --- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/texture.c | 12 ++++++------ dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 011be7a..fb88082 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2488,7 +2488,7 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 if (surface->container) { TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } @@ -5162,7 +5162,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, if (surface->container) { TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } @@ -5354,7 +5354,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO if (surface->container) { TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } surface->flags &= ~SFLAG_LOCATIONS; @@ -5376,7 +5376,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO if (surface->container) { TRACE("Passing to container\n"); - wined3d_texture_set_dirty(surface->container, TRUE); + wined3d_texture_set_dirty(surface->container); } } surface->flags &= ~location; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e60a426..e9173ce 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -114,7 +114,7 @@ static void wined3d_texture_unload(struct wined3d_texture *texture) if (context) context_release(context); - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); resource_unload(&texture->resource); } @@ -139,10 +139,10 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) resource_cleanup(&texture->resource); } -void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) +void wined3d_texture_set_dirty(struct wined3d_texture *texture) { - texture->texture_rgb.dirty = dirty; - texture->texture_srgb.dirty = dirty; + texture->texture_rgb.dirty = TRUE; + texture->texture_srgb.dirty = TRUE; } /* Context activation is done by the caller. */ @@ -195,7 +195,7 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, else gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = srgb; gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); new_texture = TRUE; if (texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) @@ -592,7 +592,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - wined3d_texture_set_dirty(texture, TRUE); + wined3d_texture_set_dirty(texture); texture->texture_ops->texture_sub_resource_add_dirty_region(sub_resource, dirty_region); return WINED3D_OK; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a1c7876..7f2dbf9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -605,7 +605,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) { - wined3d_texture_set_dirty(volume->container, TRUE); + wined3d_texture_set_dirty(volume->container); if (volume->flags & WINED3D_VFLAG_PBO) wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_BUFFER); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a8ced0..b771869 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2108,7 +2108,7 @@ static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_t void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; +void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_LOCKED 0x00000001 #define WINED3D_VFLAG_ALLOCATED 0x00000002

1 0