November 2012 - Wine-commits

Daniel Jelinski : wine.inf: Add registry info for lanmanserver service.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: ba4de80ee373b08be3ebcd2bf73e98bef88e40aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4de80ee373b08be3ebcd2bf… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Nov 1 22:00:56 2012 +0100 wine.inf: Add registry info for lanmanserver service. --- tools/wine.inf.in | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4704fd6..9d0650f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -125,6 +125,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -135,6 +136,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -145,6 +147,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2987,6 +2990,19 @@ ServiceType=16 StartType=3 ErrorControl=1 +[LanmanServerService] +AddReg=LanmanServerServiceKeys +Description="Lanman Server" +DisplayName="Lanman Server" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=32 +StartType=4 +ErrorControl=1 + +[LanmanServerServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" +;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"lanmanserver" + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0

Alexandre Julliard : user32: Send WM_MOVING instead of WM_SIZING when moving a window.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: e2c61baba0ceb0ca50d5a6506108d34af8a69122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c61baba0ceb0ca50d5a6506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:01:30 2012 +0100 user32: Send WM_MOVING instead of WM_SIZING when moving a window. --- dlls/user32/winpos.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0ce3ddd..308e7ea 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2771,8 +2771,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - WPARAM wpSizingHit = 0; - if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; @@ -2782,9 +2780,16 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) capturePoint = pt; /* determine the hit location */ - if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) - wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); - SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); + if (syscommand == SC_SIZE) + { + WPARAM wpSizingHit = 0; + + if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) + wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); + SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); + } + else + SendMessageW( hwnd, WM_MOVING, 0, (LPARAM)&sizingRect ); if (!iconic) {

1 0

Hans Leidekker : ole32: Use wrappers around NT functions to access the registry in CoGetPSClsid.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: a82c49028d1450aaa60c8e1b059c460ab3fab9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82c49028d1450aaa60c8e1b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 15:20:13 2012 +0100 ole32: Use wrappers around NT functions to access the registry in CoGetPSClsid. --- dlls/ole32/compobj.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/compobj_private.h | 3 + dlls/ole32/tests/compobj.c | 2 +- 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9c92c32..70508b6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -47,6 +47,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -135,6 +137,121 @@ static CRITICAL_SECTION_DEBUG class_cs_debug = }; static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, 0 }; +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) +{ + NTSTATUS status = NtCreateKey( (HANDLE *)retkey, access, attr, 0, NULL, 0, NULL ); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + HANDLE subkey, root = attr->RootDirectory; + WCHAR *buffer = attr->ObjectName->Buffer; + DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + UNICODE_STRING str; + + while (i < len && buffer[i] != '\\') i++; + if (i == len) return status; + + attrs = attr->Attributes; + attr->ObjectName = &str; + + while (i < len) + { + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &subkey, access, attr, 0, NULL, 0, NULL ); + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + if (status) return status; + attr->RootDirectory = subkey; + while (i < len && buffer[i] == '\\') i++; + pos = i; + while (i < len && buffer[i] != '\\') i++; + } + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, NULL, 0, NULL ); + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + } + return status; +} + +static const WCHAR classes_rootW[] = + {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; + +static HKEY classes_root_hkey; + +/* create the special HKEY_CLASSES_ROOT key */ +static HKEY create_classes_root_hkey(void) +{ + HKEY hkey, ret = 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &name, classes_rootW ); + if (create_key( &hkey, MAXIMUM_ALLOWED, &attr )) return 0; + TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + + if (!(ret = InterlockedCompareExchangePointer( (void **)&classes_root_hkey, hkey, 0 ))) + ret = hkey; + else + NtClose( hkey ); /* somebody beat us to it */ + return ret; +} + +/* map the hkey from special root to normal key if necessary */ +static inline HKEY get_classes_root_hkey( HKEY hkey ) +{ + HKEY ret = hkey; + + if (hkey == HKEY_CLASSES_ROOT && !(ret = classes_root_hkey)) + ret = create_classes_root_hkey(); + + return ret; +} + +LSTATUS create_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError( create_key( retkey, access, &attr ) ); +} + +LSTATUS open_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError( NtOpenKey( (HANDLE *)retkey, access, &attr ) ); +} + /***************************************************************************** * This section contains OpenDllList definitions * @@ -2055,7 +2172,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); /* Open the key.. */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &hkey)) + if (open_classes_key(HKEY_CLASSES_ROOT, path, KEY_READ, &hkey)) { WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); return REGDB_E_IIDNOTREG; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0039655..b76e3a7 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -309,4 +309,7 @@ extern UINT object_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT link_source_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN; +extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; +extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 048b082..714feee 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -755,7 +755,7 @@ static void test_CoGetPSClsid(void) ok(!res, "RegOverridePredefKey returned %d\n", res); hr = CoGetPSClsid(&IID_IClassFactory, &clsid); - todo_wine ok_ole_success(hr, "CoGetPSClsid"); + ok_ole_success(hr, "CoGetPSClsid"); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, NULL); ok(!res, "RegOverridePredefKey returned %d\n", res);

1 0

Hans Leidekker : ole32: Convert the remaining RegCreateKey and RegOpenKey calls to the wrappers.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 7895eae15be4f1f7e2f3f1eba3a5be368ad8cd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7895eae15be4f1f7e2f3f1eba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 15:20:48 2012 +0100 ole32: Convert the remaining RegCreateKey and RegOpenKey calls to the wrappers. --- dlls/ole32/comcat.c | 52 +++++++++++++++++++------------------------ dlls/ole32/compobj.c | 8 +++--- dlls/ole32/ole2.c | 21 +++-------------- dlls/ole32/storage32.c | 3 +- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7895eae15be4f1f7e2f3f…

1 0

André Hentschel : include: Add more CV constants.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 696950b581c2a7650a23b1f462cda79a22e9eb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696950b581c2a7650a23b1f46… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 23 16:55:27 2012 +0100 include: Add more CV constants. --- include/cvconst.h | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 139 insertions(+), 5 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 00e64ae..84ff3a0 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -2,6 +2,7 @@ * File cvconst.h - MS debug information * * Copyright (C) 2004, Eric Pouech + * Copyright (C) 2012, André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +133,9 @@ enum CV_HREG_e CV_ALLREG_HANDLE = 30007, CV_ALLREG_PARAMS = 30008, CV_ALLREG_LOCALS = 30009, + CV_ALLREG_TID = 30010, + CV_ALLREG_ENV = 30011, + CV_ALLREG_CMDLN = 30012, /* Intel x86 CPU */ CV_REG_NONE = 0, @@ -224,6 +228,33 @@ enum CV_HREG_e CV_REG_MM70 = 250, CV_REG_MM71 = 251, + CV_REG_YMM0 = 252, /* this includes YMM1 to YMM7 */ + CV_REG_YMM0H = 260, /* this includes YMM1H to YMM7H */ + CV_REG_YMM0I0 = 268, /* this includes YMM0I1 to YMM0I3 */ + CV_REG_YMM1I0 = 272, /* this includes YMM1I1 to YMM1I3 */ + CV_REG_YMM2I0 = 276, /* this includes YMM2I1 to YMM2I3 */ + CV_REG_YMM3I0 = 280, /* this includes YMM3I1 to YMM3I3 */ + CV_REG_YMM4I0 = 284, /* this includes YMM4I1 to YMM4I3 */ + CV_REG_YMM5I0 = 288, /* this includes YMM5I1 to YMM5I3 */ + CV_REG_YMM6I0 = 292, /* this includes YMM6I1 to YMM6I3 */ + CV_REG_YMM7I0 = 296, /* this includes YMM7I1 to YMM7I3 */ + CV_REG_YMM0F0 = 300, /* this includes YMM0F1 to YMM0F7 */ + CV_REG_YMM1F0 = 308, /* this includes YMM1F1 to YMM1F7 */ + CV_REG_YMM2F0 = 316, /* this includes YMM2F1 to YMM2F7 */ + CV_REG_YMM3F0 = 324, /* this includes YMM3F1 to YMM3F7 */ + CV_REG_YMM4F0 = 332, /* this includes YMM4F1 to YMM4F7 */ + CV_REG_YMM5F0 = 340, /* this includes YMM5F1 to YMM5F7 */ + CV_REG_YMM6F0 = 348, /* this includes YMM6F1 to YMM6F7 */ + CV_REG_YMM7F0 = 356, /* this includes YMM7F1 to YMM7F7 */ + CV_REG_YMM0D0 = 364, /* this includes YMM0D1 to YMM0D3 */ + CV_REG_YMM1D0 = 368, /* this includes YMM1D1 to YMM1D3 */ + CV_REG_YMM2D0 = 372, /* this includes YMM2D1 to YMM2D3 */ + CV_REG_YMM3D0 = 376, /* this includes YMM3D1 to YMM3D3 */ + CV_REG_YMM4D0 = 380, /* this includes YMM4D1 to YMM4D3 */ + CV_REG_YMM5D0 = 384, /* this includes YMM5D1 to YMM5D3 */ + CV_REG_YMM6D0 = 388, /* this includes YMM6D1 to YMM6D3 */ + CV_REG_YMM7D0 = 392, /* this includes YMM7D1 to YMM7D3 */ + /* Motorola 68K CPU */ CV_R68_D0 = 0, /* this includes D1 to D7 too */ CV_R68_A0 = 8, /* this includes A1 to A7 too */ @@ -287,7 +318,7 @@ enum CV_HREG_e CV_M4_Psr = 51, CV_M4_FltF0 = 60, /* this includes FltF1 to Flt31 */ CV_M4_FltFsr = 92, - + /* Alpha AXP CPU */ CV_ALPHA_NOREG = CV_REG_NONE, CV_ALPHA_FltF0 = 10, /* this includes FltF1 to FltF31 */ @@ -311,7 +342,7 @@ enum CV_HREG_e CV_ALPHA_Psr = 76, CV_ALPHA_FltFsr = 77, CV_ALPHA_SoftFpcr = 78, - + /* Motorola & IBM PowerPC CPU */ CV_PPC_GPR0 = 1, /* this includes GPR1 to GPR31 */ CV_PPC_CR = 33, @@ -321,7 +352,53 @@ enum CV_HREG_e CV_PPC_FPSCR = 74, CV_PPC_MSR = 75, CV_PPC_SR0 = 76, /* this includes SR1 to SR15 */ - /* some PPC registers missing */ + CV_PPC_PC = 99, + CV_PPC_MQ = 100, + CV_PPC_XER = 101, + CV_PPC_RTCU = 104, + CV_PPC_RTCL = 105, + CV_PPC_LR = 108, + CV_PPC_CTR = 109, + CV_PPC_COMPARE = 110, + CV_PPC_COUNT = 111, + CV_PPC_DSISR = 118, + CV_PPC_DAR = 119, + CV_PPC_DEC = 122, + CV_PPC_SDR1 = 125, + CV_PPC_SRR0 = 126, + CV_PPC_SRR1 = 127, + CV_PPC_SPRG0 = 372, /* this includes SPRG1 to SPRG3 */ + CV_PPC_ASR = 280, + CV_PPC_EAR = 382, + CV_PPC_PVR = 287, + CV_PPC_BAT0U = 628, + CV_PPC_BAT0L = 629, + CV_PPC_BAT1U = 630, + CV_PPC_BAT1L = 631, + CV_PPC_BAT2U = 632, + CV_PPC_BAT2L = 633, + CV_PPC_BAT3U = 634, + CV_PPC_BAT3L = 635, + CV_PPC_DBAT0U = 636, + CV_PPC_DBAT0L = 637, + CV_PPC_DBAT1U = 638, + CV_PPC_DBAT1L = 639, + CV_PPC_DBAT2U = 640, + CV_PPC_DBAT2L = 641, + CV_PPC_DBAT3U = 642, + CV_PPC_DBAT3L = 643, + CV_PPC_PMR0 = 1044, /* this includes PMR1 to PMR15 */ + CV_PPC_DMISS = 1076, + CV_PPC_DCMP = 1077, + CV_PPC_HASH1 = 1078, + CV_PPC_HASH2 = 1079, + CV_PPC_IMISS = 1080, + CV_PPC_ICMP = 1081, + CV_PPC_RPA = 1082, + CV_PPC_HID0 = 1108, /* this includes HID1 to HID15 */ + + /* Java */ + CV_JAVA_PC = 1, /* Hitachi SH3 CPU */ CV_SH3_NOREG = CV_REG_NONE, @@ -357,7 +434,29 @@ enum CV_HREG_e CV_ARM_LR = 24, CV_ARM_PC = 25, CV_ARM_CPSR = 26, - + CV_ARM_ACC0 = 27, + CV_ARM_FPSCR = 40, + CV_ARM_FPEXC = 41, + CV_ARM_FS0 = 50, /* this includes FS1 to FS31 */ + CV_ARM_FPEXTRA0 = 90, /* this includes FPEXTRA1 to FPEXTRA7 */ + CV_ARM_WR0 = 128, /* this includes WR1 to WR15 */ + CV_ARM_WCID = 144, + CV_ARM_WCON = 145, + CV_ARM_WCSSF = 146, + CV_ARM_WCASF = 147, + CV_ARM_WC4 = 148, + CV_ARM_WC5 = 149, + CV_ARM_WC6 = 150, + CV_ARM_WC7 = 151, + CV_ARM_WCGR0 = 152, /* this includes WCGR1 to WCGR3 */ + CV_ARM_WC12 = 156, + CV_ARM_WC13 = 157, + CV_ARM_WC14 = 158, + CV_ARM_WC15 = 159, + CV_ARM_FS32 = 200, /* this includes FS33 to FS63 */ + CV_ARM_ND0 = 300, /* this includes ND1 to ND31 */ + CV_ARM_NQ0 = 400, /* this includes NQ1 to NQ15 */ + /* Intel IA64 CPU */ CV_IA64_NOREG = CV_REG_NONE, CV_IA64_Br0 = 512, /* this includes Br1 to Br7 */ @@ -395,7 +494,31 @@ enum CV_HREG_e CV_TRI_EA10 = 55, CV_TRI_EA12 = 56, CV_TRI_EA14 = 57, - /* some TriCode registers missing */ + CV_TRI_PSW = 58, + CV_TRI_PCXI = 59, + CV_TRI_PC = 60, + CV_TRI_FCX = 61, + CV_TRI_LCX = 62, + CV_TRI_ISP = 63, + CV_TRI_ICR = 64, + CV_TRI_BIV = 65, + CV_TRI_BTV = 66, + CV_TRI_SYSCON = 67, + CV_TRI_DPRx_0 = 68, /* includes DPRx_1 to DPRx_3 */ + CV_TRI_CPRx_0 = 68, /* includes CPRx_1 to CPRx_3 */ + CV_TRI_DPMx_0 = 68, /* includes DPMx_1 to DPMx_3 */ + CV_TRI_CPMx_0 = 68, /* includes CPMx_1 to CPMx_3 */ + CV_TRI_DBGSSR = 72, + CV_TRI_EXEVT = 73, + CV_TRI_SWEVT = 74, + CV_TRI_CREVT = 75, + CV_TRI_TRnEVT = 76, + CV_TRI_MMUCON = 77, + CV_TRI_ASI = 78, + CV_TRI_TVA = 79, + CV_TRI_TPA = 80, + CV_TRI_TPX = 81, + CV_TRI_TFA = 82, /* AM33 (and the likes) CPU */ CV_AM33_NOREG = CV_REG_NONE, @@ -403,6 +526,17 @@ enum CV_HREG_e CV_AM33_A0 = 20, /* this includes A1 to A3 */ CV_AM33_D0 = 30, /* this includes D1 to D3 */ CV_AM33_FS0 = 40, /* this includes FS1 to FS31 */ + CV_AM33_SP = 80, + CV_AM33_PC = 81, + CV_AM33_MDR = 82, + CV_AM33_MDRQ = 83, + CV_AM33_MCRH = 84, + CV_AM33_MCRL = 85, + CV_AM33_MCVF = 86, + CV_AM33_EPSW = 87, + CV_AM33_FPCR = 88, + CV_AM33_LIR = 89, + CV_AM33_LAR = 90, /* Mitsubishi M32R CPU */ CV_M32R_NOREG = CV_REG_NONE,

1 0

Frédéric Delanoy : ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity).
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 80d30100993013dfdaa32d0e6c938246b5f75cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d30100993013dfdaa32d0e6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 23 19:36:14 2012 +0100 ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity). --- dlls/ddraw/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d990440..1964452 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -446,6 +446,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } WARN("32 bit RGB pixel format does not match.\n"); + return WINED3DFMT_UNKNOWN; default: WARN("Invalid dwRGBBitCount in Pixelformat structure.\n");

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXINCLUDE.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 69eeb35e51d2fc7bbb05af1f69fc2fbb9521e9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=69eeb35e51d2fc7bbb05af1f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:05 2012 +0100 d3dx9: Avoid LPD3DXINCLUDE. --- dlls/d3dx9_36/effect.c | 27 +++++++--------- dlls/d3dx9_36/shader.c | 81 +++++++++++----------------------------------- include/d3dx9effect.h | 45 +++++++------------------- include/d3dx9shader.h | 83 ++++++++++++----------------------------------- 4 files changed, 65 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69eeb35e51d2fc7bbb05a…

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4987196e37cf5b123f9a1b0e014f84d96a6179e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4987196e37cf5b123f9a1b0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:06 2012 +0100 d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER. --- include/d3dx9mesh.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 149c199..e0b8557 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -565,7 +565,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown) STDMETHOD(UnlockBuffer)(THIS) PURE; STDMETHOD(ScaleBuffer)(THIS_ FLOAT scale) PURE; STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER buffer) PURE; - STDMETHOD(AttachGH)(THIS_ LPD3DXTEXTUREGUTTERHELPER) PURE; + STDMETHOD(AttachGH)(THIS_ struct ID3DXTextureGutterHelper *gh) PURE; STDMETHOD(ReleaseGH)(THIS) PURE; STDMETHOD(EvalGH)(THIS) PURE; STDMETHOD(ExtractTexture)(THIS_ UINT channel, UINT start_coefficient, @@ -709,7 +709,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *); +HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, + float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPRTENGINE.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 69f059cdd7c3b14ada563353f257a67cd96f04d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f059cdd7c3b14ada563353f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:07 2012 +0100 d3dx9: Avoid LPD3DXPRTENGINE. --- include/d3dx9mesh.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index e0b8557..a5fc6cc 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -711,7 +711,8 @@ HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *) HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); -HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); +HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, + ID3DXMesh *blocker_mesh, ID3DXPRTEngine **engine); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXMesh **mesh);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetInputLayout().
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 86779241c6c3969b50c8fbd50a943f47c2b3458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86779241c6c3969b50c8fbd50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:08 2012 +0100 d3d10core: Implement d3d10_device_IAGetInputLayout(). --- dlls/d3d10core/device.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0623ee5..3ac02a0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -548,7 +548,21 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, ID3D10InputLayout **input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_vertex_declaration *wined3d_declaration; + struct d3d10_input_layout *input_layout_impl; + + TRACE("iface %p, input_layout %p.\n", iface, input_layout); + + if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + { + *input_layout = NULL; + return; + } + + input_layout_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *input_layout = &input_layout_impl->ID3D10InputLayout_iface; + ID3D10InputLayout_AddRef(*input_layout); } static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface,

1 0