February 2007 - Wine-Devel - list.winehq.org

Re: [3/4 revised] msi: Add partial, expandable OLE automation support.
by James Hawkins Feb. 26, 2007

Feb. 26, 2007

On 2/25/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This patch adds OLE automation support to MSI. It does this by creating > a wrapper class, which implements any of the OLE automation classes as > long as a function is given which is called from within the wrapper > classes invoke method after appropriate error checking. Basic > functionality is implemented, and it is fairly straightforward to add > the rest as the methods are all already implemented as functions in the > DLL. > +/* + * If you would like to implement a new automation function/object, look towards the bottom of this + * file for the "meat and potatoes" section. + */ + +/* FIXME: I don't know how big this should be */ +#define MAX_MSI_STRING 1000 + +/* + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just + * need to implement Invoke function for each dispinterface that is called from within + * the AutomationObject Invoke function which performs error checking, and pass the new + * function to create_automation_object. + */ + +typedef interface AutomationObject AutomationObject; + +interface AutomationObject { + /* + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo + */ + const IDispatchVtbl *lpVtbl; + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; + + /* Object reference count */ + LONG ref; + + /* Clsid for this class and it's appropriate ITypeInfo object */ + LPCLSID clsid; + ITypeInfo *iTypeInfo; + + /* The MSI handle of the current object */ + MSIHANDLE msiHandle; + + /* A function that is called from IDispatch::Invoke, specific to this type of object. By the + * time this function is called, basic error checking has been done in the AutomationObject + * Invoke function */ + HRESULT (STDMETHODCALLTYPE *funcInvoke)( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); +}; You went a little comment crazy here (and elsewhere). You should tone it down a bit. Good code explains itself and requires little or no commenting. + /* + * Perform a sanity check on the parameters. + */ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* + * Initialize the return parameter. + */ + *ppvObject = 0; + + /* + * Compare the riid with the interface IDs implemented by this object. + */ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, This->clsid)) + *ppvObject = This; + else if (IsEqualGUID(riid, &IID_IProvideClassInfo)) + *ppvObject = (IProvideClassInfo*)&(This->lpvtblIProvideClassInfo); + else if (IsEqualGUID(riid, &IID_IProvideClassInfo2)) + *ppvObject = (IProvideClassInfo2*)&(This->lpvtblIProvideClassInfo2); + else if (IsEqualGUID(riid, &IID_IProvideMultipleClassInfo)) + *ppvObject = (IProvideMultipleClassInfo*)&(This->lpvtblIProvideMultipleClassInfo); + + /* + * Check that we obtained an interface. + */ + if ((*ppvObject)==0) + { + TRACE("() : asking for unsupported interface %s\n",debugstr_guid(riid)); + return E_NOINTERFACE; + } + + /* + * Query Interface always increases the reference count by one when it is + * successful + */ + IClassFactory_AddRef(iface); + + return S_OK; +} Way too many comments. It may seem like nitpicking, but the comments clutter up the code and don't provide any useful information. -- James Hawkins

1 0

Re: msi: Add full JScript/VBScript support and partial expandable OLE automation support. [PATCH 3/3]
by Robert Shearman Feb. 26, 2007

Feb. 26, 2007

Misha Koshelev wrote: > +/* Macros to get pointer to AutomationObject) from the other VTables. */ > Typo with extra ")" here. > +HRESULT WINAPI SessionImpl_Invoke( > + AutomationObject* This, > + DISPID dispIdMember, > + REFIID riid, > + LCID lcid, > + WORD wFlags, > + DISPPARAMS* pDispParams, > + VARIANT* pVarResult, > + EXCEPINFO* pExcepInfo, > + UINT* puArgErr) > +{ > + WCHAR szString[MAX_MSI_STRING]; > + DWORD dwLen = MAX_MSI_STRING; > + IDispatch *iDispatch = NULL; > + MSIHANDLE msiHandle; > + LANGID langId; > + UINT ret; > + INSTALLSTATE iInstalled, iAction; > Some error checking here would be good, like you do in AutomationObject_Invoke. > + > + switch (dispIdMember) > + { > ... > +/* > + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just > + * need to implement Invoke function for each dispinterface and pass the new function > + * to create_automation_object. > + */ > + > +typedef struct { > + /* > + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo > + */ > + const IDispatchVtbl *lpVtbl; > + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; > + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; > + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; > + > + /* Object reference count */ > + LONG ref; > + > + /* Clsid for this class and it's appropriate ITypeInfo object */ > + LPCLSID clsid; > + ITypeInfo *iTypeInfo; > + > + /* The MSI handle of the current object */ > + MSIHANDLE msiHandle;; > + > + /* A function that is called from IDispatch::Invoke, specific to this type of object */ > + LPVOID funcInvoke; > +} AutomationObject; > You shouldn't need to expose the implementation details of AutomationObject outside of automation.c. > + > +/* This is the function that one needs to call to create an automation object. */ > +extern HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, LPVOID funcInvoke); > It is dangerous to use LPVOID as the type to pass a function in. > + > +/* We need to expose these functions because our IActiveScriptSite calls it */ > +extern HRESULT WINAPI LoadTypeInfo(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid); > +extern HRESULT WINAPI SessionImpl_Invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); > + > +/* Disp Ids > + * (not complete, look in msiserver.idl to add more) */ > +typedef enum { > + RecordDispId_StringData=1, > + RecordDispId_IntegerData, > + RecordDispId_SetStream, > + RecordDispId_ReadStream, > + RecordDispId_FieldCount, > + RecordDispId_IsNull, > + RecordDispId_DataSize, > + RecordDispId_ClearData, > + RecordDispId_FormatText > +} RecordDispId; > + > +typedef enum { > + ViewDispId_Execute=1, > + ViewDispId_Fetch, > + ViewDispId_Modify, > + ViewDispId_Close, > + ViewDispId_ColumnInfo, > + ViewDispId_GetError > +} ViewDispId; > + > +typedef enum { > + DatabaseDispId_DatabaseState=1, > + DatabaseDispId_SummaryInformation, > + DatabaseDispId_OpenView, > + DatabaseDispId_Commit, > + DatabaseDispId_PrimaryKeys, > + DatabaseDispId_Import, > + DatabaseDispId_Export, > + DatabaseDispId_Merge, > + DatabaseDispId_GenerateTransform, > + DatabaseDispId_ApplyTransform, > + DatabaseDispId_EnableUIPreview, > + DatabaseDispId_TablePersistent, > + DatabaseDispId_CreateTransformSummaryInfo > +} DatabaseDispId; > + > +typedef enum { > + SessionDispId_Installer=1, > + SessionDispId_Property, > + SessionDispId_Language, > + SessionDispId_Mode, > + SessionDispId_Database, > + SessionDispId_SourcePath, > + SessionDispId_TargetPath, > + SessionDispId_DoAction, > + SessionDispId_Sequence, > + SessionDispId_EvaluateCondition, > + SessionDispId_FormatRecord, > + SessionDispId_Message, > + SessionDispId_FeatureCurrentState, > + SessionDispId_FeatureRequestState, > + SessionDispId_FeatureValidStates, > + SessionDispId_FeatureCost, > + SessionDispId_ComponentCurrentState, > + SessionDispId_ComponentRequestState, > + SessionDispId_SetInstallLevel, > + SessionDispId_VerifyDiskSpace, > + SessionDispId_ProductProperty, > + SessionDispId_FeatureInfo, > + SessionDispId_ComponentCost > +} SessionDispId; > See dlls/oleaut32/tests/tmarshal_dispids.h and dlls/oleaut32/tests/tmarshal.idl for how to use DISPIDs properly. > +typedef struct { > + IActiveScriptSite lpVtbl; > + AutomationObject *session; > You don't actually access this as anything other than an IDispatch object, so you might as well change to "IDispatch *session". > +LPCWSTR read_script_from_file(LPCWSTR szFile, INT type) > Should be static. > +/* JScript or VBScript? */ > +LPCWSTR progid_from_type(INT type) > Should also be static. > + > +/* > + * Call a script. This is our meat and potatoes. > + * - Currently, since the function is relatively new, it will always end up returning S_OK. > + * Think of it like a bonus feature, we can run the script - great. If we have a problem, > + * we are no worse off than if this function had not been called. > + */ > +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR filename, LPCWSTR function, LPCWSTR action) > +{ > + LPCWSTR script = NULL, progId = NULL; > + HRESULT hr; > + IActiveScript *iActiveScript = NULL; > + IActiveScriptParse *iActiveScriptParse = NULL; > I haven't seen this variable notation style before. In Hungarian notation "p" is used instead of "i" to show a pointer to an object exposing the interface declared. -- Rob Shearman

2 2

Re: wined3d: Use application provided fog range when fog is enabled.
by Stefan Dösinger Feb. 26, 2007

Feb. 26, 2007

Am Montag 26 Februar 2007 02:03 schrieb Vitaliy Margolen: > This should fix fog issues with PoP SoT. > --- > dlls/wined3d/state.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) Just wanted to add that this would fix the fixed function Z vs specular color alpha selection with table and vertex fog. Vertex shaders seem to be treated as transformed vertices. That said, the way the fixed function pipeline uses was developed by looking at what games need. The patch Vitaly sent looks good to me, but if there are any regressions I will have to try to write a unit test(though it will be tricky due to the pixel exactness thingy)

1 0

Re: [2/2] user32: do not call NULL message callback
by Robert Shearman Feb. 25, 2007

Feb. 25, 2007

Fabian Bieler wrote: > @@ -8894,23 +8894,20 @@ static void test_nullCallback(void) > HWND hwnd; > MSG msg; > > - if(0) > - { > - hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, > - 100, 100, 200, 200, 0, 0, 0, NULL); > - ok (hwnd != 0, "Failed to create overlapped window\n"); > + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (hwnd != 0, "Failed to create overlapped window\n"); > > - ShowWindow(hwnd, SW_SHOW); > - UpdateWindow( hwnd ); > + ShowWindow(hwnd, SW_SHOW); > + UpdateWindow( hwnd ); > > - SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); > + SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); > > - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > > - ok(1, "\n"); > + ok(1, "\n"); > > - DestroyWindow(hwnd); > - } > + DestroyWindow(hwnd); > } > > START_TEST(msg) > You might as well add the test and fix the bug in one patch since the second patch is no shorter due to all of the whitespace changes. -- Rob Shearman

1 0

Re: a big fan (now with bad news)
by Joris Huizer Feb. 25, 2007

Feb. 25, 2007

Aww... yes, I'm seeing that too According the the wine application database (http://appdb.winehq.org/appview.php?iVersionId=469) some settings help it get a bit further, but it reports: "Microsoft Internet Explorer has encountered a problem and needs to close. We are sorry for the inconvenience." (With a "debug" button) With these messages: fixme:shell:StopWatchMode () stub! fixme:shdocvw:IEWinMain "" 10 fixme:ole:CoResumeClassObjects stub err:module:DelayLoadFailureHook failed to delay load urlmon.dll.CreateURLMoniker wine: Call from 0x7b842138 to unimplemented function urlmon.dll.CreateURLMoniker, aborting fixme:imm:ImmDisableIME (-1): stub fixme:advapi:RegisterEventSourceW ((null),L"Microsoft Internet Explorer"): stub fixme:advapi:ReportEventA (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x632f6ec0,0x632f6a84): stub fixme:advapi:ReportEventW (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x161400,0x632f6a84): stub err:eventlog:ReportEventW L"iexplore.exe" err:eventlog:ReportEventW L"6.0.2800.1106" err:eventlog:ReportEventW L"" err:eventlog:ReportEventW L"0.0.0.0" err:eventlog:ReportEventW L"00000000" fixme:advapi:DeregisterEventSource (0xcafe4242) stub fixme:wininet:InternetGetConnectedState always returning LAN connection. Hitting "debug" crashes as an unimplemented function in urlmon is called - that seems weird, as it should be using the native version of urlmon... oh well I guess you need to use ies4linux to get a working IE for now. I had it installed as some program thought it needed it - hadn't noticed it didn't actually run Jeffrey Sabarese <core5fedora(a)gmail.com> wrote: Hi Joris, Thanks again for corresponding with me on this. (i realize there's much text here, so please take you time, get to it when you can...) for the link, just think: "this dude is such a 'NOVICE'!! he really should take more 'NOTES'!!!..." get it? novicenotes? hee hee then a text search (upper right) of WinE ie will get you there, undoubtedly. but that's not why i am writing. i wanted to let you know that the "genuine" installer, http://www.microsoft.com/windows/ie/ie6/downloads/critical/ie6sp1/default.m… did not succeed in placing a useable software on the system. it seemed to "install" just fine, but launching it: [ wine '/home/user/.wine/drive_c/Program Files/Internet Explorer/iexplore.exe' ] brings up a window w/ nothing but "white space". as if it "wants" to launch, but doesn't quite get there. when ie was installed via "ies4linux", i DID experience a similar activity, but only if i launched IE via WinE application link, for example, if i linked to IE from... say EditPlus, as an external browser, i would get the same: a window w/ nothing in it-- as you might see after an app has crashed, the window's still up, but no screen-updating, so you get a "frozen" image, or white screen. so, the only time i've ever seen it look "right" myself was using the "non-standard" ies4linux launcher, as i've illustrated specifically, here some time ago (showing the 3 versions of IE in that package): http://digisquirrel.blogspot.com/2006/08/fiddlers-three.html please understand that i want to install it the proper, WinE developers' recommended way, so this is why i continue to research the subject (and continue to probably annoy you, for which i apologize). What might i be doing wrong? i noticed in my blog entry-- (a different one this time) http://novicenotes.com/2006/08/04/ie_on_linux_wine/ where i discussed DCOM98.EXE . i haven't actively installed that component this time-- so unless it came down w/ the MS installer, might i need to have that installed as well? any other feedback you have on this subject is appreciated. perhaps you have URL w/ the preferred, WinE dev's method? (assuming it's "okay [legal]" to do the MS installer) thank you for your generous help!! --Jeff Sabarese PS. I apologize if it's been an invasion-- i thought i mailed to the "list" last time, but it looks like i sent just to you last time? (and i know i sent only to you this time, so if you wish to forward to the list, please do so. i have a real problem w/ being not-concise [as you've noticed, i'm sure], so i tried to spare the other members for now. sorry i can't seem to shorten things more than i do). On 2/24/07, Joris Huizer wrote: > I think I don't have it anymore, though I'd like to > see - though I'm pretty sure you got it covered well, > like before. > > regards, > > Joris > > > > --- Jeffrey Sabarese wrote: > > > hey there! thanks for the valuable lesson learned > > here! > > > > btw-- i changed my web log info , per > > recommendations i received in > > this mail conversation. if you still have the link > > and care to see > > it-- you'll see that i've now got the wineHQ URL > > there, and a > > recommendation about IE6 should install properly > > :) > > > > On 2/23/07, Joris Huizer > > wrote: > > > > > > --- Jeffrey Sabarese > > wrote: > > > > > > > > > > > I tried [ yum remove wine ], and then [yum > > install > > > > wine] which went > > > > without a hitch, but there's no change in my > > Primary > > > > User (the broken > > > > one) > > > > HOWEVER, WinE continues to run perfectly under > > other > > > > user accounts, and ROOT. > > > > > > > > > > The wine configuration is in ~/.wine > > > Remove/rename it for a fresh start. Wine will > > > automatically recreate the ~/.wine directory with > > > required contents for normal functionality (but > > then > > > you need to do installation of every program > > again) > > > > > > > > > > > > > > > ____________________________________________________________________________________ > > > Yahoo! Music Unlimited > > > Access over 1 million songs. > > > http://music.yahoo.com/unlimited > > > > > > > > > > > > > > > -- > > /* ************************************************ > > */ > > Quanta+ Web Development IDE: > > http://quanta.kdewebdev.org/ > > Quanta+ Wiki: > > http://tinyurl.com/3dzqxk > > Other Quanta Tips: > > http://invisiblepixels.org/progs/quanta.html > > /* ************************************************ > > */ > > > > > > > ____________________________________________________________________________________ > Looking for earth-friendly autos? > Browse Top Cars by "Green Rating" at Yahoo! Autos' Green Center. > http://autos.yahoo.com/green_center/ > -- /* ************************************************ */ Quanta+ Web Development IDE: http://quanta.kdewebdev.org/ Quanta+ Wiki: http://tinyurl.com/3dzqxk Other Quanta Tips: http://invisiblepixels.org/progs/quanta.html /* ************************************************ */ --------------------------------- Need Mail bonding? Go to the Yahoo! Mail Q&A for great tips from Yahoo! Answers users.

2 1

Re: msi: Add handlers for JScript/VBScript actions that call one script function. [PATCH 2/3]
by Robert Shearman Feb. 25, 2007

Feb. 25, 2007

Misha Koshelev wrote: > All > actual script implementation is left (for the next patch) in the > call_script function. Patches should attempt to be atomic changes that compile and pass all tests without another patch needing to be applied on top. I suggest you implement automation.c and the associated header file in patch 2 and combine this patch with the rest of patch 3. > +static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, NULL, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + r = store_binary_to_temp(package, source, tmp_file); > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, target, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + info = do_msidbCustomActionTypeScript( package, type, file->TargetPath, target, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, NULL, action ); > + > + return wait_thread_handle( info ); > +} > It would seem simpler here to just open the file here for the one case that has an external file and just pass in the LPWSTR script for all cases. -- Rob Shearman

1 0

Success with enhanced cd's... kind of
by Dan Kegel Feb. 24, 2007

Feb. 24, 2007

I noticed that my copy of "No!" by "They Might Be Giants" is an "enhanced cd", so I inserted it into my Ubuntu Dapper laptop. Ubuntu only noticed the audio tracks, so I had to actually use the commandline to mount the data tracks: sudo mount -oro,loop -tiso9660 /dev/cdrom /mnt After that it went fine; wine was able to run the flash app on the disc. Looks like others have complained about this, e.g. http://ubuntuforums.org/showthread.php?p=2143161 but I didn't see any bug reports about it, so I filed https://launchpad.net/ubuntu/+bug/87663 - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

RE: xcopy try 2
by Ann & Jason Edmeades Feb. 24, 2007

Feb. 24, 2007

Hi Detlef, (again) >Configure.ac - I included that because another 'regular' developer who >added a dll recently added it (See:) > http://www.winehq.org/pipermail/wine-patches/2007-February/036243.html) >I'll leave it in for that reason unless there's a big problem with it (I >always thought you were supposed to send in configure.ac but not configure) I stand corrected - tools\make_makefiles does that update for me as well as the others :-) Jason

1 0

Re: xcopy try 2
by Detlef Riekenberg Feb. 24, 2007

Feb. 24, 2007

On Fr, 2007-02-23 at 16:44 +0000, Ann & Jason Edmeades wrote: Looks nice, but a view over the code result in some more comments: --- a/configure.ac +++ b/configure.ac Not needed, when sending the Patch (and that line causes already an offset, when patching wine) "tools/make_makefiles" takes care of all required changes and when Alexandre commit your Patch, the changes from make_makefiles and autoconf are included in the commit. +EXTRADEFS = -DUNICODE There is no need for that define. Remove that line to get a warning for all ANSI-Functions, that missed the "W" +C_SRCS = \ + xcopy.c Spaces are wrong before the filename. You must use TAB in makefiles +/* Prototypes */ This can be avoided completly, when you rearange your functions (so main() is then the last function in the file) + printf("Invalid number of parameters - Use xcopy /? for help\n"); The text should be read from the resources, so it can be localized . You should convert the UNICODE-Message with WideCharToMultiByte. When the output-handle is the console, printing UNICODE-messages avoid converting the message twice (xcopy and kernel32) > + if (*argvW[0] != '/') { > + if (suppliedsource[0] == 0x00) { > + lstrcpyW(suppliedsource, *argvW); > + } else { > + lstrcpyW(supplieddestination, *argvW); > + } This is wrong. tested with: "xcopy file1 file2 file3" Your code would copy file1 to file3, while w2k fails with "Unzulässige Parameteranzahl" (Invalid number of parameters) I suggest to initialize supplieddestination as empty string and copy the arg to supplieddestination only, when it is emtpy. When supplieddestination was not empty, quit with the error. You need to fill supplieddestination with the default "." before /* Trace out the supplied information */, when it is still empty at that location. + if (flags & OPT_SIMULATE) { + printf("%d file(s) would be copied\n", filesCopied); + } else { + printf("%d file(s) copied\n", filesCopied); + } As Above: Format-Pattern from the resource and WriteFile() + if (GetFullPathName(suppliedsource, MAX_PATH, "W" missing: => GetFullPathNameW (More Functions in various locations and WIN32_FIND_DATA => WIN32_FIND_DATAW) I did not test the code very much, but I think, you did. (ToDo-Reminder: "xcopy file1 name_not_found" => is "name_not_found" a file or a directory) Thanks for your work. It's pretty good as start! -- By by ... Detlef

3 2

New wintest executable is there (but there are some issues due to introduction of skip)
by Paul Vriens Feb. 24, 2007

Feb. 24, 2007

Hi, as of today there's a new winetest executable available at the usual place: http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/ There is however an issue with the generated reports. It looks like this is introduced when the 'skip' thingy was added to the test infrastructure. I'm currently going through the perl scripts but have no fix yet. Most likely we have to patch the 'dissect' script at line 158: } elsif (s/^($test: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { The previous lines were like: advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 crypt: 69 tests executed, 0 marked as todo, 0 failures. advapi32:crypt done (0) now it's: advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 crypt: 69 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:crypt done (0) Anybody? Cheers, Paul.

3 3

Re: dplay: directplay should initialize session Guid patch + conformance tests
by Stefan Dösinger Feb. 24, 2007

Feb. 24, 2007

Am Samstag 24 Februar 2007 17:25 schrieb Alessandro Pignotti: > Hi everyone, > the directx sdk says that directplay has to initialize sesison guid in > SESSIONDESC2 struct that is passed by the application with the Open call. > This patch adresses that issue and includes proper conformance test. > It should be noted that the tests works under windows, but not yet under > wine, because it has not a working directplay service provider > implementation and it's not possible to mix builtin dplayx with native > service provider (i'm working on a patch to tha problem too) Use todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not initialized"); For tests which are known to fail

2 1

Re: dplay: directplay should initialize session Guid patch + conformance tests
by Paul Vriens Feb. 24, 2007

Feb. 24, 2007

Alessandro Pignotti wrote: > On Saturday 24 February 2007 19:31, Stefan Dösinger wrote: > >> todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid >> not initialized"); >> >> For tests which are known to fail > > This version of the patch follows Stefan's advice. > > > > ------------------------------------------------------------------------ > > diff --git a/configure.ac b/configure.ac > index 672dd78..4ef4e23 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1587,6 +1587,7 @@ dlls/dnsapi/Makefile > dlls/dnsapi/tests/Makefile > dlls/dplay/Makefile > dlls/dplayx/Makefile > +dlls/dplayx/tests/Makefile > dlls/dpnet/Makefile > dlls/dpnhpast/Makefile > dlls/dsound/Makefile > diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c > index f5c630a..475e59c 100644 > --- a/dlls/dplayx/dplay.c > +++ b/dlls/dplayx/dplay.c > @@ -2828,6 +2828,8 @@ static HRESULT WINAPI DP_SecureOpen > > This->dp2->bHostInterface = TRUE; > > + //Initializing session GUID > + CoCreateGuid(&(lpsd->guidInstance)); > hr = DP_SetSessionDesc( This, lpsd, 0, TRUE, bAnsi ); > if( FAILED( hr ) ) > { > diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in > new file mode 100644 > index 0000000..02007d1 > --- /dev/null > +++ b/dlls/dplayx/tests/Makefile.in > @@ -0,0 +1,14 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = dplayx.dll > +IMPORTS = kernel32 ole32 dxguid > +EXTRALIBS = > + > +CTESTS = \ > + dplayx.c > + > +(a)MAKE_TEST_RULES@ > + > +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c > new file mode 100644 > index 0000000..ba96125 > --- /dev/null > +++ b/dlls/dplayx/tests/dplayx.c > @@ -0,0 +1,55 @@ > +#include <wine/test.h> > +#include <dplay.h> > + > +BOOL validSP=0; > + > +BOOL FAR PASCAL EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, > + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, > + LPVOID lpContext) > +{ > + if(!memcmp(lpguidSP,&DPSPGUID_TCPIP,16)) > + { > + //I'm forcing TCP/IP Sevice provider > + HRESULT hr=IDirectPlayX_InitializeConnection((LPDIRECTPLAY4)lpContext,lpConnection,0); > + todo_wine > + { > + ok(SUCCEEDED(hr),"It's not possible to initialize TCP/IP service provider\n"); > + } > + if(SUCCEEDED(hr)) > + validSP=1; > + > + return FALSE; > + } > + return TRUE; > +} > + > +START_TEST(dplayx) > +{ > + LPDIRECTPLAY4 pDP = NULL; > + GUID appGuid; > + GUID zeroGuid; > + DPSESSIONDESC2 sessionDesc; > + CoInitialize(NULL); > + CoCreateGuid(&appGuid); > + CoCreateInstance(&CLSID_DirectPlay,NULL, CLSCTX_ALL, > + &IID_IDirectPlay4A,(VOID**)&pDP); > + IDirectPlayX_EnumConnections(pDP,&appGuid,EnumConnectionsCallback, > + pDP,0); > + if(validSP) > + { > + bzero(&sessionDesc,sizeof(DPSESSIONDESC2)); > + bzero(&zeroGuid,16); > + sessionDesc.dwSize=sizeof(DPSESSIONDESC2); > + sessionDesc.dwFlags=DPSESSION_CLIENTSERVER; > + memcpy(&sessionDesc.guidApplication,&appGuid,16); > + sessionDesc.lpszSessionNameA="DPlay conformance test"; > + sessionDesc.dwMaxPlayers=10; > + sessionDesc.dwCurrentPlayers=0; > + sessionDesc.guidInstance=CLSID_DirectPlay; > + IDirectPlayX_Open(pDP,&sessionDesc,DPOPEN_CREATE); > + todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not initialized"); > + } > + IDirectPlayX_Release(pDP); > + CoUninitialize(); > + > +} > > > ------------------------------------------------------------------------ > > Hi, no clue about dplayx but: - there are some C++ style comments, please use C-style - there is no copyright/license information Cheers, Paul.

1 0

Re: [PATCH] user32: do not call NULL message callback
by Felix Nawothnig Feb. 24, 2007

Feb. 24, 2007

Fabian Bieler wrote: > Windows silently ignores NULL pointers supplied to SendMessageCallback as > callback function. A testcase would be nice. Felix

2 2

Re: include/d3d9types.h: Remove Size from D3DVOLUME_DESC
by H. Verbeet Feb. 24, 2007

Feb. 24, 2007

On 24/02/07, Rok Mandeljc <rok.mandeljc(a)email.si> wrote: > According to both MSDN and wine's d3d9 sources, Size was removed from > D3DVOLUME_DESC in DX9. This patch seems to have fixed crash in d3dx9_30.dll at NeverWinter Nights 2 startup (I assume it was due to wrong offset of Width, Height and Depth due to Size's presence). > > Regards, > Rok > Nice find, this fixes some stack corruption in a couple of applications.

2 1

Re: kernel32: Set object security on process object in CreateProcess.
by Robert Shearman Feb. 24, 2007

Feb. 24, 2007

Vitaliy Margolen wrote: > + > + /* set process security */ > + if (ret && psa && psa->lpSecurityDescriptor) > + { > + NTSTATUS status; > + > + status = NtSetSecurityObject( info->hProcess, DACL_SECURITY_INFORMATION, > + psa->lpSecurityDescriptor ); > + ret = status == STATUS_SUCCESS; > + if (!ret) SetLastError( RtlNtStatusToDosError( status ) ); > + } > + > It would be better to pass the security descriptor (or just the DACL if you would prefer) in the new_process call. You should be able to change the security structure validation functions to return the number of bytes used. Therefore, you should be able to put the security data before the other variable data in the new_process call. Also, I think several tests in advapi32 should succeed after this patch is applied so you will need to patch that too. -- Rob Shearman

2 1

test.winehq.com status
by Felix Nawothnig Feb. 24, 2007

Feb. 24, 2007

Hi. Anyone knows what happened to test.winehq.com/data? There has been no new crossbuilds for quite some time now... Felix

4 5

ANN: Wiki upgrade
by Dimi Paun Feb. 24, 2007

Feb. 24, 2007

Folks, We finished upgrading the wiki to MoinMoin 1.5.7. Please let me know if you encounter any problems. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

3 2

Re: winex11.drv: Catch and report screen resolution change errors.
by Vitaliy Margolen Feb. 24, 2007

Feb. 24, 2007

> winex11.drv: Catch and report screen resolution change errors. This patch brakes Half-life based games in virtual desktop. Vitaliy.

2 1

Re: dbghelp: Match the crc for debug link files in elf_locate_debug_link so that we get the correct debug file before trying to parse it.
by Eric Pouech Feb. 24, 2007

Feb. 24, 2007

Robert Shearman a écrit : > > Keep the debuglink elf_file_map mapped until after > elf_new_public_symbols is called, otherwise we could use unmapped memory. this is still not the full valid solution... what should be done is: when we search for a given section, we should look first in the original .so, then, if not found, in the .gnu_debuglink one... your patch only covers the case where all relevant information is to be found in the .gnu_debuglink file, which is not guaranteed A+

2 3

Re: [6/13]D3D: Index buffer fixes
by Mirek Feb. 24, 2007

Feb. 24, 2007

Some games are still broken with latest 13 patches from your tree. Oblivion still hangs while loading game and Flatout 2 crashed after 2 seconds with this output: athlon64:/usr/games/flatout2# ./flatout2 fixme:d3d:IWineD3DDeviceImpl_CreateAdditionalSwapChain The app requests more than one back buffer, this can't be supported properly. Please configure the application to use double buffering(=1 back buffer) if possible fixme:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x17fe20) : stub, simulating 256MB for now, returning 256MB left fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub fixme:d3d:IWineD3DDeviceImpl_ValidateDevice (0x17fe20) : stub err:ole:CoInitializeEx Attempt to change threading model of this apartment from multi-threaded to apartment threaded fixme:wave:DBSB_MMAPLoop Can't access sound driver's buffer directly. err:ole:CoInitializeEx Attempt to change threading model of this apartment from multi-threaded to apartment threaded fixme:win:WIN_CreateWindowEx Parent is HWND_MESSAGE wine: Unhandled page fault on read access to 0x7c3a4270 at address 0x7c3a4270 (thread 0011), starting debugger... Unhandled exception: page fault on read access to 0x7c3a4270 in 32-bit code (0x7c3a4270). fixme:d3d:IWineD3DDeviceImpl_EvictManagedResources (0x17fe20) : stub Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:7c3a4270 ESP:7b8cea60 EBP:7b8ceab8 EFLAGS:00210246( - 00 -RIZP1) EAX:00000000 EBX:7c3be764 ECX:00000000 EDX:7b8cea90 ESI:7b8cea90 EDI:00010028 Stack dump: 0x7b8cea60: 00000000 00000000 00000000 00000000 0x7b8cea70: fffffffd 00000000 00000000 00000000 0x7b8cea80: 00000001 7ffd2000 00000018 7ef935ef 0x7b8cea90: 00000000 00000012 00000000 00000000 0x7b8ceaa0: 00002357 00000000 00000000 7efe5368 0x7b8ceab0: 0173fc34 7c3a41b0 7b8ceb58 7efc81bb Backtrace: =>1 0x7c3a4270 (0x7b8ceab8) 2 0x7efc81bb call_thread_func+0x3b(rtl_func=<register EDI not in topmost frame>, arg=<register ESI not in topmost frame>) [/root/.WineCVS/sources/cvswine/wine/dlls/ntdll/thread.c:371] in ntdll (0x7b8ceb58) 3 0x7efc8461 in ntdll (+0x48461) (0x7b8cf458) err:dbghelp:elf_load_debug_info_from_map Bad CRC for module (got aa34a405 while expecting ef5281d2) 4 0xb7df10bd start_thread+0x6d() in libpthread.so.0 (0x7b8cf4c8) err:dbghelp:elf_load_debug_info_from_map Bad CRC for module (got 61a1649a while expecting f01d3064) 5 0xb7d859ee __clone+0x5e() in libc.so.6 (0x00000000) 0x7c3a4270: -- no code accessible -- Modules: Module Address Debug info Name (83 modules) PE 400000-152e000 Deferred flatout2 PE 1740000-19a0000 Deferred d3dx9_30 ELF 7bf00000-7bf03000 Deferred <wine-loader> ELF 7c663000-7c6ac000 Deferred dsound<elf> \-PE 7c670000-7c6ac000 \ dsound ELF 7c781000-7c7b3000 Deferred uxtheme<elf> \-PE 7c790000-7c7b3000 \ uxtheme ELF 7c7b3000-7c874000 Deferred libasound.so.2 ELF 7c87e000-7c893000 Deferred midimap<elf> \-PE 7c880000-7c893000 \ midimap ELF 7c893000-7c8be000 Deferred winealsa<elf> \-PE 7c8a0000-7c8be000 \ winealsa ELF 7cb5a000-7cb5f000 Deferred libxfixes.so.3 ELF 7cb5f000-7cb68000 Deferred libxcursor.so.1 PE 7cb70000-7cb85000 --none-- msacm32 ELF 7cb87000-7cb8a000 Deferred libxrandr.so.2 ELF 7cb8a000-7cb92000 Deferred libxrender.so.1 ELF 7cb92000-7cb95000 Deferred libxinerama.so.1 ELF 7cb98000-7cbb4000 Deferred imm32<elf> \-PE 7cba0000-7cbb4000 \ imm32 ELF 7d55e000-7d5ec000 Deferred winex11<elf> \-PE 7d570000-7d5ec000 \ winex11 ELF 7d650000-7d670000 Deferred libexpat.so.1 ELF 7d670000-7d69b000 Deferred libfontconfig.so.1 ELF 7d6ba000-7d724000 Deferred libfreetype.so.6 ELF 7d743000-7d769000 Deferred msacm32<elf> ELF 7d769000-7d7cd000 Deferred msvcrt<elf> \-PE 7d780000-7d7cd000 \ msvcrt ELF 7d835000-7d840000 Deferred libgcc_s.so.1 ELF 7d925000-7d927000 Deferred libnvidia-tls.so.1 ELF 7d927000-7e298000 Deferred libglcore.so.1 ELF 7e298000-7e29d000 Deferred libxdmcp.so.6 ELF 7e29d000-7e32d000 Deferred libglu.so.1 ELF 7e32d000-7e3c1000 Deferred libgl.so.1 ELF 7e3c1000-7e4ad000 Deferred libx11.so.6 ELF 7e4ad000-7e4bb000 Deferred libxext.so.6 ELF 7e4bb000-7e4d3000 Deferred libice.so.6 ELF 7e4d3000-7e4dc000 Deferred libsm.so.6 ELF 7e4dc000-7e596000 Deferred wined3d<elf> \-PE 7e4f0000-7e596000 \ wined3d ELF 7e596000-7e5c1000 Deferred d3d9<elf> \-PE 7e5a0000-7e5c1000 \ d3d9 ELF 7e5c1000-7e5ed000 Deferred ws2_32<elf> \-PE 7e5d0000-7e5ed000 \ ws2_32 ELF 7e5ed000-7e6aa000 Deferred comctl32<elf> \-PE 7e600000-7e6aa000 \ comctl32 ELF 7e6aa000-7e6bd000 Deferred libresolv.so.2 ELF 7e6c6000-7e6da000 Deferred libz.so.1 ELF 7e6dc000-7e6fa000 Deferred iphlpapi<elf> \-PE 7e6e0000-7e6fa000 \ iphlpapi ELF 7e6fa000-7e74f000 Deferred rpcrt4<elf> \-PE 7e710000-7e74f000 \ rpcrt4 ELF 7e74f000-7e7e8000 Deferred ole32<elf> \-PE 7e760000-7e7e8000 \ ole32 ELF 7e7e8000-7e840000 Deferred shlwapi<elf> \-PE 7e800000-7e840000 \ shlwapi ELF 7e840000-7e935000 Deferred shell32<elf> \-PE 7e850000-7e935000 \ shell32 ELF 7e935000-7e97b000 Deferred advapi32<elf> \-PE 7e940000-7e97b000 \ advapi32 ELF 7e97b000-7ea0e000 Deferred gdi32<elf> \-PE 7e990000-7ea0e000 \ gdi32 ELF 7ea0e000-7eb48000 Deferred user32<elf> \-PE 7ea30000-7eb48000 \ user32 ELF 7eb48000-7ebd6000 Deferred winmm<elf> \-PE 7eb50000-7ebd6000 \ winmm ELF 7edd6000-7eefc000 Deferred kernel32<elf> \-PE 7edf0000-7eefc000 \ kernel32 ELF 7eefc000-7ef07000 Deferred libnss_files.so.2 ELF 7ef07000-7ef11000 Deferred libnss_nis.so.2 ELF 7ef11000-7ef27000 Deferred libnsl.so.1 ELF 7ef27000-7ef4c000 Deferred libm.so.6 ELF 7ef4c000-7ef4f000 Deferred libxau.so.6 ELF 7ef6b000-7f000000 Dwarf ntdll<elf> \-PE 7ef80000-7f000000 \ ntdll ELF b7cb0000-b7cb5000 Deferred libxxf86vm.so.1 ELF b7cb6000-b7cba000 Deferred libdl.so.2 ELF b7cba000-b7dec000 Export libc.so.6 ELF b7dec000-b7dfe000 Export libpthread.so.0 ELF b7e11000-b7e15000 Deferred iso8859-2.so ELF b7e15000-b7e1e000 Deferred libnss_compat.so.2 ELF b7e1e000-b7f2f000 Deferred libwine.so.1 ELF b7f31000-b7f48000 Deferred ld-linux.so.2 Threads: process tid prio (all id:s are in hex) 0000000a 0000000c 0 0000000b 0 00000008 (D) G:\usr\games\flatout2\FlatOut2.exe 00000012 15 00000011 0 <== 00000010 0 0000000f 2 0000000e 15 0000000d 15 00000009 0 Stefan Dösinger napsal(a): > The ddraw index buffer handling needs a proper fix somewhen, either by an VB + > up Indices drawing method(but there are already too many of them) or my a > SetMem method in index buffers > > This patch should(hopefully) fix the regressions introduced with my former > index buffer patch > > > ------------------------------------------------------------------------ > > From fadece932e1ff556a4434545d7bf6753aaabdaf1 Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Tue, 20 Feb 2007 16:15:04 +0100 > Subject: [PATCH] D3D: Index buffer fixes > > Some things that missed in my former patch. Do not unset the index buffer in _Release, that > is not needed. Dirtify the index buffer state in unlock because the bound buffer is changed. > GL vbos are GLuints. The index buffer used by ddraw should have dynamic usage, and preferably > be locked only on the size that has to be locked > --- > dlls/ddraw/device.c | 2 +- > dlls/ddraw/direct3d.c | 2 +- > dlls/wined3d/device.c | 2 +- > dlls/wined3d/indexbuffer.c | 9 +++++++-- > 4 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c > index c201df7..0814921 100644 > --- a/dlls/ddraw/device.c > +++ b/dlls/ddraw/device.c > @@ -3691,7 +3691,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, > */ > hr = IWineD3DIndexBuffer_Lock(This->indexbuffer, > 0 /* OffSetToLock */, > - 0 /* SizeToLock - doesn't matter */, > + IndexCount * sizeof(WORD), > (BYTE **) &LockedIndices, > 0 /* Flags */); > assert(IndexCount < 0x100000); > diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c > index 4896ba7..b716a60 100644 > --- a/dlls/ddraw/direct3d.c > +++ b/dlls/ddraw/direct3d.c > @@ -804,7 +804,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, > */ > hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, > 0x40000, /* Length. Don't know how long it should be */ > - 0, /* Usage */ > + WINED3DUSAGE_DYNAMIC, /* Usage */ > WINED3DFMT_INDEX16, /* Format. D3D7 uses WORDS */ > WINED3DPOOL_DEFAULT, > &object->indexbuffer, > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index c039798..2ac8797 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -4294,7 +4294,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * > UINT idxStride = 2; > IWineD3DIndexBuffer *pIB; > WINED3DINDEXBUFFER_DESC IdxBufDsc; > - GLint vbo; > + GLuint vbo; > > pIB = This->stateBlock->pIndexData; > This->stateBlock->streamIsUP = FALSE; > diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c > index b16ddd0..ae2294a 100644 > --- a/dlls/wined3d/indexbuffer.c > +++ b/dlls/wined3d/indexbuffer.c > @@ -60,8 +60,11 @@ static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) > if (ref == 0) { > if(This->vbo) { > ENTER_GL(); > - GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > - checkGLcall("glBindBufferARB"); > + /* No need to manually unset the buffer. glDeleteBuffers unsets it for the current context, > + * but not for other contexts. However, because the d3d buffer is destroyed the app has to > + * unset it before doing the next draw, thus dirtifying the index buffer state and forcing > + * binding a new buffer > + */ > GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); > checkGLcall("glDeleteBuffersARB"); > LEAVE_GL(); > @@ -159,6 +162,8 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) > LEAVE_GL(); > This->dirtystart = 0; > This->dirtyend = 0; > + /* TODO: Move loading into preload when the buffer is used, that avoids dirtifying the state */ > + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); > } > return WINED3D_OK; > } > > > ------------------------------------------------------------------------ > >

3 6

Update on msi JScript/VBScript support functions
by Misha Koshelev Feb. 24, 2007

Feb. 24, 2007

Hi, just wanted to update everybody on my work with this, sorry I have not been good at replying to personal emails lately. I am not currently attaching any code but will clean things up and then submit my patches to wine-patches soon. So, the good news is that, as a proof of concept, I have gotten the Vector NTI installer to work successfully, which requires the JScript functionality. Specifically, this tests custom actions 5/6 and 37/38, there are two other sets that would be nice to test (but it is all the same script handler so it should work). Also, to make this work, I had to implement the OLE automation interface. Now, I have not implemented the entire interface yet, but I have made the entire .tlb file for this and made a framework which makes implementing everything fairly straightforward (and everything is a wrapper around the existing MSI database functions, so there is no actual functionality, it is just adding new cases to the switch statements that call the MSI database functions appropriately). Basically, because of the MSI design where everything that is an object has an MSIHANDLE, I have made one Automation Object that each specific object "inherits" from by implementing its invoke function (minus basic parameter checking, etc. which is all done by the automation object) and passing it to create_automation_object with its CLSID. It is pretty easy to implement more functions, and I will try to keep on adding more, probably as patches that I will periodically send to wine-patches. Anyhow, look for my first patches in the next couple of days. Misha

1 3

Re: [1/2] comctl32: add WM_PAINT message sequence tests
by James Hawkins Feb. 24, 2007

Feb. 24, 2007

On 2/23/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > Passed on XP SP2. > --- > dlls/comctl32/tests/listview.c | 209 > +++++++++++++++++++++++++++++++++++++++- > dlls/comctl32/tests/msg.c | 3 + > dlls/comctl32/tests/msg.h | 3 +- > 3 files changed, 211 insertions(+), 4 deletions(-) > This is wrong: +static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct subclass_info *info = (struct subclass_info *)GetWindowLongA(hwnd, GWL_USERDATA); + static long defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + trace("header: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam|hdr; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, LISTVIEW_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} If you're subclassing the header control and checking messages from the header control, then you need to add another message sequence, HEADER_SEQ_INDEX. --- a/dlls/comctl32/tests/msg.c +++ b/dlls/comctl32/tests/msg.c @@ -158,6 +158,9 @@ void ok_sequence_(struct msg_sequence ** ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), "%s: the msg 0x%04x should have been sent by a winevent hook\n", context, expected->message); + ok_(file, line) ((expected->flags & hdr) == (actual->flags & hdr), + "%s: the msg 0x%04x should have been sent by the header control\n", + context, expected->message); expected++; actual++; } msg.c is the message sequence testing code abstracted...keyword is abstraction. Nothing in msg.c should know anything about specific types of controls. -- James Hawkins

2 2

Message spy log viewer
by Felix Nawothnig Feb. 23, 2007

Feb. 23, 2007

Hi. I just figured I never told anyone (did I?) - a while ago I wrote a Ruby/GTK2 tool to parse +message logs (along with other channels mixed in) and display them in a treeview - makes debugging message related problems much easier. I suppose others wrote similar scripts for their own use - but maybe someone will find it useful nevertheless: http://users.holycrap.org/flexo/spy.rb Use like: $ WINEDEBUG="+message" wine foo.exe 2>log $ ruby spy.rb log Felix

1 0

Sound problems with Alice
by gslink Feb. 23, 2007

Feb. 23, 2007

In the past I have always used the demo version of the game Alice to test Wine. Recently I loaded a Wine installation and found the game had no sound. After considerable testing it appears that about a year ago a change was made in Wine that killed the sound. Has anyone else had this problem and does it affect anything else? On my loads most other things seem to have sound.

2 1

Re: msi: Free the data for type msidbCustomActionTypeContinue custom actions after DllThread executes
by James Hawkins Feb. 23, 2007

Feb. 23, 2007

On 2/23/07, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > This fixes bug 7461. http://bugs.winehq.org/show_bug.cgi?id=7461 > > Changelog: > * Free the data for type msidbCustomActionTypeContinue custom actions > after DllThread executes. > > dlls/msi/custom.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > Please ignore this patch. It's not exactly correct. -- James Hawkins

1 0