wine-devel June 2006

wine-devel@winehq.org

174 participants
352 discussions

Re: wined3d: Bind correct # of samplers for GLSL shaders
by Ivan Gyurdiev 21 Jun '06

21 Jun '06

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 21 Jun '06

21 Jun '06

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 21 Jun '06

21 Jun '06

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@gr@! come-ons? Let our SpamGuard protect you.

1 0

Very large fonts cause loss of connection to X server
by Troy Rollo 21 Jun '06

21 Jun '06

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 21 Jun '06

21 Jun '06

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 21 Jun '06

21 Jun '06

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 21 Jun '06

21 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

"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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

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 20 Jun '06

20 Jun '06

"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 19 Jun '06

19 Jun '06

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 19 Jun '06

19 Jun '06

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 19 Jun '06

19 Jun '06

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 19 Jun '06

19 Jun '06

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@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@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 19 Jun '06

19 Jun '06

"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 19 Jun '06

19 Jun '06

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 19 Jun '06

19 Jun '06

* 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 19 Jun '06

19 Jun '06

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

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2006