August 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : winefile: Use the explicit W-form for the *Window* functions.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 4490759a2734df92d1529610f74c19ff808de18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4490759a2734df92d1529610f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:19 2009 +0200 winefile: Use the explicit W-form for the *Window* functions. --- programs/winefile/winefile.c | 64 +++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4490759a2734df92d1529…

1 0

Michael Stefaniuc : winefile: Use the explicit W-form of the string functions.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 2ebe3db8fbe121c3e4332a34f42d2e0b1a0f0a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe3db8fbe121c3e4332a34f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:11 2009 +0200 winefile: Use the explicit W-form of the string functions. --- programs/winefile/winefile.c | 102 +++++++++++++++++++++--------------------- 1 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebe3db8fbe121c3e4332…

1 0

Michael Stefaniuc : winefile: Use the explicit SendMessageW form.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 0c6e5293bbc53e7ebb182d3180cf58d0a0538313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6e5293bbc53e7ebb182d318… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:24:06 2009 +0200 winefile: Use the explicit SendMessageW form. --- programs/winefile/winefile.c | 150 +++++++++++++++++++++--------------------- 1 files changed, 75 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c6e5293bbc53e7ebb182…

1 0

Michael Stefaniuc : winefile: Don't use _tsplitpath().
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 3dc7bceb48a28df712a0745d95eb6419648f9a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc7bceb48a28df712a0745d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:23:55 2009 +0200 winefile: Don't use _tsplitpath(). --- programs/winefile/splitpath.c | 31 ++++++++++++++----------------- programs/winefile/winefile.c | 14 +++++++------- programs/winefile/winefile.h | 9 --------- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/programs/winefile/splitpath.c b/programs/winefile/splitpath.c index d4a11d7..7425147 100644 --- a/programs/winefile/splitpath.c +++ b/programs/winefile/splitpath.c @@ -19,8 +19,6 @@ #include "winefile.h" -#ifdef __WINE__ - void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext) { const WCHAR* end; /* end of processed string */ @@ -73,25 +71,24 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* *dir = '\0'; } } -#endif /* __WINE__ */ /* void main() // test splipath() { - TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; - - _tsplitpath(L"x\\y", drv, dir, name, ext); - _tsplitpath(L"x\\", drv, dir, name, ext); - _tsplitpath(L"\\x", drv, dir, name, ext); - _tsplitpath(L"x", drv, dir, name, ext); - _tsplitpath(L"", drv, dir, name, ext); - _tsplitpath(L".x", drv, dir, name, ext); - _tsplitpath(L":x", drv, dir, name, ext); - _tsplitpath(L"a:x", drv, dir, name, ext); - _tsplitpath(L"a.b:x", drv, dir, name, ext); - _tsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext); - _tsplitpath(L"abc.EFGH:12345", drv, dir, name, ext); - _tsplitpath(L"C:/dos/command.com", drv, dir, name, ext); + WCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; + + _wsplitpath(L"x\\y", drv, dir, name, ext); + _wsplitpath(L"x\\", drv, dir, name, ext); + _wsplitpath(L"\\x", drv, dir, name, ext); + _wsplitpath(L"x", drv, dir, name, ext); + _wsplitpath(L"", drv, dir, name, ext); + _wsplitpath(L".x", drv, dir, name, ext); + _wsplitpath(L":x", drv, dir, name, ext); + _wsplitpath(L"a:x", drv, dir, name, ext); + _wsplitpath(L"a.b:x", drv, dir, name, ext); + _wsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext); + _wsplitpath(L"abc.EFGH:12345", drv, dir, name, ext); + _wsplitpath(L"C:/dos/command.com", drv, dir, name, ext); } */ diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index e45ee99..aed5b38 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1386,7 +1386,7 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) { lstrcpy(child->path, path); - _tsplitpath(path, drv, dir, name, ext); + _wsplitpath(path, drv, dir, name, ext); } lstrcpy(child->filter_pattern, sAsterics); @@ -2101,14 +2101,14 @@ static BOOL activate_drive_window(LPCTSTR path) TCHAR drv1[_MAX_DRIVE], drv2[_MAX_DRIVE]; HWND child_wnd; - _tsplitpath(path, drv1, 0, 0, 0); + _wsplitpath(path, drv1, 0, 0, 0); /* search for a already open window for the same drive */ for(child_wnd=GetNextWindow(Globals.hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { ChildWnd* child = (ChildWnd*) GetWindowLongPtr(child_wnd, GWLP_USERDATA); if (child) { - _tsplitpath(child->root.path, drv2, 0, 0, 0); + _wsplitpath(child->root.path, drv2, 0, 0, 0); if (!lstrcmpi(drv2, drv1)) { SendMessage(Globals.hmdiclient, WM_MDIACTIVATE, (WPARAM)child_wnd, 0); @@ -2198,7 +2198,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM if (activate_drive_window(root)) return 0; - _tsplitpath(root, drv, 0, 0, 0); + _wsplitpath(root, drv, 0, 0, 0); if (!SetCurrentDirectory(drv)) { display_error(hwnd, GetLastError()); @@ -3690,7 +3690,7 @@ static void refresh_child(ChildWnd* child) int idx; get_path(child->left.cur, path); - _tsplitpath(path, drv, NULL, NULL, NULL); + _wsplitpath(path, drv, NULL, NULL, NULL); child->right.root = NULL; @@ -4017,7 +4017,7 @@ static BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) TCHAR fname[_MAX_FNAME], ext[_MAX_EXT]; static const TCHAR sAppend[] = {'%','s','/','%','s','%','s','\0'}; - _tsplitpath(source, NULL, NULL, fname, ext); + _wsplitpath(source, NULL, NULL, fname, ext); wsprintf(target, sAppend, path, fname, ext); } @@ -4733,7 +4733,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) memset(name,0,sizeof(name)); memset(name,0,sizeof(ext)); - _tsplitpath(path, drv, dir, name, ext); + _wsplitpath(path, drv, dir, name, ext); if (name[0]) { count = SendMessage(child->right.hwnd, LB_GETCOUNT, 0, 0); diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index 98684c8..ac2b43c 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -145,13 +145,4 @@ typedef struct extern WINEFILE_GLOBALS Globals; -#ifdef __WINE__ - extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); -#define _tsplitpath _wsplitpath - -#else - -#include <tchar.h> /* for _tsplitpath() */ - -#endif

1 0

Michael Stefaniuc : winefile: Get rid of the #ifndef UNICODE code paths.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 2b8f5e374237cd277b784cb648306921524e0e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8f5e374237cd277b784cb64… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:23:46 2009 +0200 winefile: Get rid of the #ifndef UNICODE code paths. --- programs/winefile/splitpath.c | 58 ------------------------- programs/winefile/winefile.c | 94 +--------------------------------------- programs/winefile/winefile.h | 5 -- 3 files changed, 3 insertions(+), 154 deletions(-) diff --git a/programs/winefile/splitpath.c b/programs/winefile/splitpath.c index 42286ec..d4a11d7 100644 --- a/programs/winefile/splitpath.c +++ b/programs/winefile/splitpath.c @@ -20,7 +20,6 @@ #ifdef __WINE__ -#ifdef UNICODE void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext) { @@ -74,63 +73,6 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* *dir = '\0'; } } - -#else /* UNICODE */ - -void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext) -{ - const CHAR* end; /* end of processed string */ - const CHAR* p; /* search pointer */ - const CHAR* s; /* copy pointer */ - - /* extract drive name */ - if (path[0] && path[1]==':') { - if (drv) { - *drv++ = *path++; - *drv++ = *path++; - *drv = '\0'; - } - } else if (drv) - *drv = '\0'; - - /* search for end of string or stream separator */ - for(end=path; *end && *end!=':'; ) - end++; - - /* search for begin of file extension */ - for(p=end; p>path && *--p!='\\' && *p!='/'; ) - if (*p == '.') { - end = p; - break; - } - - if (ext) - for(s=end; (*ext=*s++); ) - ext++; - - /* search for end of directory name */ - for(p=end; p>path; ) - if (*--p=='\\' || *p=='/') { - p++; - break; - } - - if (name) { - for(s=p; s<end; ) - *name++ = *s++; - - *name = '\0'; - } - - if (dir) { - for(s=path; s<p; ) - *dir++ = *s++; - - *dir = '\0'; - } -} - -#endif /* UNICODE */ #endif /* __WINE__ */ diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 0193c7b..e45ee99 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -535,14 +535,9 @@ static void read_directory_unix(Entry* dir, LPCTSTR path) DIR* pdir; int level = dir->level + 1; -#ifdef UNICODE char cpath[MAX_PATH]; WideCharToMultiByte(CP_UNIXCP, 0, path, -1, cpath, MAX_PATH, NULL, NULL); -#else - const char* cpath = path; -#endif - pdir = opendir(cpath); if (pdir) { @@ -569,11 +564,7 @@ static void read_directory_unix(Entry* dir, LPCTSTR path) entry->etype = ET_UNIX; strcpy(p, ent->d_name); -#ifdef UNICODE MultiByteToWideChar(CP_UNIXCP, 0, p, -1, entry->data.cFileName, MAX_PATH); -#else - lstrcpy(entry->data.cFileName, p); -#endif if (!stat(buffer, &st)) { entry->data.dwFileAttributes = p[0]=='.'? FILE_ATTRIBUTE_HIDDEN: 0; @@ -678,69 +669,12 @@ static Entry* read_tree_unix(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWN #ifdef _SHELL_FOLDERS -#ifdef UNICODE -#define get_strret get_strretW -#define path_from_pidl path_from_pidlW -#else -#define get_strret get_strretA -#define path_from_pidl path_from_pidlA -#endif - - static void free_strret(STRRET* str) { if (str->uType == STRRET_WSTR) IMalloc_Free(Globals.iMalloc, str->UNION_MEMBER(pOleStr)); } - -#ifndef UNICODE - -static LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count) -{ - LPCSTR s; - LPSTR d = dest; - - for(s=source; count&&(*d++=*s++); ) - count--; - - return dest; -} - -static void get_strretA(STRRET* str, const SHITEMID* shiid, LPSTR buffer, int len) -{ - switch(str->uType) { - case STRRET_WSTR: - WideCharToMultiByte(CP_ACP, 0, str->UNION_MEMBER(pOleStr), -1, buffer, len, NULL, NULL); - break; - - case STRRET_OFFSET: - strcpyn(buffer, (LPCSTR)shiid+str->UNION_MEMBER(uOffset), len); - break; - - case STRRET_CSTR: - strcpyn(buffer, str->UNION_MEMBER(cStr), len); - } -} - -static HRESULT path_from_pidlA(IShellFolder* folder, LPITEMIDLIST pidl, LPSTR buffer, int len) -{ - STRRET str; - - /* SHGDN_FORPARSING: get full path of id list */ - HRESULT hr = IShellFolder_GetDisplayNameOf(folder, pidl, SHGDN_FORPARSING, &str); - - if (SUCCEEDED(hr)) { - get_strretA(&str, &pidl->mkid, buffer, len); - free_strret(&str); - } else - buffer[0] = '\0'; - - return hr; -} - -#endif - static LPWSTR wcscpyn(LPWSTR dest, LPCWSTR source, size_t count) { LPCWSTR s; @@ -776,7 +710,7 @@ static HRESULT name_from_pidl(IShellFolder* folder, LPITEMIDLIST pidl, LPTSTR bu HRESULT hr = IShellFolder_GetDisplayNameOf(folder, pidl, flags, &str); if (SUCCEEDED(hr)) { - get_strret(&str, &pidl->mkid, buffer, len); + get_strretW(&str, &pidl->mkid, buffer, len); free_strret(&str); } else buffer[0] = '\0'; @@ -809,13 +743,7 @@ static LPITEMIDLIST get_path_pidl(LPTSTR path, HWND hwnd) LPITEMIDLIST pidl; HRESULT hr; ULONG len; - -#ifdef UNICODE LPWSTR buffer = path; -#else - WCHAR buffer[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, path, -1, buffer, MAX_PATH); -#endif hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); if (FAILED(hr)) @@ -1519,7 +1447,7 @@ static void get_path(Entry* dir, PTSTR path) if (SUCCEEDED(hr) && (attribs&SFGAO_FILESYSTEM)) { IShellFolder* parent = dir->up? dir->up->folder: Globals.iDesktop; - hr = path_from_pidl(parent, dir->pidl, path, MAX_PATH); + hr = path_from_pidlW(parent, dir->pidl, path, MAX_PATH); } } else @@ -1957,18 +1885,12 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCTSTR st for(p=InfoStrings; *p; ++p) { TCHAR subblock[200]; -#ifdef UNICODE TCHAR infoStr[100]; -#endif LPCTSTR pTxt; UINT nValLen; LPCSTR pInfoString = *p; -#ifdef UNICODE MultiByteToWideChar(CP_ACP, 0, pInfoString, -1, infoStr, 100); -#else -#define infoStr pInfoString -#endif wsprintf(subblock, sStringFileInfo, pTranslate->wLanguage, pTranslate->wCodePage, infoStr); /* Retrieve file description for language and code page */ @@ -2402,20 +2324,14 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM #ifdef __WINE__ case ID_DRIVE_UNIX_FS: { TCHAR path[MAX_PATH]; -#ifdef UNICODE char cpath[MAX_PATH]; -#endif ChildWnd* child; if (activate_fs_window(RS(b1,IDS_UNIXFS))) break; -#ifdef UNICODE getcwd(cpath, MAX_PATH); MultiByteToWideChar(CP_UNIXCP, 0, cpath, -1, path, MAX_PATH); -#else - getcwd(path, MAX_PATH); -#endif child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) @@ -4914,7 +4830,7 @@ static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) } -#if defined(UNICODE) && defined(_MSC_VER) +#if defined(_MSC_VER) int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) #else int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, int cmdshow) @@ -4925,15 +4841,11 @@ int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, return 1; #endif -#if defined(UNICODE) && !defined(_MSC_VER) { /* convert ANSI cmdline into WCS path string */ TCHAR buffer[MAX_PATH]; MultiByteToWideChar(CP_ACP, 0, cmdline, -1, buffer, MAX_PATH); winefile_main(hinstance, cmdshow, buffer); } -#else - winefile_main(hinstance, cmdshow, cmdline); -#endif return 0; } diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index 7c1f66c..98684c8 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -147,13 +147,8 @@ extern WINEFILE_GLOBALS Globals; #ifdef __WINE__ -#ifdef UNICODE extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); #define _tsplitpath _wsplitpath -#else -extern void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext); -#define _tsplitpath _splitpath -#endif #else

1 0

Michael Stefaniuc : ntdll: Fix a memory leak on an error path (Smatch).
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 091f33e8c623f1490d1f9c829618553c2c1a96f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091f33e8c623f1490d1f9c829… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 25 00:25:04 2009 +0200 ntdll: Fix a memory leak on an error path (Smatch). --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f44bd60..438d798 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -170,7 +170,7 @@ static NTSTATUS init_user_process_params( SIZE_T data_size, HANDLE *exe_file ) } } SERVER_END_REQ; - if (status != STATUS_SUCCESS) return status; + if (status != STATUS_SUCCESS) goto done; size = sizeof(*params); size += MAX_NT_PATH_LENGTH * sizeof(WCHAR);

1 0

Alexandre Julliard : shell32: Move the IQueryAssociations implementation from shlwapi to shell32.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 4d413296d2fc480338ca493f6fb51fd7a84c51f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d413296d2fc480338ca493f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 11:13:26 2009 +0200 shell32: Move the IQueryAssociations implementation from shlwapi to shell32. --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/assoc.c | 712 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shlwapi/assoc.c | 713 +------------------------------------------ 5 files changed, 725 insertions(+), 705 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d413296d2fc480338ca4…

1 0

Henri Verbeet : d3d8: Use a wined3d cs for wined3d locking.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: f9c791f9ca6ecbf14cda12c1c946a48a53ba04f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c791f9ca6ecbf14cda12c1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 08:17:14 2009 +0200 d3d8: Use a wined3d cs for wined3d locking. We will need this for d3d10, where both dxgi and d3d10core are making wined3d calls. Right now d3d8/d3d9 also use this to protect their own data, but eventually we should push this down into wined3d itself and use something a bit more fine-grained. There's no good reason that doing e.g. a vertex buffer upload in some thread should block all of wined3d. --- dlls/d3d8/cubetexture.c | 84 ++++--- dlls/d3d8/d3d8_main.c | 15 +- dlls/d3d8/d3d8_private.h | 3 - dlls/d3d8/device.c | 498 ++++++++++++++++++++++++----------------- dlls/d3d8/directx.c | 77 ++++--- dlls/d3d8/indexbuffer.c | 53 +++-- dlls/d3d8/pixelshader.c | 5 +- dlls/d3d8/stateblock.c | 23 +-- dlls/d3d8/surface.c | 42 ++-- dlls/d3d8/swapchain.c | 15 +- dlls/d3d8/texture.c | 85 +++++--- dlls/d3d8/vertexbuffer.c | 53 +++-- dlls/d3d8/vertexdeclaration.c | 5 +- dlls/d3d8/vertexshader.c | 4 +- dlls/d3d8/volume.c | 39 ++-- dlls/d3d8/volumetexture.c | 83 ++++--- dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_main.c | 19 ++ include/wine/wined3d.idl | 2 + 19 files changed, 647 insertions(+), 460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c791f9ca6ecbf14cda1…

1 0

Henri Verbeet : d3d8: Remove stray tabs.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 4d1379f6a9aa0d2b5f9069b59daee06171076205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1379f6a9aa0d2b5f9069b59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 08:17:13 2009 +0200 d3d8: Remove stray tabs. --- dlls/d3d8/d3d8_main.c | 4 ++-- dlls/d3d8/directx.c | 12 ++++++------ dlls/d3d8/tests/device.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 8e32dc3..02d9bae 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -77,7 +77,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } /*********************************************************************** - * ValidateVertexShader (D3D8.@) + * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's * bool seems always passed as 0 or 1, but other values work as well.... @@ -108,7 +108,7 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD } /*********************************************************************** - * ValidatePixelShader (D3D8.@) + * ValidatePixelShader (D3D8.@) * * PARAMS * toto result? diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index eed4b8b..e294d16 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -221,9 +221,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 i return hr; } -static HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(LPDIRECT3D8 iface, - UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, - BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType) { +static HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(IDirect3D8 *iface, UINT Adapter, + D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType) +{ IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; TRACE("(%p)-<(%d, %d, %d, %s, %d)\n", This, Adapter, DeviceType, SurfaceFormat, Windowed ? "true" : "false", MultiSampleType); @@ -235,9 +235,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(LPDIRECT3D8 if return hr; } -static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(LPDIRECT3D8 iface, - UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, - D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { +static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(IDirect3D8 *iface, UINT Adapter, D3DDEVTYPE DeviceType, + D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) +{ IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; TRACE("(%p)-<(%d, %d, %d, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 97f64a1..f635713 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -310,7 +310,7 @@ static void test_refcount(void) D3DVSD_STREAM(0), D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ D3DVSD_REG(D3DVSDE_DIFFUSE, D3DVSDT_D3DCOLOR), /* D3DVSDE_DIFFUSE, Register v5 */ - D3DVSD_END() + D3DVSD_END() }; pD3d = pDirect3DCreate8( D3D_SDK_VERSION );

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in find_conversion_shift().
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 839658848c22e8b9ab35f4c69f078224b945a790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=839658848c22e8b9ab35f4c69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 08:17:12 2009 +0200 wined3d: Properly check if an attribute is used in find_conversion_shift(). --- dlls/wined3d/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 11a365a..104f572 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -258,7 +258,7 @@ static UINT *find_conversion_shift(struct wined3d_buffer *This, { WINED3DFORMAT format; - if (strided->elements[i].buffer_object != This->buffer_object) continue; + if (!(strided->use_map & (1 << i)) || strided->elements[i].buffer_object != This->buffer_object) continue; format = strided->elements[i].format_desc->format; if (format == WINED3DFMT_R16G16_FLOAT)

1 0