wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Nikolay Sivov : shell32: Fix search for a command string to cover more cases ( like protocol associations).
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 4f6230d5c46c3e2287e56c426889bb6220b36289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6230d5c46c3e2287e56c426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 09:26:40 2013 +0400 shell32: Fix search for a command string to cover more cases (like protocol associations). --- dlls/shell32/assoc.c | 113 ++++++++++++++++++++++++++----------------------- 1 files changed, 60 insertions(+), 53 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index ad23c7d..65f4644 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -240,79 +240,86 @@ static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD * return S_OK; } -static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, - LPCWSTR pszExtra, WCHAR **ppszCommand) +static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra, WCHAR **command) { HKEY hkeyCommand; - HKEY hkeyFile; HKEY hkeyShell; HKEY hkeyVerb; HRESULT hr; LONG ret; - WCHAR * pszExtraFromReg = NULL; - WCHAR * pszFileType; + WCHAR *extra_from_reg = NULL; + WCHAR *filetype; static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; static const WCHAR shellW[] = { 's','h','e','l','l',0 }; - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); - if (FAILED(hr)) - return hr; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); - HeapFree(GetProcessHeap(), 0, pszFileType); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); + /* When looking for file extension it's possible to have a default value + that points to another key that contains 'shell/<verb>/command' subtree. */ + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&filetype, NULL); + if (hr == S_OK) + { + HKEY hkeyFile; - ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); - RegCloseKey(hkeyFile); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, KEY_READ, &hkeyFile); + HeapFree(GetProcessHeap(), 0, filetype); + if (ret) return HRESULT_FROM_WIN32(ret); - if (!pszExtra) + ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + RegCloseKey(hkeyFile); + if (ret) return HRESULT_FROM_WIN32(ret); + } + else { - hr = ASSOC_GetValue(hkeyShell, NULL, (void**)&pszExtraFromReg, NULL); - /* if no default action */ - if (hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) - { - DWORD rlen; - ret = RegQueryInfoKeyW(hkeyShell, 0, 0, 0, 0, &rlen, 0, 0, 0, 0, 0, 0); - if (ret != ERROR_SUCCESS) - { - RegCloseKey(hkeyShell); - return HRESULT_FROM_WIN32(ret); - } - rlen++; - pszExtraFromReg = HeapAlloc(GetProcessHeap(), 0, rlen * sizeof(WCHAR)); - if (!pszExtraFromReg) - { - RegCloseKey(hkeyShell); - return E_OUTOFMEMORY; - } - ret = RegEnumKeyExW(hkeyShell, 0, pszExtraFromReg, &rlen, 0, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS) + ret = RegOpenKeyExW(This->hkeySource, shellW, 0, KEY_READ, &hkeyShell); + if (ret) return HRESULT_FROM_WIN32(ret); + } + + if (!extra) + { + /* check for default verb */ + hr = ASSOC_GetValue(hkeyShell, NULL, (void**)&extra_from_reg, NULL); + if (FAILED(hr)) { - RegCloseKey(hkeyShell); - return HRESULT_FROM_WIN32(ret); + /* no default verb, try first subkey */ + DWORD max_subkey_len; + + ret = RegQueryInfoKeyW(hkeyShell, NULL, NULL, NULL, NULL, &max_subkey_len, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret) + { + RegCloseKey(hkeyShell); + return HRESULT_FROM_WIN32(ret); + } + + max_subkey_len++; + extra_from_reg = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + if (!extra_from_reg) + { + RegCloseKey(hkeyShell); + return E_OUTOFMEMORY; + } + + ret = RegEnumKeyExW(hkeyShell, 0, extra_from_reg, &max_subkey_len, NULL, NULL, NULL, NULL); + if (ret) + { + HeapFree(GetProcessHeap(), 0, extra_from_reg); + RegCloseKey(hkeyShell); + return HRESULT_FROM_WIN32(ret); + } } - } - else if (FAILED(hr)) - { - RegCloseKey(hkeyShell); - return hr; - } + extra = extra_from_reg; } - ret = RegOpenKeyExW(hkeyShell, pszExtra ? pszExtra : pszExtraFromReg, 0, - KEY_READ, &hkeyVerb); - HeapFree(GetProcessHeap(), 0, pszExtraFromReg); + /* open verb subkey */ + ret = RegOpenKeyExW(hkeyShell, extra, 0, KEY_READ, &hkeyVerb); + HeapFree(GetProcessHeap(), 0, extra_from_reg); RegCloseKey(hkeyShell); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); + if (ret) return HRESULT_FROM_WIN32(ret); + /* open command subkey */ ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); RegCloseKey(hkeyVerb); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, NULL, (void**)ppszCommand, NULL); + if (ret) return HRESULT_FROM_WIN32(ret); + + hr = ASSOC_GetValue(hkeyCommand, NULL, (void**)command, NULL); RegCloseKey(hkeyCommand); return hr; }

1 0

Bruno Jesus : ws2_32: Implement WSADuplicateSocket[A|W] using a helper function.
by Alexandre Julliard 09 Sep '13

09 Sep '13

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

Bruno Jesus : ws2_32/tests: Mark WinNT result as broken.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: d77522988ba1950c46704bdb04dd4731a272b420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77522988ba1950c46704bdb0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Sep 8 01:47:35 2013 -0300 ws2_32/tests: Mark WinNT result as broken. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5d80fca..78521ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1286,8 +1286,10 @@ todo_wine infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); todo_wine { - ok(infoA.szProtocol[0], "WSAPROTOCOL_INFOA was not filled\n"); - ok(infoW.szProtocol[0], "WSAPROTOCOL_INFOW was not filled\n"); + ok(infoA.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, + "WSAPROTOCOL_INFOA was not filled\n"); + ok(infoW.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, + "WSAPROTOCOL_INFOW was not filled\n"); } WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1,

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard 09 Sep '13

09 Sep '13

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

Vincent Povirk : winsta: Stub WinStationGetAllProcesses.
by Alexandre Julliard 09 Sep '13

09 Sep '13

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

Vincent Povirk : winsta: Stub WinStationRegisterConsoleNotification.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 7c215d5a259dd711b339911b3ac0f6a9c67ead63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c215d5a259dd711b339911b3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 6 12:55:58 2013 -0500 winsta: Stub WinStationRegisterConsoleNotification. --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 505163b..867d3c9 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -60,6 +60,13 @@ BOOLEAN WINAPI WinStationQueryInformationW( HANDLE server, ULONG logon_id, WINST return FALSE; } +BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, ULONG flags ) +{ + FIXME( "%p %p 0x%x\n", server, hwnd, flags ); + 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 32185d3..46162c0 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -53,7 +53,7 @@ @ stub WinStationQueryLicense @ stub WinStationQueryLogonCredentialsW @ stub WinStationQueryUpdateRequired -@ stub WinStationRegisterConsoleNotification +@ stdcall WinStationRegisterConsoleNotification(ptr ptr long) @ stub WinStationRemoveLicense @ stub WinStationRenameA @ stub WinStationRenameW

1 0

Aric Stewart : Unicode Private Use Area is also rotated by tategaki.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 5aa1f6b7a5d4de373c6f366c9cf7f7a947eb23b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa1f6b7a5d4de373c6f366c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 6 14:47:40 2013 -0500 Unicode Private Use Area is also rotated by tategaki. --- dlls/gdi32/freetype.c | 3 ++- dlls/wineps.drv/text.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d9f111a..2a2619ee 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6152,7 +6152,8 @@ static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = {0xA000, 0xABFF}, /* Hangul Syllables */ /* Hangul Jamo Extended-B */ - {0xD800, 0xF8FF}, + {0xD800, 0xDFFF}, + /* Private Use Area */ /* CJK Compatibility Ideographs */ {0xFB00, 0xFE0F}, /* Vertical Forms */ diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index a9623a1..7ba59f9 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -65,7 +65,8 @@ static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = {0xA000, 0xABFF}, /* Hangul Syllables */ /* Hangul Jamo Extended-B */ - {0xD800, 0xF8FF}, + {0xD800, 0xDFFF}, + /* Private Use Area */ /* CJK Compatibility Ideographs */ {0xFB00, 0xFE0F}, /* Vertical Forms */

1 0

Henri Verbeet : d3drm: Avoid LPVOID.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 16c48f9d84c127e53074f01268f1a8cd09e1b8a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c48f9d84c127e53074f0126… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:21 2013 +0200 d3drm: Avoid LPVOID. --- dlls/d3drm/d3drm.c | 20 ++---- dlls/d3drm/d3drm_main.c | 2 +- dlls/d3drm/device.c | 88 ++++++++--------------- dlls/d3drm/face.c | 36 +++------ dlls/d3drm/frame.c | 56 +++++--------- dlls/d3drm/light.c | 18 ++--- dlls/d3drm/material.c | 14 ++-- dlls/d3drm/meshbuilder.c | 88 +++++++++-------------- dlls/d3drm/tests/d3drm.c | 4 +- dlls/d3drm/texture.c | 42 +++++------ dlls/d3drm/viewport.c | 36 +++------ include/d3drm.h | 6 +- include/d3drmdef.h | 5 +- include/d3drmobj.h | 183 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 4 +- 15 files changed, 248 insertions(+), 354 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16c48f9d84c127e53074f…

1 0

Henri Verbeet : d3drm: Avoid LPSTR.
by Alexandre Julliard 09 Sep '13

09 Sep '13

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

Henri Verbeet : wined3d: Rewrite surface_modify_location() on top of surface_validate_location() and surface_invalidate_location().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: e2f4ab46077f22d399f50c51abc2fc7bb429a613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f4ab46077f22d399f50c51a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:19 2013 +0200 wined3d: Rewrite surface_modify_location() on top of surface_validate_location() and surface_invalidate_location(). --- dlls/wined3d/surface.c | 68 +++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fb88082..385a994 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5329,10 +5329,39 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co surface->ds_current_size.cy = surface->resource.height; } +static void surface_validate_location(struct wined3d_surface *surface, DWORD location) +{ + struct wined3d_surface *overlay; + + TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); + + surface->flags |= (location & SFLAG_LOCATIONS); + + /* Redraw emulated overlays, if any. */ + if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) + { + LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) + { + surface_draw_overlay(overlay); + } + } +} + +static void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) +{ + TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); + + if ((location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && surface->container) + wined3d_texture_set_dirty(surface->container); + surface->flags &= ~(location & SFLAG_LOCATIONS); + + if (!(surface->flags & SFLAG_LOCATIONS)) + ERR("Surface %p does not have any up to date location.\n", surface); +} + void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - struct wined3d_surface *overlay; TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(location), persistent); @@ -5348,43 +5377,12 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO if (persistent) { - if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) - || ((surface->flags & SFLAG_INSRGBTEX) && !(location & SFLAG_INSRGBTEX))) - { - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container); - } - } - surface->flags &= ~SFLAG_LOCATIONS; - surface->flags |= location; - - /* Redraw emulated overlays, if any */ - if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) - { - LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) - { - surface_draw_overlay(overlay); - } - } + surface_validate_location(surface, location); + surface_invalidate_location(surface, ~location); } else { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX))) - { - if (surface->container) - { - TRACE("Passing to container\n"); - wined3d_texture_set_dirty(surface->container); - } - } - surface->flags &= ~location; - } - - if (!(surface->flags & SFLAG_LOCATIONS)) - { - ERR("Surface %p does not have any up to date location.\n", surface); + surface_invalidate_location(surface, location); } }

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
65
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 September 2013