wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Paul Vriens : appwiz.cpl: Add the Serbian (Latin) translation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 5de86f4db2c918b6c754358840b3068b5b79dd64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de86f4db2c918b6c75435884… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 20 23:22:43 2010 +0200 appwiz.cpl: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/Sr.rc | 87 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 079c1e0..4a92f35 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -26,6 +26,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc \ Zh.rc \ diff --git a/dlls/appwiz.cpl/Sr.rc b/dlls/appwiz.cpl/Sr.rc new file mode 100644 index 0000000..9fb2e77 --- /dev/null +++ b/dlls/appwiz.cpl/Sr.rc @@ -0,0 +1,87 @@ +/* +* Add/Remove Programs Serbian resources +* +* Copyright 2010 Nenad Vujic +* Paul Vriens +* +* 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 "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_CPL_TITLE, "Dodaj/Ukloni programe" + IDS_CPL_DESC, "Instaliranje novog programa ili brisanje istog savašeg računara." + IDS_TAB1_TITLE, "Programi" + + IDS_UNINSTALL_FAILED, "Brisanje programa se ne može pokrenuti, '%s'. Da li želite da uklonite opciju Brisanje za ovajprogram iz registra?" + IDS_NOT_SPECIFIED, "Nije određeno" + + IDS_COLUMN_NAME, "Ime" + IDS_COLUMN_PUBLISHER, "Izdavač" + IDS_COLUMN_VERSION, "Verzija" + IDS_INSTALL_FILTER, "Instalacioni programi\\0*instal*.exe;*setup*.exe;*.msi\\0Programs (*.exe)\\0*.exe\\0All Files (*.*)\\0*.*\\0\\0" + + IDS_REMOVE, "&Ukloni..." + IDS_MODIFY_REMOVE, "&Izmeni/Ukloni..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instaliraj/Ukloni" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Da instalirate novi program sa diskete, diska ili sa vašeg hard diska, kliknite Instaliraj.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instaliraj...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Program se može aitomatski ukloniti. Da uklonite program ili da izmenite njegove instalirane delove, izaberite sa liste i kliknite Izmeni/Ukloni.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Info podrške...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Izmeni...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Ukloni...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Info podrške" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ova informacija se može koristiti da dobijete Tehničku podršku za %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Izdavač:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Verzija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Info podrške:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telefon podrške:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Procitaj me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Nove verzije:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Komentari:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Paul Vriens : comctl32: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: bd16a7225d3bdbb71099e6ee7431156597143721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd16a7225d3bdbb71099e6ee7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 20 23:12:17 2010 +0200 comctl32: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/comctl32/comctl_Sr.rc | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc index a5cdfbf..52f520c 100644 --- a/dlls/comctl32/comctl_Sr.rc +++ b/dlls/comctl32/comctl_Sr.rc @@ -90,3 +90,73 @@ STRINGTABLE DISCARDABLE { HKY_NONE "Ništa" } + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Детаљи за %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Откажи", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Примени", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Помоћ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Таб", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Чаробњак" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Назад", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Следеће >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Заврши", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Откажи", IDCANCEL,178,138,50,14 + PUSHBUTTON "Помоћ", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Таб", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Подеси Тулбар" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Затвори", IDCANCEL,308,6,44,14 + PUSHBUTTON "Р&есетуј", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Помоћ", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Помери &Горе", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Помери &Доле", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Д&оступни тастери:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Додај ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Уклони", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Тулбар тастери:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Затвори" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Данас:" + IDM_GOTODAY "Иди на данас" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Одвајање" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Ништа" +}

1 0

Andrew Eikum : shlwapi: Be less strict on which type of IShellFolder can be enumerated.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: d6a827d083157605a6f145773ddd85db0226e562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a827d083157605a6f145773… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 20 14:54:12 2010 -0500 shlwapi: Be less strict on which type of IShellFolder can be enumerated. --- dlls/shlwapi/ordinal.c | 29 +++----- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 150 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 5f332f3..7c00669 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3694,24 +3694,19 @@ BOOL WINAPI GetOpenFileNameWrapW(LPOPENFILENAMEW ofn) */ HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum) { - IPersist *persist; - HRESULT hr; + /* Windows attempts to get an IPersist interface and, if that fails, an + * IPersistFolder interface on the folder passed-in here. If one of those + * interfaces is available, it then calls GetClassID on the folder... and + * then calls IShellFolder_EnumObjects no matter what, even crashing if + * lpFolder isn't actually an IShellFolder object. The purpose of getting + * the ClassID is unknown, so we don't do it here. + * + * For discussion and detailed tests, see: + * "shlwapi: Be less strict on which type of IShellFolder can be enumerated" + * wine-devel mailing list, 3 Jun 2010 + */ - hr = IShellFolder_QueryInterface(lpFolder, &IID_IPersist, (LPVOID)&persist); - if(SUCCEEDED(hr)) - { - CLSID clsid; - hr = IPersist_GetClassID(persist, &clsid); - if(SUCCEEDED(hr)) - { - if(IsEqualCLSID(&clsid, &CLSID_ShellFSFolder)) - hr = IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum); - else - hr = E_FAIL; - } - IPersist_Release(persist); - } - return hr; + return IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum); } /* INTERNAL: Map from HLS color space to RGB */ diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 038d76c..1e5cb5e 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll -IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 kernel32 +IMPORTS = shell32 shlwapi user32 ole32 oleaut32 advapi32 kernel32 C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index c8cfcfc..4b1690a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -31,6 +31,7 @@ #include "shlwapi.h" #include "docobj.h" #include "shobjidl.h" +#include "shlobj.h" /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; @@ -56,6 +57,7 @@ static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); +static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2370,6 +2372,152 @@ static void test_SHCreateWorkerWindowA(void) DestroyWindow(hwnd); } +static HRESULT WINAPI SF_QueryInterface(IShellFolder *iface, + REFIID riid, void **ppv) +{ + /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */ + ok(!IsEqualGUID(&IID_IShellFolder, riid), + "Unexpected QI for IShellFolder\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI SF_AddRef(IShellFolder *iface) +{ + return 2; +} + +static ULONG WINAPI SF_Release(IShellFolder *iface) +{ + return 1; +} + +static HRESULT WINAPI SF_ParseDisplayName(IShellFolder *iface, + HWND owner, LPBC reserved, LPOLESTR displayName, ULONG *eaten, + LPITEMIDLIST *idl, ULONG *attr) +{ + ok(0, "Didn't expect ParseDisplayName\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_EnumObjects(IShellFolder *iface, + HWND owner, SHCONTF flags, IEnumIDList **enm) +{ + *enm = (IEnumIDList*)0xcafebabe; + return S_OK; +} + +static HRESULT WINAPI SF_BindToObject(IShellFolder *iface, + LPCITEMIDLIST idl, LPBC reserved, REFIID riid, void **obj) +{ + ok(0, "Didn't expect BindToObject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_BindToStorage(IShellFolder *iface, + LPCITEMIDLIST idl, LPBC reserved, REFIID riid, void **obj) +{ + ok(0, "Didn't expect BindToStorage\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_CompareIDs(IShellFolder *iface, + LPARAM lparam, LPCITEMIDLIST idl1, LPCITEMIDLIST idl2) +{ + ok(0, "Didn't expect CompareIDs\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_CreateViewObject(IShellFolder *iface, + HWND owner, REFIID riid, void **out) +{ + ok(0, "Didn't expect CreateViewObject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_GetAttributesOf(IShellFolder *iface, + UINT cidl, LPCITEMIDLIST *idl, SFGAOF *inOut) +{ + ok(0, "Didn't expect GetAttributesOf\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_GetUIObjectOf(IShellFolder *iface, + HWND owner, UINT cidl, LPCITEMIDLIST *idls, REFIID riid, UINT *inOut, + void **out) +{ + ok(0, "Didn't expect GetUIObjectOf\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_GetDisplayNameOf(IShellFolder *iface, + LPCITEMIDLIST idl, SHGDNF flags, STRRET *name) +{ + ok(0, "Didn't expect GetDisplayNameOf\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_SetNameOf(IShellFolder *iface, + HWND hwnd, LPCITEMIDLIST idl, LPCOLESTR name, SHGDNF flags, + LPITEMIDLIST *idlOut) +{ + ok(0, "Didn't expect SetNameOf\n"); + return E_NOTIMPL; +} + +static IShellFolderVtbl ShellFolderVtbl = { + SF_QueryInterface, + SF_AddRef, + SF_Release, + SF_ParseDisplayName, + SF_EnumObjects, + SF_BindToObject, + SF_BindToStorage, + SF_CompareIDs, + SF_CreateViewObject, + SF_GetAttributesOf, + SF_GetUIObjectOf, + SF_GetDisplayNameOf, + SF_SetNameOf +}; + +static IShellFolder ShellFolder = { &ShellFolderVtbl }; + +static void test_SHIShellFolder_EnumObjects(void) +{ + IEnumIDList *enm; + HRESULT hres; + IShellFolder *folder; + + if(!pSHIShellFolder_EnumObjects || is_win2k_and_lower){ + win_skip("SHIShellFolder_EnumObjects not available\n"); + return; + } + + if(0){ + /* NULL object crashes on Windows */ + hres = pSHIShellFolder_EnumObjects(NULL, NULL, 0, NULL); + } + + /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */ + enm = (IEnumIDList*)0xdeadbeef; + hres = pSHIShellFolder_EnumObjects(&ShellFolder, NULL, 0, &enm); + ok(hres == S_OK, "SHIShellFolder_EnumObjects failed: 0x%08x\n", hres); + ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm); + + /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */ + hres = SHGetDesktopFolder(&folder); + ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres); + + enm = NULL; + hres = pSHIShellFolder_EnumObjects(folder, NULL, 0, &enm); + ok(hres == S_OK, "SHIShellFolder_EnumObjects failed: 0x%08x\n", hres); + ok(enm != NULL, "Didn't get an enumerator\n"); + if(enm) + IEnumIDList_Release(enm); + + IShellFolder_Release(folder); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2388,6 +2536,7 @@ static void init_pointers(void) MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); + MAKEFUNC(SHIShellFolder_EnumObjects, 404); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); MAKEFUNC(SHPropertyBag_ReadLONG, 496); @@ -2420,4 +2569,5 @@ START_TEST(ordinal) test_IUnknown_QueryServiceExec(); test_IUnknown_ProfferService(); test_SHCreateWorkerWindowA(); + test_SHIShellFolder_EnumObjects(); }

1 0

Damjan Jovanovic : winemenubuilder: Always initialize COM.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 187dec992f9e4056e80d4f00b06d54f5a0ca0fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=187dec992f9e4056e80d4f00b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jul 20 21:16:29 2010 +0200 winemenubuilder: Always initialize COM. --- programs/winemenubuilder/winemenubuilder.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8ee8387..7641b91 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2775,13 +2775,6 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) return 1; } - r = CoInitialize( NULL ); - if( FAILED( r ) ) - { - WINE_ERR("CoInitialize failed\n"); - return 1; - } - r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID *) &sl ); if( FAILED( r ) ) @@ -2817,8 +2810,6 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) IPersistFile_Release( pf ); IShellLinkW_Release( sl ); - CoUninitialize(); - return !r; } @@ -2845,13 +2836,6 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) return 1; } - r = CoInitialize( NULL ); - if( FAILED( r ) ) - { - WINE_ERR("CoInitialize failed\n"); - return 1; - } - r = CoCreateInstance( &CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER, &IID_IUniformResourceLocatorW, (LPVOID *) &url ); if( FAILED( r ) ) @@ -2882,8 +2866,6 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) IPersistFile_Release( pf ); url->lpVtbl->Release( url ); - CoUninitialize(); - return !r; } @@ -3116,11 +3098,19 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh LPWSTR token = NULL, p; BOOL bWait = FALSE; BOOL bURL = FALSE; + HRESULT hr; int ret = 0; if (!init_xdg()) return 1; + hr = CoInitialize(NULL); + if (FAILED(hr)) + { + WINE_ERR("could not initialize COM, error 0x%08X\n", hr); + return 1; + } + for( p = cmdline; p && *p; ) { token = next_token( &p ); @@ -3160,5 +3150,6 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh } } + CoUninitialize(); return ret; }

1 0

André Hentschel : ntdll: Add LDT error codes.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 10e1387f61ff97489d3ff184fb6319c663a7afbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e1387f61ff97489d3ff184f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 20 19:33:21 2010 +0200 ntdll: Add LDT error codes. --- dlls/ntdll/error.c | 6 +++--- dlls/ntdll/tests/error.c | 3 +++ include/winerror.h | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 80bf787..3cccf27 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -669,9 +669,9 @@ static const DWORD table_c0000001[411] = 0, /* c0000115 (STATUS_ABIOS_SELECTOR_NOT_AVAILABLE) */ 0, /* c0000116 (STATUS_ABIOS_INVALID_SELECTOR) */ ERROR_INVALID_THREAD_ID, /* c0000117 (STATUS_NO_LDT) */ - 0, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ - 0, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ - 0, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ + ERROR_INVALID_LDT_SIZE, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ + ERROR_INVALID_LDT_OFFSET, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ + ERROR_INVALID_LDT_DESCRIPTOR, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ ERROR_BAD_EXE_FORMAT, /* c000011b (STATUS_INVALID_IMAGE_NE_FORMAT) */ ERROR_RXACT_INVALID_STATE, /* c000011c (STATUS_RXACT_INVALID_STATE) */ ERROR_RXACT_COMMIT_FAILURE, /* c000011d (STATUS_RXACT_COMMIT_FAILURE) */ diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 01c165d..7edc0ba 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -329,6 +329,9 @@ static void run_error_tests(void) cmp(STATUS_INVALID_SID, ERROR_INVALID_SID); cmp(STATUS_INVALID_SECURITY_DESCR, ERROR_INVALID_SECURITY_DESCR); cmp(STATUS_PROCEDURE_NOT_FOUND, ERROR_PROC_NOT_FOUND); + cmp2(STATUS_INVALID_LDT_SIZE, ERROR_INVALID_LDT_SIZE); + cmp2(STATUS_INVALID_LDT_OFFSET, ERROR_INVALID_LDT_OFFSET); + cmp2(STATUS_INVALID_LDT_DESCRIPTOR, ERROR_INVALID_LDT_DESCRIPTOR); cmp(STATUS_BAD_INITIAL_PC, ERROR_BAD_EXE_FORMAT); cmp(STATUS_INVALID_FILE_FOR_SECTION, ERROR_BAD_EXE_FORMAT); cmp(STATUS_INVALID_IMAGE_FORMAT, ERROR_BAD_EXE_FORMAT); diff --git a/include/winerror.h b/include/winerror.h index 97a58cb..a2089b6 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -305,6 +305,9 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_ARITHMETIC_OVERFLOW 534 #define ERROR_PIPE_CONNECTED 535 #define ERROR_PIPE_LISTENING 536 +#define ERROR_INVALID_LDT_SIZE 561 +#define ERROR_INVALID_LDT_OFFSET 563 +#define ERROR_INVALID_LDT_DESCRIPTOR 564 #define ERROR_HANDLES_CLOSED 676 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995

1 0

Owen Rudge : fusion: Implement IAssemblyNameImpl_GetDisplayName more completely.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 11dea57f692d1a3c24eebd5b393b05711301b5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=11dea57f692d1a3c24eebd5b3… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jul 20 18:02:36 2010 +0100 fusion: Implement IAssemblyNameImpl_GetDisplayName more completely. --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/asmname.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/fusion/tests/asmname.c | 97 +++++++++++++++++++++++++++++-- 3 files changed, 216 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11dea57f692d1a3c24eeb…

1 0

Henri Verbeet : wined3d: Use a more consistent name for the normalized texrect "extension".
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c411b45da93ecb34ee127330ab7bf4e38dff0cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c411b45da93ecb34ee127330a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:54 2010 +0200 wined3d: Use a more consistent name for the normalized texrect "extension". --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_gl.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ecd2919..4496393 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6199,7 +6199,7 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES surface->currentDesc.Width = pPresentationParameters->BackBufferWidth; surface->currentDesc.Height = pPresentationParameters->BackBufferHeight; if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[ARB_TEXTURE_RECTANGLE] - || gl_info->supported[WINE_NORMALIZED_TEXRECT]) + || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { surface->pow2Width = pPresentationParameters->BackBufferWidth; surface->pow2Height = pPresentationParameters->BackBufferHeight; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c744ff..5705def 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -789,7 +789,7 @@ static void quirk_ati_dx9(struct wined3d_gl_info *gl_info) { TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; + gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] = TRUE; } /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4c6d5bf..7f35091 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5416,28 +5416,28 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { * otherwise, register sampler_texmatrix, which takes care of updating the texture matrix */ { STATE_SAMPLER(0), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(0), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(0), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(1), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(1), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(2), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(2), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(2), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(3), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(3), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(3), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(4), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(4), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(4), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(5), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(5), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(5), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(6), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(6), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(6), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(7), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(7), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(7), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 94066ed..00aa188 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3805,7 +3805,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->texture_target = GL_TEXTURE_2D; /* Non-power2 support */ - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINE_NORMALIZED_TEXRECT]) + if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { pow2Width = This->currentDesc.Width; pow2Height = This->currentDesc.Height; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 98e7909..8e8b191 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -541,7 +541,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT * Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE * is used in combination with texture uploads (RTL_READTEX). The reason is that EXT_PALETTED_TEXTURE * doesn't work in combination with ARB_TEXTURE_RECTANGLE. */ - if (gl_info->supported[WINE_NORMALIZED_TEXRECT] && (width != pow2_width || height != pow2_height)) + if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] && (width != pow2_width || height != pow2_height)) { texture->baseTexture.pow2Matrix[0] = 1.0f; texture->baseTexture.pow2Matrix[5] = 1.0f; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e069ae6..c76a753 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1837,7 +1837,7 @@ typedef enum wined3d_gl_extension WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ - WINE_NORMALIZED_TEXRECT, + WINED3D_GL_NORMALIZED_TEXRECT, WINED3D_GL_VERSION_2_0, WINED3D_GL_EXT_COUNT,

1 0

Henri Verbeet : wined3d: Just implement BindTexture() for GDI surfaces in surface_gdi.c.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 0344bc429dff01d1d37990cc9938b1823c693d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0344bc429dff01d1d37990cc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:53 2010 +0200 wined3d: Just implement BindTexture() for GDI surfaces in surface_gdi.c. --- dlls/wined3d/surface_base.c | 4 ---- dlls/wined3d/surface_gdi.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 10d1141..2bd0e37 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1903,10 +1903,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL return WINED3D_OK; } -void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) { - ERR("Should not be called on base texture\n"); -} - /* TODO: think about moving this down to resource? */ const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface) { diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a97675e..8e7eb2f 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -241,6 +241,11 @@ IWineGDISurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) return WINED3DERR_INVALIDCALL; } +static void WINAPI IWineGDISurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) +{ + ERR("Not supported.\n"); +} + static HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; WINED3DLOCKED_RECT lock; @@ -547,7 +552,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ IWineGDISurfaceImpl_LoadTexture, - IWineD3DBaseSurfaceImpl_BindTexture, + IWineGDISurfaceImpl_BindTexture, IWineD3DBaseSurfaceImpl_SetContainer, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ec88e3..f5fb280 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2126,7 +2126,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst IWineD3DSurface *Source, const RECT *rsrc, DWORD trans) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) DECLSPEC_HIDDEN; -void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) DECLSPEC_HIDDEN; const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Remove an unused prototype.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: aae8f13610c3da2ea556befa34490fe646107884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae8f13610c3da2ea556befa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:52 2010 +0200 wined3d: Remove an unused prototype. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c46810b..2ec88e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2110,7 +2110,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, const WINEDDCOLORKEY *CKey) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_RealizePalette(IWineD3DSurface *iface) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface,

1 0

Henri Verbeet : wined3d: Add some missing flags to debug_d3dusage().
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 9976e078cb7fc19836b245de4899a8fd6e87b92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9976e078cb7fc19836b245de4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:51 2010 +0200 wined3d: Add some missing flags to debug_d3dusage(). --- dlls/wined3d/utils.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b63a5f8..b38d6c0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1696,7 +1696,7 @@ const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) { const char *debug_d3dusage(DWORD usage) { - char buf[284]; + char buf[333]; buf[0] = '\0'; #define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } @@ -1711,6 +1711,8 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
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 July 2010