June 2006 - Wine-Devel - list.winehq.org

Re: LoadResource with module=0x00400000 followed by stack overflow
by Jonathan Clark June 23, 2006

June 23, 2006

On Tue, 20 Jun 2006 12:49:25 +0200, Jan-Espen Pettersen wrote: > Can a win32 program expect that it has write access to the memory > pointed to by the return value of LoadResource with module 0x00400000? > Should LoadResource in some cases copy the memory and return a > writeable copy of the resource? I noticed a similar problem under Windows Server 2003 when DEP is enabled, but haven't seen it on other platforms. If I recall, there is code in version.dll which calls LoadResource with RT_VERSION and then expects to be able to write to pages that are clearly marked not-writable in the PE image. The pages remain read-only until after a call to GetVersionInfo so something in the kernel is altering them. I didn't dig into it, but thought it was really weird. When I turn off DEP for that program I got different behavior. I don't know what this means for wine but maybe that is useful. Jonathan

1 0

Move all common Dll[un]RegisterServer stuff to advapi
by Vijay Kiran Kamuju June 23, 2006

June 23, 2006

Hi All, I would like to move all the helper functions register_coclass,etc to a separate file in advapi.dll called regsvr_helper.c and all declarations of structs, consts moved to a separate file called, wineregsvr.h in include/wine So that it would be easy for other dlls to implement the DllRegisterServer and DllUnRegisterServer. And also clean up the code base. I need your suggestions, before i submit patches. Thanks, Vijay

3 6

LoadResource with module=0x00400000 followed by stack overflow
by Jan-Espen Pettersen June 23, 2006

June 23, 2006

I get this stack overflow exception while trying to run the Watchtower Library Setup on FreeBSD 6.1. I have extracted some debug lines which I think is relevant. Please ask if you need more information. 0009:Call ntdll.LdrFindResource_U(00400000,0034ecf0,00000003,0034ec8c) ret=9c266b12 0009:trace:resource:LdrFindResource_U module 0x400000 type #0006 name #0901 lang 0414 level 3 0009:trace:resource:find_entry_by_id root 0x40b000 dir 0x40b000 id 0006 ret 0x40b090 0009:trace:resource:find_entry_by_id root 0x40b000 dir 0x40b090 id 0901 ret 0x40bb98 0009:trace:resource:find_entry_by_id root 0x40b000 dir 0x40bb98 id 0414 ret 0x40d1c8 0009:Ret ntdll.LdrFindResource_U() retval=00000000 ret=9c266b12 0009:Ret kernel32.FindResourceExA() retval=0040d1c8 ret=00405ac0 0009:Call kernel32.LoadResource(00400000,0040d1c8) ret=00405ae4 0009:trace:resource:LoadResource 0x400000 0x40d1c8 0009:Call ntdll.LdrAccessResource(00400000,0040d1c8,0034ed48,00000000) ret=9c26807b 0009:trace:resource:access_resource access resource 0009:trace:resource:access_resource *ptr=0x4219d0 0009:Ret ntdll.LdrAccessResource() retval=00000000 ret=9c26807b 0009:Ret kernel32.LoadResource() retval=004219d0 ret=00405ae4 0009:Call ntdll.NtCreateEvent(0034e634,001f0003,0034e8dc,00000001,00000000) ret=9c22d14a 0009:Ret ntdll.NtCreateEvent() retval=00000000 ret=9c22d14a wine: Unhandled stack overflow at address 0x405b1d (thread 0009), starting debugger... (There was thread two (to 000b and back to 0009) context switches in between, which I filtered out) I single stepped the last instructions before the crash and found that it crashed while trying to write to the memory pointed to by the returned pointer from LoadResource. It loaded the address with some offset into register %esi and crashed at an andw instruction: First chance exception: stack overflow in 32-bit code (0x00405b1d). file_set_error: Bad address file_set_error: Bad address Register dump: CS:0033 SS:003b DS:003b ES:003b FS:1007 GS:001b EIP:00405b1d ESP:0035ee08 EBP:0035f224 EFLAGS:00010346( - 00 RITZP1) EAX:0000006c EBX:00000000 ECX:00000003 EDX:00000000 ESI:00421b5e EDI:00421a86 Stack dump: 0x0035ee08: 9c266cc0 0035f954 0035f230 00000000 0x0035ee18: 00401df3 00009003 0035f224 0035f958 0x0035ee28: 0035f954 00000000 9c086a19 9c0da2c0 0x0035ee38: 0035ee78 9c092b72 00120020 00000001 0x0035ee48: 9c086957 00000000 00000000 0035ee34 0x0035ee58: 005ca2c0 9c08b791 00167e10 00000000 0200: sel=1007 base=00110000 limit=00001fff 32-bit rw- Backtrace: =>1 0x00405b1d in setup (+0x5b1d) (0x00405b1d) 0x00405b1d: andw $0,0x0(%esi) Wine-dbg>info share Module Address Debug info Name (3 modules) PE 0x9c070000-9c0dd000 --none-- ntdll PE 0x9c210000-9c2f1000 --none-- kernel32 PE 0x00400000-0042b000 Export setup Can a win32 program expect that it has write access to the memory pointed to by the return value of LoadResource with module 0x00400000? Should LoadResource in some cases copy the memory and return a writeable copy of the resource? Jan-Espen Pettersen

2 1

ddraw assert prevents Ankh from starting
by Christoph Frick June 23, 2006

June 23, 2006

hiho on the end of this mail is a patch, that removes an assert(0) from the surface code in ddraw. but removing it let Ankh[1][2] start (it started before, but there where no loading screen visible). yet there are other problems with this game - but it now actually works better than before. so let the ddraw developers decide what to do there - this mail is just a reminder, that there is a poor little homeless assert, that needs your attention ;) [1] german demo: http://www.gamershell.com/download_12062.shtml [2] engl. demo: http://www.gamershell.com/download_12202.shtml -- cu Index: dlls/ddraw/surface.c =================================================================== RCS file: /home/wine/wine/dlls/ddraw/surface.c,v retrieving revision 1.4 diff -u -r1.4 surface.c --- dlls/ddraw/surface.c 19 Jun 2006 10:44:41 -0000 1.4 +++ dlls/ddraw/surface.c 20 Jun 2006 07:10:07 -0000 @@ -1865,7 +1865,6 @@ WINED3DFORMAT newFormat = WINED3DFMT_UNKNOWN; HRESULT hr; FIXME("(%p)->(%p,%lx)\n", This, DDSD, Flags); - assert(0); if(!DDSD) return DDERR_INVALIDPARAMS;

2 4

Re: riched20: EM_GETLINE implementation and test
by James Hawkins June 23, 2006

June 23, 2006

On 6/22/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > This patch seems to have been overlooked or rejected - yet I do not see > any reason being mentioned. > > Was it rejected because of use of L"" syntax? > Probably, L"" is not portable, and you have to use: static const WHCAR string[] = {'s','t','r','i','n','g',0}; -- James Hawkins

5 7

Re: [AppDB] - protect sql insert statements from injection attacks
by Chris Morgan June 23, 2006

June 23, 2006

Here is the new version. I've switched to the fully expanded method of writing out the sql. This is the same format used by several db wrapper libraries, in prepared sql statements and is the recommended style under c#/.net for queries. I've tested creating new users and distributions and submitting an application. Chris On Friday 23 June 2006 1:05 am, Chris Morgan wrote: > On Thursday 22 June 2006 10:21 pm, Tony Lambregts wrote: > > Chris Morgan wrote: > > > Change compile_insert_string() to compile_insert_array() and add a new > > > first parameter of $sTable that represents the table you are building > > > the insert statement for. The output of compile_insert_array() is > > > passed to query_insert() to perform the insertion. Change all existing > > > calls of compile_insert_string() to compile_insert_array() and specify > > > the table as the first parameter. Make all instances of sql inserts > > > that didn't use compile_insert_string() use compile_insert_array(). > > > > > > The use of mysql_real_escape_string() inside of compile_insert_array() > > > protects the insert statement from sql injection attacks. > > > > > > Chris > > > > Just a couple of nits > > > > This Could have been broken before but when I try to edit a bundle I > > get: *Database Error!* > > Query: SELECT bundleId, appBundle.appId, appName FROM appBundle, > > appFamily WHERE bundleId = AND appFamily.appId = appBundle.appId > > You have an error in your SQL syntax; check the manual that corresponds > > to your MySQL server version for the right syntax to use near 'AND > > appFamily.appId = appBundle.appId' at line 1 > > This is fixed now. Was broken all the way back to the import into cvs :-) > > > This is probably broken from before (makesafe?) but I cannot create a > > new distribution. > > Yes, makesafe changes broke this. Fixed now. > > > Here is a big one though. I cannot create a new account. I just get a > > blank screen. This is .new see below > > > > You could have broken the patch in two IE: > > > > Change log: The use of mysql_real_escape_string() on inserts to protect > > from sql injection attacks. > > > > Files changed: > > include/application.php / > > include/bugs.php / > > include/category.php / > > include/comment.php / > > include/db.php / > > include/distributions.php > > include/monitor.php / > > include/note.php / > > include/screenshot.php > > include/testResults.php / > > include/url.php / > > include/user.php / > > include/util.php / > > include/vendor.php / > > include/version.php / > > > > Change log: Make all remaining instances of sql inserts use > > compile_insert_array(). > > > > Files changed: > > maintainersubmit.php / > > admin/adminAppDataQueue.php / > > admin/editBundle.php / > > include/appdb.php / > > include/vote.php / > > > > I'm not say you should have just that it could have been done that way. > > > > You should include the "change log:" and "files changed:" to the patch > > the files. "Changed files: really helps in that it gives you an > > overview of the scope of the patch. > > > > > ----------------------------------------------------------------------- > > >- > > > > > > ? compile_insert_array.patch > > > ? hits_table_alter > > > ? injection_protect.patch > > > ? injection_protect2.patch > > > ? limittestresults.patch4 > > > ? vote_table_alter > > > ? data/screenshots > > > > Last really trivial nit (these are not really part of the patch) > > > > > Index: include/user.php > > > =================================================================== > > > RCS file: /opt/cvs-commit/appdb/include/user.php,v > > > retrieving revision 1.67 > > > diff -u -r1.67 user.php > > > --- include/user.php 21 Jun 2006 01:04:13 -0000 1.67 > > > +++ include/user.php 22 Jun 2006 20:07:17 -0000 > > > @@ -83,14 +83,15 @@ > > > return false; > > > } else > > > { > > > - $aInsert = compile_insert_string(array( 'realname' => > > > $sRealname, > > > - 'email' => > > > $sEmail, - > > > 'CVSrelease' => $sWineRelease )); > > > + $aInsert = compile_insert_array("user_list", > > > + array( 'realname' => > > > $sRealname, > > > + 'email' => > > > $sEmail, > > > + 'CVSrelease' => > > > $sWineRelease, > > > + 'password' => > > > password($sPassword), > > > + 'stamp' => > > > "NOW()", > > > + 'created' => > > > "NOW()")); > > > > I remember fighting with this before. password() and NOW() cannot be > > put into the array like this I do not have an easy answer for this at > > all at this point > > > > > - $sFields = "({$aInsert['FIELDS']}, `password`, `stamp`, > > > `created`)"; > > > - $sValues = "({$aInsert['VALUES']}, > > > password('".$sPassword."'), NOW(), NOW() )"; > > > - > > > - query_appdb("INSERT INTO user_list $sFields VALUES > > > $sValues", "Error while creating a new user."); > > > + query_insert($aInsert, "Error while creating a new > > > user."); > > > > > > $retval = $this->login($sEmail, $sPassword); > > > $this->setPref("comments:mode", "threaded"); /* set the > > > users default comments:mode to threaded */ > > > @@ -183,7 +184,11 @@ > > > return false; > > > > > > $hResult = query_appdb("DELETE FROM user_prefs WHERE userid = > > > ".$this->iUserId." AND name = '$sKey'"); > > > - $hResult = query_appdb("INSERT INTO user_prefs > > > VALUES(".$this->iUserId.", '$sKey', '$sValue')"); > > > + $aInsert = compile_insert_array("user_prefs", > > > + array( 'userid' => > > > $this->iUserId, > > > + 'name' => $sKey, > > > + 'value' => $sValue)); > > > + $hResult = query_insert($aInsert); > > > return $hResult; > > > } > > > > Other than that its clean. We need to find a way of fixing new > > accounts though. > > > > -- > > > > Tony Lambregts > > I've got a fix for this. The basic jist is to simply get rid of > compile_insert_array() and use a fancier version of query_parameter() that > uses pear db replacement operators. There isn't any other way to know > whether any given variable should be surrounded with '' or not > escaped(something else that is useful in certain cases apparently). Should > have this change in place soon. > > Chris

1 0

CFileDialog::OnFolderChange() problem with Customized file open dialog
by Dan Kegel June 23, 2006

June 23, 2006

Ravinder wrote: > I am currently working on making a windows program function in > wine. it works for the most part, so i'm trying to iron out a > few critical bugs. first off... i'm looking at microsoft's > CFileDialog class - it is what the standard windows 'open > file' and 'save file' dialog windows use. the problem is this: > CFileDialog has a built in function called OnFolderChange, that > is used to determine whether the user has changed folders in the > dialog, whether by double click or what not.. the program i'm > working on overrides the CFileDialog class, and includes more > code for the OnFolderChange function (and for other functions) > for its own purposes. the new OnFolderChange function works > perfectly fine in windows, but is completely ignored when using > wine - it never even gets called, while the rest of the dialog > window retains all of its intended functionality. I see you've filed http://bugs.winehq.org/show_bug.cgi?id=5475 about on Jonathan Ernst's advice. Good advice! But be sure to add the full source code and project file for your sample code, as some people do have Visual C++, and will want to build it and step through. ATL problems are, I suspect, hard to diagnose because it requires understanding a bit about how ATL works under the hood, which few people do. If you're in a hurry for a solution, you could engage Codeweavers to solve problems like this. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: riched20: (updated) EM_GETLINE implementation and test
by James Hawkins June 22, 2006

June 22, 2006

On 6/22/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > This is the EM_GETLINE patch from Thomas Kho, updated to current git and > with L"" replaced by proper WCHAR array. > > Krzysztof > > ====================================================== > > Hi, > > The following patch implements EM_GETLINE. This feature was requested in > bug #4305 <http://bugs.winehq.org/show_bug.cgi?id=4305> and also > mentioned at > <http://groups.google.com/group/comp.emulators.ms-windows.wine/msg/f89762653…> > > Regards, > > Thomas Kho > > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 9a2b966..23538ab 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c ... > @@ -2016,6 +2016,62 @@ LRESULT WINAPI RichEditANSIWndProc(HWND > return nChars; > } > } > + case EM_GETLINE: > + { > + ME_DisplayItem *run; > + ME_String *strText; > + int nMaxChars = (int) *(WORD *) lParam; > + int nBPC = 1; /* bytes per character */ > + int nEndChars; > + char *dest = (char *) lParam; > + > + TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, > + IsWindowUnicode(hWnd) ? "Unicode" : "Ansi"); > + A case this long should be moved into its own function and called from case EM_GETLINE. In fact, most of these should probably be factored into separated functions to reduce clutter. As it stands, RichEditANSIWndProc is a 1048 line function...yikes. -- James Hawkins

1 0

Re: OleView: Added CreateInstanceOn functionality
by James Hawkins June 22, 2006

June 22, 2006

On 6/22/06, Piotr Caban <piotr.caban(a)gmail.com> wrote: > Hi, > > Changelog: > - Added CreateInstanceOn functionality > Make sure you label a series of patches as OleView [1/x] etc. where x is the total number of patches, so if they are received out of order, Alexandre knows what order to apply them in. -- James Hawkins

1 0

Re: msi: Load all components, not just components associated with a feature
by James Hawkins June 22, 2006

June 22, 2006

On 6/21/06, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > This fixes bug 3590. > > Changelog: > * Load all components, not just components associated with a feature. > Ignore this patch, it's not correct. -- James Hawkins

1 0

Re: [SETUPAPI] SetupDiCreateDeviceInfoA stub
by Detlef Riekenberg June 22, 2006

June 22, 2006

Hi Christian Gmeiner: > It seems that there > is no SetupDiCreateDeviceInfoW exporteded by setupapi.dll on windows SetupDiCreateDeviceInfoW is exported: http://support.microsoft.com/dllhelp/?dlltype=file&l=55&S=1&alpha=setupapi.… Example Version: http://support.microsoft.com/dllhelp/?fid=91484&l=55&det=1 $ winedump dump -j export setupapi* | grep SetupDiCreate 00023DFE 299 SetupDiCreateDevRegKeyA 00001C0F 300 SetupDiCreateDevRegKeyW 000173E8 301 SetupDiCreateDeviceInfoA 000015A7 302 SetupDiCreateDeviceInfoList 000170D1 303 SetupDiCreateDeviceInfoListExA 000048E5 304 SetupDiCreateDeviceInfoListExW 0001746F 305 SetupDiCreateDeviceInfoW 00018A9F 306 SetupDiCreateDeviceInterfaceA 0002471C 307 SetupDiCreateDeviceInterfaceRegKeyA 00001CCE 308 SetupDiCreateDeviceInterfaceRegKeyW 00018B03 309 SetupDiCreateDeviceInterfaceW -- By By ... ... Detlef

2 1

Re: OleView: Removed use of strlenW, strcmpW and strcpyW functions
by Jacek Caban June 22, 2006

June 22, 2006

Hi, Piotr Caban wrote: > Hi, > > Changelog: > - Removed use of strlenW, strcmpW, strcpyW functions > > programs/oleview/details.c | 14 +++++++------- > programs/oleview/tree.c | 16 ++++++++-------- > 2 files changed, 15 insertions(+), 15 deletions(-) > > -- > Piotr > You should also remove include wine/unicode.h. Jacek

1 0

forgotten patch
by Krzysztof Foltman June 22, 2006

June 22, 2006

This patch apparently has been lost, and there's at least one bug in Bugzilla that the patch seems to fix (bug# 4452, checked here). http://www.winehq.org/pipermail/wine-patches/2006-January/023875.html I don't see anything wrong with the patch, did Phil just send it in a wrong moment, or is there anything to fix? Krzysztof

2 1

Re: oleview: Link with wine's unicode libarary
by James Hawkins June 22, 2006

June 22, 2006

On 6/21/06, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > Changelog: > oleview: Link with wine's unicode libarary. > We should be changing the strlenW to lstrlenW, not adding $(LIBUNICODE) to the Makefile. -- James Hawkins

1 0

Oleview: undefined references
by Andrew Talbot June 22, 2006

June 22, 2006

Does anyone know why details.c and tree.c might have undefined references to the unicode string functions, such as strlenW()? My guess is that there might be something wrong with the Makefile.in. Compilation breaks if the -Write-strings flag is specified. Thanks, -- Andy.

3 5

Re: WineD3D: VBO patch 3/3
by Stefan Dösinger June 21, 2006

June 21, 2006

Am Mittwoch 21 Juni 2006 15:05 schrieb Stefan Dösinger: > This patch finally adds code for creating VBOs. > > ChangeLog: > Stefan Dösinger(for CodeWeavers): Create vertex buffer objects for D3D > vertex buffers Do not apply that patch yet. It is missing some GL constant definitions(GL_STREAM_DRAW, GL_STATIC_COPY, ...) I will send an updated patch tomorrow

1 0

RE: Win64 status
by Ge van Geldorp June 21, 2006

June 21, 2006

> From: Kuba Ober <kuba(a)mareimbrium.org> > > I'm currently hacking on gcc for an embedded target (Z8 > Encore), but I wouldn't mind giving it a try while I'm > digging in the gcc tree. Cool! > I'd like to hear any suggestions as to how to tell the > compiler to use that calling convention (I'm not talking > about implementation, just how the compiler used would tell it). > > I presume it'd need to be something that can be set globally > per each compiler invocation, as well as a per declaration override. > > I'm thinking of "-msvc" (like -liberty ;) compiler option to > force a MSVC-compatible ABI, and for now that'd only apply to > 64 bit code (i.e. with -m64). Maybe in the future it could > enable something special for 32 bit code as well. > > I'm all ears about the per-declaration override (a pragma? an > __attribute__?), and about alternatives to -msvc. __attribute__ seems most logical to me. Perhaps __attribute__(__msvccall__) (in the __attribute__(__stdcall__) tradition? An alternative to -msvc could perhaps be -mrtd ("Alternate calling convention"). For i386 builds of gcc, -mrtd makes stdcall the default calling convention. It is currently a noop for x86_64. I kind of like your -msvc though :-) For Wine the compiler option seems more important then the override. > I'd be submitting a patch to mingw32 people as soon as it's > done, in addition to posting it here. Note that the only way > for me to test it would be to inspect the assembly output, as > I'm not running 64 bit environment here (even though I'm on a > 64 bit AMD processor). So it'd need testing from 64 bit > people here at least. I'm volunteering. I could also give you ssh access to a 64 bit environment. Ge van Geldorp.

5 7

appdb redesign
by Evgeny Burzak June 21, 2006

June 21, 2006

take a new look at appdb. Suggestions, crtitical opinion, spell-checking, pizza, money, post-cards are welcome -__- Evgeny

3 4

Re: APPDB patch - adminAppQueue.php
by Tony Lambregts June 21, 2006

June 21, 2006

EA Durbin wrote: >> >> I'm going to look into the orphaned version issue right now but there >> may be >> others. >> > > What is the orphaned version issue? > When users submitted an new version of an application the appId was set to 0 instead of the proper number. Fixed by Chris with this patch http://cvs.winehq.org/patch.py?id=25914

1 0

Re: GetMessage: Return -1 if an invalid window handle has been passed
by James Hawkins June 21, 2006

June 21, 2006

On 6/21/06, Michael Kaufmann <hallo(a)michael-kaufmann.ch> wrote: > Changelog: > GetMessage: Return -1 if an invalid window handle has been passed > A test case would be good. -- James Hawkins

1 0

[ntdll patch] Patch dropped?
by Andrew Talbot June 21, 2006

June 21, 2006

I saw a patch I posted yesterday (ntdll: server.c, write-strings fix) appear on the wine-cvs page for a while :), and now it has disappeared :(. Did it fall, or was it pushed? ;) -- Andy.

1 1

Re: Resend: WineD3D: pixel format cleanup
by Stefan Dösinger June 21, 2006

June 21, 2006

> It doesn't (last I checked)... neither does CreateVolume(). > This also requires a test to see what Windows does. > > Checking if a format is supported before > > > returning the gl config doesn't really make sense. If the format isn't > > supported and we ask gl for a compressed texture we will get an error > > returned and broken graphics(because we ignore gl errors generally). If > > we pass 0 instead for the gl format and internal format we will have > > broken graphics too but I don't think gl returns an error then(although > > I'd have to > > check the man page for that) > > I agree, but I thought the patch was a no-op :) Oh well, not a 100% no op then. But that is hard to nop with a constant table :-) Well, almost all cards support that extension, so it's a de-facto no-op

1 0

Re: Resend: WineD3D: pixel format cleanup
by Ivan Gyurdiev June 21, 2006

June 21, 2006

On 6/21/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > This is a resend of the patch from a few days ago with some modifications > requested by Alexandre: > > *getFormatDescEntry returns a pointer to a format structure, not an index > in > the array > > * Removed the format counter Stefan, can you clarify what happened to the GL_SUPPORT check for compressed formats?

2 1

ntoskrnl status
by Mario Demontis June 21, 2006

June 21, 2006

Hello It's my first post here... Any news about ntoskrnl.exe support? As far as I can understand it's not yet integrated... Are there any new patches? Thanks in advance Mario -- Email.it, the professional e-mail, gratis per te: http://www.email.it/f Sponsor: Grande Offerta di Benvenuto Cassine di Pietra: * 36 bottiglie di ottimo vino veneto direttamente a casa tua! * Clicca qui: http://adv.email.it/cgi-bin/foclick.cgi?mid=3923&d=15-6

9 14

Re: [Bug 5463] ie6 installs now, but doesn't work...
by Peter Åstrand June 21, 2006

June 21, 2006

On Mon, 19 Jun 2006, Wine Bugs wrote: > vitaliy(a)kievinfo.com changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > Status|RESOLVED |CLOSED > > > ------- Additional Comments From vitaliy(a)kievinfo.com 2006-19-06 14:11 ------- > Again this is not a bug. There is nothing to fix because there is nothing that > broke. I disagree. If IE doesn't run, it's a bug. I would actually say that it's a major bug - IE is one the those core applications that users expects to work. You are incorrect about "there is nothing to fix": Perhaps the source code is fine, but the documentation is certainly not. http://appdb.winehq.org/appview.php?versionId=469 even says: "(to be continued because then it still doesn\'t run because of ole errors)" > Anyone is welcome to write up instructions on what to override and place them in > appDB. Bugzilla is not the right place for that. Why do you think Bugzilla cannot be used for tracking documentation bugs? There is a "wine-documentation" component and a "WineHQ Apps Database" component, if you think that wine-misc is totally wrong. I would very much prefer is this bug could be left open until someone has managed to figure out what needs to be overridden to actually *run* IE. Regards, -- Peter Åstrand ThinLinc Chief Developer Cendio http://www.cendio.se Teknikringen 3 583 30 Linköping Phone: +46-13-21 46 00

7 7

Re: wined3d: Bind correct # of samplers for GLSL shaders
by Ivan Gyurdiev June 21, 2006

June 21, 2006

On 6/20/06, Jason Green <jave27(a)gmail.com> wrote: > > - We are only checking against GL_MAX_TEXTURES when binding samplers, > when we should be checking against the maximum number of samplers that > the card supports. Spotted by H. Verbeet. Yes, I'm aware of that...it was done on purpose. This limit is in a lot of other places - stateblock code, drawprim code. Have you checked that it will all interact properly using this higher limit? Specifically, have you tested a sampler > 4 with SetTexture()? I think this problem should be solved by a single patch that updates all the necessary places to use the higher texture units value, as opposed to the legacy one (there's some caps code to write for this).

2 1

solution: IE6 setup says "The download location information is damaged"
by James Hawkins June 21, 2006

June 21, 2006

Hey, If you're still having this problem, please make sure you are not on a remote or network-mounted drive. IE6 setup checks if the drive is remote, and will not install if it is, complaining with the completely non-related error that "The download location information is damaged." If you're not sure whether you're on a remote drive or not, and the IE6 setup is still not working, please post back and attach a +volume trace. I was frustrated that the setup was not working on my work machine, while it was on my home machine. Reading through a +all log showed that GetDriveTypeW was returning 4 for my work machine, which is DRIVE_REMOTE, and then it would fail with the message box. Hacking GetDriveTypeW to always return DRIVE_FIXED let me install onto my remote drive. Thanks, James Hawkins

2 3

wined3d:add an "\n" to a fixme to fix an overflow
by Louis. Lenders June 21, 2006

June 21, 2006

Hi, i get this crash in an application (ftp://ftp.avault.com/demos/puzzleblastsetup.exe) : wine_dbg_vprintf: debugstr buffer overflow (contents: 'fixme:d3d_surface:IWineGDISurfaceImpl_Blt Unsupported flags: 00000010 Unsupported flags: 00000010 Unsupported flags: 00000010 Unsupported flags: 00000010 etcetera This simple patch fixes it. Changelog:add an "\n" to a fixme to fix an overflow --------------------------------- All New Yahoo! Mail Tired of Vi(a)gr@! come-ons? Let our SpamGuard protect you.

1 0

Very large fonts cause loss of connection to X server
by Troy Rollo June 21, 2006

June 21, 2006

Rendering text to a screen DC with a font height on the order of 17,000 pixels results in glyphs being uploaded to the X server that are on the order of 30MB in size (or more for some wide characters). The next attempt to make a request of the server results in a SIGPIPE. This is possible if an app has the ability to zoom in on a document containing text and allows the user to specify the scaling factor without limiting it. Very large screen fonts can also arise when some WYSIWYG display strategies are used, although this would not ordinarily get to the 17,000 pixel range. Windows deals with such behaviour without problems. I'm not sure there's anything that can be done about this other than imposing an arbitrary sanity check on the size of the screen font prior to uploading the glyph - if the font is much larger than the screen, for instance, then perhaps the best thing is just not to upload the glyph but mark it internally as having been uploaded. Presumably that will prevent the loss of connection without breaking WYSIWYG display strategies that involve calculating positions using large fonts in a screen DC. -- Troy Rollo - wine(a)troy.rollo.name

1 0

Re: [AppDB] - make variables more consistent, fix indenting
by Tony Lambregts June 21, 2006

June 21, 2006

Chris Morgan wrote: > Make the code more consistent by using the appdb coding standards. > > Change $result = query_appdb(...) to $hResult = ... etc. > > Also fix some odd indenting due to spaces vs. tabs. > > There are still a ton of variables that are integers or strings that should be > prefixed with 'i' or 's' if anyone is interested in cleaning some of that up. > > Chris I am not opposed to doing this but I think that the patch is way too big. At the momment we still have issues with the last "big patch" that are not cleared up [1]. On the whole unless we cannot avoid it I really do not think that we should be making such large changes in one go like this. Please break up the patch into smaller patches. That way it is easier to find and fix any issues that arise. [1] New versions end up as orphans with current setup. -- Tony Lambregts

2 4

Re: [MSI 1/4] add streams table
by Mike McCormack June 21, 2006

June 21, 2006

Hi, Thanks for submitting the patch, and keeping the coding style consistent! Andrey Turkin wrote: > This patch adds virtual _Streams table to MSI because native MSI > maintains such table > > ChangeLog: > virtual _Streams table added > +static UINT STREAMS_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ) > +{ .... > + > + /* > + * The column marked with the type stream data seems to have a single number > + * which references the column containing the name of the stream data > + * > + * Fetch the column to reference first. > + */ > + r = view->ops->fetch_int( view, row, col, &ival ); I'm not so keen on the way this is done. You seem to have duplicated alot of code from TABLE_fetch_stream here. > + if( r != ERROR_SUCCESS ) > + { > + ERR("1: %d\n", r); > + return r; > + } > + > + ERR("fetched %d\n", ival); And forgotten to remove your debug code. > +MSIVIEWOPS streams_ops = > +{ > + TABLE_fetch_int, > + STREAMS_fetch_stream, > + TABLE_set_int, > + TABLE_insert_row, > + STREAMS_execute, > + TABLE_close, > + TABLE_get_dimensions, > + TABLE_get_column_info, > + TABLE_modify, > + TABLE_delete, > + TABLE_find_matching_rows > +}; The streams table is just another table. How about generating an MSITABLE structure containing the data rather than treat it as a special case in here? Mike

2 1

Re: [WiKI] Common site menu 4/4
by Tony Lambregts June 21, 2006

June 21, 2006

Is there anything wrong with this patch? Change log: update menus for all sites to have a common "WineHQ Menu". files changed: winehq/winehq.py ? winehq/winehq ? winehq/img/logo.png Index: winehq/winehq.py =================================================================== RCS file: /cvsroot/wine/wiki/winehq/winehq.py,v retrieving revision 1.3 diff -u -r1.3 winehq.py --- winehq/winehq.py 16 May 2005 03:57:10 -0000 1.3 +++ winehq/winehq.py 3 Jun 2006 20:09:15 -0000 @@ -271,6 +271,22 @@ ''' return html % args + def winepanel(self, d): + """ Create wiki panel """ + _ = self.request.getText + html = [ + u'<div class="sidepanel">', + self.sidetitle(_("WineHQ Menu")), + u' <div class="sidecontent">', + u' <li><a href="http://www.winehq.org/"> WineHQ</a></li>', + u' <li><a href="http://appdb.winehq.org/"> AppDB</a></li>', + u' <li><a href="http://bugs.winehq.org/"> Bugzilla</a></li>', + u' <li><a href="http://wiki.winehq.org/"> Wine Wiki</a></li>', + u' </div>', + u'</div>', + ] + return u'\n'.join(html) + def wikipanel(self, d): """ Create wiki panel """ _ = self.request.getText @@ -351,6 +367,7 @@ # Sidebar u'<div id="sidebar">', + self.winepanel(d), self.wikipanel(d), self.pagepanel(d), self.userpanel(d),

3 2

Wine talk in LA june 20th,22nd. Slide check, anyone?
by Dan Kegel June 20, 2006

June 20, 2006

I'm giving a short talk on Wine at lula.org tonight and again at aitp-la.org Thursday night. The audience at aitp-la is IT professionals who don't really know much about Wine or Linux, so I'm trying for a gentle, practical talk. I'll demo a few apps (Office '97, Picasa, Firefox, Kid Pix, and Visual C++) and I'll even run an app that doesn't work too well yet (Visual Basic 6's IDE). The slides, such as they are, are up at kegel.com/wine/wine-2006-june-talk.ppt kegel.com/wine/wine-2006-june-talk.pdf (I usually use magicpoint, but for this talk, I used Office 97's powerpoint on the theory that one should eat one's own dogfood...) Corrections/improvements welcome. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

riched slowdown
by James Hawkins June 20, 2006

June 20, 2006

Hi, I just did a +relay log of the ie6setup.exe installation. I had to ctrl-c after the log grew to 3.5gb and the initial screen hadn't been displayed yet. tail -n 1000 relay.log showed call after call to WideCharToMultibyte before I finally killed the install. Here is a sample of one of the calls: WideCharToMultiByte(000004e4,00000000,40895ae4 L"S\5524",00000001,40895ae7,00000001,00000000,40895ae8) So the length of the "string" we're converting is 1. Not exactly efficient. grep'ing the log for WideCharToMultiByte reveals 39426680 calls, and it wasn't even done loading the EULA. I'm pretty sure this is a recent bug in riched, as overriding riched20 and riched32 gets rid of the problem. -- James Hawkins

1 0

Re: lz32: remove dead code from the LZOpenFileW test.
by Detlef Riekenberg June 20, 2006

June 20, 2006

Saulius Krasuckas wrote: > + ok(file >= 0, "LZOpenFileW failed on switching to a compressed file name\n"); .. > + ok(test.nErrCode == 0, "LZOpenFileW set test.nErrCode to %d\n", > + test.nErrCode); Did you mean "test.nErrCode == ERROR_SUCCESS"? You test the Errorcode here, but you did not use SetLastError() before LZOpenFileW. > + ok(lstrcmpA(test.szPathName, expected) == 0, > + "LZOpenFileW returned '%s', but was expected to return '%s'\n", > + test.szPathName, expected); This is strange: An ANSI-Compare for an UNICODE-Function. After reading the source and OFSTRUCT, this is correct. I suggest a command before the above "ok()". An extra Patch with the WINAPI-Documentation for the Implementation would be nice. This should include a note, that the ANSI-String "szPathName" in "OFSTRUCT" is the correct Parameter for the UNICODE-Implementation. ---- cut ---- This part from your previous Patch is already in the tree, but: > > + /* Delete the file then make sure it doesn't exist anymore. */ > + file = LZOpenFileW(filename_W, &test, OF_DELETE); > + ok(file >= 0, "LZOpenFileA failed on delete\n"); > + retval = GetFileAttributesW(filename_W); > + ok(retval == INVALID_FILE_ATTRIBUTES, > + "GetFileAttributesA succeeded on deleted file\n"); The Messages in the "W"-Tests have ANSI Function-Names -- By By ... ... Detlef

2 1

appdb: makeSafe improvement
by Vitaly Lipatov June 20, 2006

June 20, 2006

After last security fixes in AppDB there is introduced makeSafe function with one parameter. Typical using of makeSafe: $aClean['sub'] = makeSafe($_REQUEST['sub']); When $_REQUEST does not contain 'sub', we get "Notice: Undefined index:" if mod_php in strict mode (do not permit undefined variables). What about use makeSafe in the form $aClean['sub'] = makeSafe($_REQUEST,'sub'); Then we can use isset inside makeSafe for additional checking. -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

1 0

Winelib Getting Started 1.3.2. Test Drive
by Dee Ayy June 20, 2006

June 20, 2006

Hello, Would a wine developer please revisit this page http://www.winehq.org/site/docs/winelib-guide/winelib-getting-started and modify it to have a step by step guide to take a Linux box without wine nor winelib to a running notepad exe built by the newbie (and not downloaded)? Or if you are a wine-user, please provide such steps to this list. As a newbie, the statement "It can be found in the programs subdirectory." had me lost. I don't know if the steps I took are correct, but somehow I found http://www.winehq.org/site/cvs. Perhaps the winelib-getting-started page could be modified to direct a newbie how to download the "test drive" at this point. Then I only checked out wine/programs/notepad since the statement "(but read the next section before actually doing this!)" intimidated me on the cvs page. The first error after a make was "dialog.c:27:21: error windows.h: No such file or directory". Then I had the brilliant idea to checkout all of wine, even though I was intimidated initially by the statement "(but read the next section before actually doing this!)". The make still failed with the same error, even though I now have the wine/include directory. Not knowing any better, I modified the Makefile from INCLUDE_PATH = -I. to INCLUDE_PATH = -I.:/my/path/to/wine/include. I retried make and get the same error. I'm stumped. The 1.3.3 Step by step guide was too general for me. But maybe that's because I needed section 1.3.2 to be more detailed for the task at hand, building notepad. And perhaps 1.3.3 can be left alone for more general information. Please advise. Thanks, D

4 4

Re: msi: Fix handling of the no-op identifier in the Directory table [resend]
by Alexandre Julliard June 20, 2006

June 20, 2006

"James Hawkins" <truiken(a)gmail.com> writes: > Is there anything wrong with this patch? > > Changelog: > * Fix handling of the no-op identifier in the Directory table. You are assigning a const string to a non-const variable, that causes warnings. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [WINED3D 3/3] Fix fog in the case of vertex shaders
by Ivan Gyurdiev June 20, 2006

June 20, 2006

On 6/19/06, Jason Green <jave27(a)gmail.com> wrote: > > - Fixes both ARB and GLSL shaders that use fog. > Is it really necessary to keep track of whether the shader uses fog or not? What happens if you disable this post-processing for a shader that doesn't write to the fog register? Also, how come the ARB version forces the fog value to be > 0, but the GLSL one has both lower and upper limit (clamp to 0,1) ? Shouldn't you use saturate (_SAT) to achieve the same effect?

2 1

Re: Win64 patch 1/13
by Mike McCormack June 20, 2006

June 20, 2006

Ge van Geldorp wrote: > +SPEC_SRC32 = $(BASEMODULE).spec > +SPEC_SRC64 ?= $(SPEC_SRC32) Not sure we want seperate spec files. In any case, ?= doesn't look portable. > -ULONG WINAPI MAPILogon(ULONG uiparam, LPSTR profile, LPSTR password, > +ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, > FLAGS flags, ULONG reserved, LPLHANDLE session) > --- programs/wordpad/wordpad.c 14 Feb 2006 16:48:40 -0000 1.1 > +++ programs/wordpad/wordpad.c 19 Jun 2006 17:34:48 -0000 I thought I already fixed these... I don't think these will apply to the current git tree. > --- dlls/ntdll/tests/generated.c 3 Jul 2005 11:23:30 -0000 1.23 > +++ dlls/ntdll/tests/generated.c 19 Jun 2006 17:20:17 -0000 You should be changing tools/winapi/winapi_test*, not the generated files. The heap changes look useful, I will check them out when I get back from my holiday. Mike

2 4

re: MSI database _Streams table
by Dan Kegel June 20, 2006

June 20, 2006

In http://www.winehq.org/pipermail/wine-patches/2006-June/027528.html, Andrey Turkin wrote: > Some installers depends on _Streams built-in table Which installers? It'd be nice to have a bug in bugzilla to hang your MSI work on. Thanks! - Dan

2 1

Re: Win64 patch 9/13
by Dmitry Timoshkov June 20, 2006

June 20, 2006

"Ge van Geldorp" <ge(a)gse.nl> wrote: > - GWL_HINSTANCE is not defined on Win64, hInstance is documented as not > required in CreateWindowEx calls > - HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); > + HINSTANCE hInstance; Please use HINSTANCE hInstance = GetWindowLongPtr(hWnd, GWLP_HINSTANCE); instead. -- Dmitry.

1 0

Usage of checkGLcall in wined3d
by Paul Vriens June 19, 2006

June 19, 2006

Hi, while going through some wined3d code I've seen that a 'normal' sequence is: <some call>; checkGLcall("<some call>"); there are however several cases where the call isn't followed by a checkGLcall: surface.c:1713: glEnable(GL_TEXTURE_2D); surface.c:2165: glEnable(GL_SCISSOR_TEST); or that parameters/text are wrong for checkGLcall: surface.c-2220- glBindTexture(GL_TEXTURE_2D, 0); surface.c:2221: checkGLcall("glEnable glBindTexture"); surface.c-2406- glGetIntegerv(GL_DRAW_BUFFER, &prev_draw); surface.c:2407: vcheckGLcall("glIntegerv"); Should this one be defined as a janitorial task? Cheers, Paul.

3 2

Win64 status
by Ge van Geldorp June 19, 2006

June 19, 2006

With the Win64 patches I just submitted to wine-patches, I'm able to successfully build Win64-enabled Wine and execute the following 64-bit winelib (winelib64? wine64lib?) application: #include "windows.h" int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int cmdshow) { DWORD Written; WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), "Hello, world\r\n", 14, &Written, NULL); return 0; } Unfortunately, compiling the above app as a true 64-bit HELLO64.EXE using Microsoft Visual Studio and then executing it using Wine doesn't work. The problem is that the calling convention for functions is different between MSVC and GCC generated apps. Basically, MSVC puts the function arguments in registers RCX, RDX, R8, R9 while GCC puts function arguments in registers RDI, RSI, RDX, RCX, R8, R9. I guess we'll have to wait for true .EXE support until someone teaches GCC the MSVC calling convention. To prevent confusion: the "normal" 32-bit Wine version runs fine on x86_64 Linux. This is the version you'll want to use, it allows you to run 32-bit Windows stuff. The remarks above are about running 64-bit Windows executables which are virtually non-existant at the moment. Gé van Geldorp.

2 1

wined3d: declaration/FVF conversion test
by Ivan Gyurdiev June 19, 2006

June 19, 2006

Hi, I'm attaching test, which demonstrates incorrect behavior of SetFVF and SetVertexDeclaration. Windows converts one to the other and backwards (at least partially), and we do not such thing - this breaks at least 2 demos (dx9_hlsl_*) I'm posting it here, because: - I don't have Windows, and I need someone to try it on machine with pixel shader support (preferably 3.0, will need to enable pshaders and GLSL registry key). The whole first part of the test checks decl to fvf conversions, and they're almost all set to 0 in order to pass on H. Verbeet and V. Margolen's setups [ which have no pshaders ]. MSDN has a whole page on how to convert to an fvf, and the values there are definitely *not* 0, so that's why I'm suspicious. - Secondly, I am leaving for NYC in 2 days to look for a place to live, so I have limited time to clean up the test (ok/trace usage and the like), and I have no time to implement the fix. I am hoping someone else can finish it, because afterwards I go to Denver for a month, where I will have limited computing capabilities. Then I start a full time job back at NYC, so I'll be pretty busy. Anyway, I'm sure Jave has shaders under control and will be done with sm 2, 3, 4, 5.. 10 by the end of the summer whether I help or not :)

5 9

wine XShm problem on remote display
by Benjamin Fabricius June 19, 2006

June 19, 2006

Hello all, I am working on a vst (audio-plugin-)server with embedded linux. Everything is up and running in a testing phase. Unfortunately i am experiencing difficulties, that i think could derive from wine. First of all my setup vst:/opt/fst # uname -a; wine --version Linux vst 2.6.15 #21 PREEMPT Thu Mar 30 22:11:02 CEST 2006 i686 unknown Wine 20050725 Also i am using FreeST which is a binary in order to mount and maintain the vst plugins. The server runs as a x client and my development laptop as x server. This setup works satisfactory i can display any graphical windows on my laptop including wine loaded windows executables. now though, when loading certain plugins on the server (x client) (these all work fine on my local development host) i get a weird x server fault 8<----8<----8<----8<----8<----8<----8<---- vst:/opt/fst # ./fst /mnt/testsuite/oberon4/Oberon-8.dll yo... lets see... The program 'fst.exe.so' received an X Window System error. This probably reflects a bug in the program. The error was 'BadAccess (attempt to access private resource denied)'. (Details: serial 114 error_code 10 request_code 144 minor_code 1) (Note to programmers: normally, X errors are reported asynchronously; that is, you will receive the error a while after causing it. To debug your program, run it with the --sync command line option to change this behavior. You can then get a meaningful backtrace from your debugger if you break on the gdk_x_error() function.) 8<----8<----8<----8<----8<----8<----8<---- An xdpyinfo on my xserver gives me ben(a)barney:~> xdpyinfo -queryExt | grep 144 MIT-SHM (opcode: 144, base event: 94, base error: 166) So the MIT-SHM extension seems to be the source of the trouble. looking into the MIT-SHM extension headers gives me the minor opcode: ben(a)barney:/usr/include/X11/extensions> less XShm.h ... #define X_ShmQueryVersion 0 #define X_ShmAttach 1 #define X_ShmDetach 2 #define X_ShmPutImage 3 #define X_ShmGetImage 4 #define X_ShmCreatePixmap 5 ... so attaching a shared memory pixmap appears to be causing the trouble. Now I`m not sure yet if a wine or fst function is causing the trouble. It could derive from some Gtk call... Isn't it problematic to use the shared memory extension when working on a remote display? Now some google entries tell me one must have been able to disable wine using xshm in /etc/wine.conf for example. Is this still so because i can not find any config file allowing this in my distro. And using winecfg didn't really deliver results either. My handicap is my lack of profound knowledge in wine and x matters. Maybe you guys now some work around or can imagine what could be causing all the havoc here... Any help would be great... thank for your time, Cheers, bf -- ------------------- Benjamin Fabricius German Student Lawo AG

4 4

Re: x11drv: Escape international characters
by Dmitry Timoshkov June 19, 2006

June 19, 2006

"Andrew Talbot" <Andrew.Talbot(a)talbotville.com> wrote: > It seems better to represent international characters with escape sequences, > both to increase clarity - especially for those who do not normally use > ISO-8859-1 encoding - and to make editing easier for some. Please don't do that. Anyone who wants to edit keyboard tables should set editor to ISO-8859-1 encoding. Otherwise it becomes really hard to add new tables or fix existing ones by just comparing or even copy/pasting from the +key log. -- Dmitry.

3 2

Re: configure: datarootdir is unused, and causes a warning with newer versions of autoconf.
by Marcus Meissner June 19, 2006

June 19, 2006

On Mon, Jun 19, 2006 at 06:12:38PM +0900, Mike McCormack wrote: > diff --git a/Make.rules.in b/Make.rules.in > index 9af2d3e..9deee72 100644 > --- a/Make.rules.in > +++ b/Make.rules.in > @@ -98,7 +98,6 @@ prefix = @prefix@ > exec_prefix = @exec_prefix@ > bindir = @bindir@ > libdir = @libdir@ > -datarootdir = @datarootdir@ > datadir = @datadir@ > infodir = @infodir@ > mandir = @mandir@ We added this especially because configure warned about it. Ciao, Marcus

2 1

Re: Fix definition of SECURITY_INTEGER
by Kai Blin June 19, 2006

June 19, 2006

* Thomas Weidenmueller <wine-patches(a)reactsoft.com> [19/06/06, 11:38:54]: > Index: dlls/secur32/negotiate.c > =================================================================== > RCS file: /home/wine/wine/dlls/secur32/negotiate.c,v > retrieving revision 1.3 > diff -u -r1.3 negotiate.c > --- dlls/secur32/negotiate.c 23 May 2006 12:48:34 -0000 1.3 > +++ dlls/secur32/negotiate.c 19 Jun 2006 09:10:31 -0000 > @@ -110,7 +110,10 @@ > phCredential->dwUpper = fCredentialsUse; > /* Same here, shamelessly stolen from schannel.c */ > if (ptsExpiry) > - ptsExpiry->QuadPart = 0; > + { > + ptsExpiry->LowPart = 0; > + ptsExpiry->HighPart = 0; > + } > ret = SEC_E_OK; > } > return ret; Be aware that negotiate.c is a complete stub. If this function is changed, it should be changed like this: diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index b8531aa..586e559 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -93,28 +93,6 @@ static SECURITY_STATUS SEC_ENTRY nego_Qu return ret; } -static SECURITY_STATUS nego_AcquireCredentialsHandle(ULONG fCredentialsUse, - PCredHandle phCredential, PTimeStamp ptsExpiry) -{ - SECURITY_STATUS ret; - - if(fCredentialsUse == SECPKG_CRED_BOTH) - { - ret = SEC_E_NO_CREDENTIALS; - } - else - { - /* Ok, just store the direction like schannel does for now. - * FIXME: This should probably do something useful later on - */ - phCredential->dwUpper = fCredentialsUse; - /* Same here, shamelessly stolen from schannel.c */ - if (ptsExpiry) - ptsExpiry->QuadPart = 0; - ret = SEC_E_OK; - } - return ret; -} /*********************************************************************** * AcquireCredentialsHandleA @@ -124,11 +102,10 @@ static SECURITY_STATUS SEC_ENTRY nego_Ac PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return nego_AcquireCredentialsHandle(fCredentialUse, phCredential, - ptsExpiry); + return SEC_E_UNSUPPORTED_FUNCTION; } /*********************************************************************** @@ -139,11 +116,10 @@ static SECURITY_STATUS SEC_ENTRY nego_Ac PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return nego_AcquireCredentialsHandle(fCredentialUse, phCredential, - ptsExpiry); + return SEC_E_UNSUPPORTED_FUNCTION; } /*********************************************************************** There's just no use in fixing negotiate.c as long as ntlm.c is in flux. Negotiate will use the same solution as NTLM. Cheers, Kai -- Kai Blin, (blin at gmx dot net) "There are things that are so serious that you can only joke about them" - Heisenberg

2 1

Re: appdb security
by Christoph Frick June 19, 2006

June 19, 2006

On Thu, Jun 08, 2006 at 11:25:08AM -0400, Chris Morgan wrote: > $sQuery = "Select versionId from appVersion where > appId='"$_REQUEST['appId']."';"; > > Who's '' around $_REQUEST should prevent the string from being interpreted as > anything but a single value passed as the value of appId. with appId="' or 1=1;'"? -- cu

6 12