[setupapi/tests] Any reason why we do a GetProcAddress for the functions?
Hi, Is there any reason we do a GetProcAddress for the setupapi functions used in the setupapi tests? It look like they are exported properly on win95 until Vista. Or is it just because the first patch for these tests did LoadLibrary/GetProcAddress so the rest followed? Although most of the tests do a GetProcAddress, the result is actually never checked (neither in the init phase nor before calling a function). (We also do a LoadLibrary where the library is already imported, so GetModuleHandle seems more appropriate anyway). Anyone? Cheers, Paul.
Re: About new environment variable
Am Dienstag, 31. Juli 2007 05:24 schrieb Zhongli Xu: After I add an environment avriable in the system.reg file, e.g. [System\\CurrentControlSet\\Control\\Session Manager\\Environment] 1185851455 MY_VARIABLE=VALUE I tried to read this variable thru the API GetEnvironmentVariable(), but it failed. Other variables, such as PATH, OS, are OK. Set the variable in your Linux/MacOS system. Like export MY_VARIABLE=VALUE wine myProgram.exe
Re: user32: Add a stub for GetAppCompatFlags2
Hello Detlef,
Detlef Riekenberg wrote:
Fix a Crash in PDFCreator with native ps5ui.dll
Changelog:
user32: Add a stub for GetAppCompatFlags2
From c2e87ce86f59f8b4346e682fd16d0d7364ba1848 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg [EMAIL PROTECTED]
Date: Tue, 31 Jul 2007 05:27:55 +0200
Subject: [PATCH] user32: Addd a stub for GetAppCompatFlags2
---
dlls/user32/misc.c | 11 ++-
dlls/user32/user32.spec |2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index bd1c9f7..3b20d6d 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -575,7 +575,16 @@ BOOL WINAPI UnregisterDeviceNotificatio
*/
DWORD WINAPI GetAppCompatFlags( HTASK hTask )
{
-FIXME(stub\n);
+FIXME((%p) stub\n, hTask);
+return 0;
+}
+
+/***
+ * GetAppCompatFlags (USER32.@)
The comment doesn't match the function name.
+ */
+DWORD WINAPI GetAppCompatFlags2( HTASK hTask )
+{
+FIXME((%p) stub\n, hTask);
return 0;
}
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 8bf9ad1..d626053 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -244,8 +244,8 @@ # @ stub EnterReaderModeHelper
@ stdcall GetAltTabInfoA(long long ptr ptr long)
@ stdcall GetAltTabInfoW(long long ptr ptr long)
@ stdcall GetAncestor(long long)
-# @ stub GetAppCompatFlags2
@ stdcall GetAppCompatFlags(long)
+@ stdcall GetAppCompatFlags2(long)
@ stdcall GetAsyncKeyState(long)
@ stdcall GetCapture()
@ stdcall GetCaretBlinkTime()
bye
michael
--
Michael Stefaniuc Tel.: +49-711-96437-199
Sr. Network EngineerFax.: +49-711-96437-111
RPC questions
Hi folks, I will be getting into working on RPC soonish, and some of that I'd like to use for Wine. However, I don't know my way around that code so far, what would be a good starting point to tackle this? My goal is to set up a daemon that will take care of remote named pipes over smb and all of that stuff, while all that Wine needs to do is to access this daemon talking DCE-RPC. As we probably don't need to link anything, we will be able to use that daemon for other jobs, like doing netapi32 calls, etc. Where would I get started for this? Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developerhttp://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton. pgpUlyXZRqjhu.pgp Description: PGP signature
Re: Add winhttp.dll.
Hi Jacek, I think you can use the header I sent a while back to wine-patches for this. http://www.winehq.org/pipermail/wine-patches/2005-September/020901.html The original patch: http://www.winehq.org/pipermail/wine-patches/attachments/20050923/790dfab2/winhttp-0001.obj This might require some re-work. It was rejected at that time, when I wanted to add winhttp.dll It might be of some help to you. Thanks, VJ
Re: WineD3D: compile against standard GL headers
On 31/07/07, Roderick Colenbrander [EMAIL PROTECTED] wrote: Hi, This patch allows WineD3D to build against a standard GL.h and removes the dependency on glext.h. This is useful for building WineD3D against opengl32.dll. Regards, Roderick Colenbrander - You should #define the extensions to 1, like it's done for the other extensions. eg. #ifndef GL_NV_texture_env_combine4 #define GL_NV_texture_env_combine4 1 ... #endif - GL_ARB_multisample GL_EXT_vertex_weighting also define new functions, you should add those as well. - If you're going to remove the glext.h include, you should also #define GL_GLEXT_LEGACY, or gl.h will potentially pull it in by itself. - You should also remove the GL_GLEXT_PROTOTYPES define, it should only be used by glext.h
Re: WineD3D: compile against standard GL headers
- GL_ARB_multisample GL_EXT_vertex_weighting also define new functions, you should add those as well. While we're at it, GL_EXT_vertex_weighting can be removed altogether. WineD3D only checks for it, but does not use it, and it has been discontinued in favor of vertex shaders or GL_ARB_vertex_blend.
Re: Direct3D Game test framework
With Francois' help I could build a test package for 3DMark2000 now: http://stud4.tuwien.ac.at/~e0526822/3dmark2000.tar.bz2 It runs two tests, one at 640x480, another one at 1024x768, writes the results to a file and reads the file back. No benchmark results are sent to the server yet(just ok / fail). Stefan, this link is not valid anymore, could you make the file available again? Thanks, Martin
Re: #4 pdh: Implement and test PdhAddEnglishCounter{A, W} and PdhCollectQueryDataWithTime.
Alexandre Julliard wrote:
Paul Vriens [EMAIL PROTECTED] writes:
I'll have a look.
How do yo want to report a missing test? In the normal report file? If
that's the case we should also change the dissect/gather scripts:
It has to be part of the report data, so yes the scripts probably need
to be updated.
If this thing works out, should we change the old tests back or use
this new approach only for new (and currently failing) dll's?
If it simplifies the code we can certainly change the old tests too.
Hi,
a patch somewhat like this?
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index f743ffc..3c4846d 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -433,6 +433,24 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType,
LPTSTR lpszName, LONG_PTR lParam)
{
const char *tempdir = (const char *)lParam;
+char dllname[MAX_PATH];
+HMODULE dll;
+
+/* Check if the main dll is present on this system */
+strcpy(dllname, lpszName);
+*strstr(dllname, _TEST.EXE) = 0;
+
+dll = LoadLibrary(dllname);
+if (!dll) {
+/* Here we add some information to the results file
+ * that indicates that the dll is not present
+ * on this platform.
+ */
+report (R_WARNING, dll : %s is not present, dllname);
+return TRUE;
+}
+FreeLibrary(dll);
+
get_subtests( tempdir, wine_tests[nr_of_files], lpszName );
nr_of_tests += wine_tests[nr_of_files].subtest_count;
nr_of_files++;
Running this on win9x gives me 13 dll's that are not available (the R_WARNING is
of course only for testing).
Cheers,
Paul.
Re: Direct3D Game test framework
Am Dienstag, 31. Juli 2007 12:28 schrieb martin pilka: With Francois' help I could build a test package for 3DMark2000 now: http://stud4.tuwien.ac.at/~e0526822/3dmark2000.tar.bz2 It runs two tests, one at 640x480, another one at 1024x768, writes the results to a file and reads the file back. No benchmark results are sent to the server yet(just ok / fail). Stefan, this link is not valid anymore, could you make the file available again? Oops, I deleted the file accidentally when cleaning up old junk on that server. I've reuploaded it.
Re: WineD3D: compile against standard GL headers [attempt2]
On 31/07/07, Roderick Colenbrander [EMAIL PROTECTED] wrote: Hi, This is the second version of this patch. As Henri suggested extensions are now defined to 1 and GL_EXT_LEGACY has been set too. That's better, but you're still missing the functions for GL_ARB_multisample and GL_EXT_vertex_weighting. Since GL_EXT_vertex_weighting can be removed completely that would effectively only be a single function, glSampleCoverageARB.
Re: user32: erase parent when hiding child
Dmitry Timoshkov [EMAIL PROTECTED] writes: Clinton Stimpson [EMAIL PROTECTED] wrote: ChangeLog: user32: erase parent when hiding child As I already pointed out erasing a parent is supposed to be done in the server. You need to look there why it doesn't happen and add a fix there. The invalidate and erase part has to happen in the server, and it does, so that part of the patch is redundant. The RDW_ERASENOW part however needs to be done in the client. -- Alexandre Julliard [EMAIL PROTECTED]
Re: [PATCH 3/5] winecfg: Make winecfg resources compilable by aWindows resource compiler
On 31.07.2007 05:37, Dmitry Timoshkov wrote: rc doesn't support embedded or escaped quotes at all. So statements like LTEXT String with quotes,-1,7,7,120,8 or LTEXT String with \quotes\,-1,7,7,120,8 don't work. The strings I'm using and that work for me look like: LTEXT String with quotes,-1,7,7,120,8 That would create an additional problem for translators IMO. Why? -f.r. signature.asc Description: OpenPGP digital signature
Re: wine3d3: Check the destination recangle when for FastBlt().
I have taken another look at it. I still think this specific problem should be fixed in wined3d. The problem occurs because BltFast (ddraw, d3d and d3d-gdi) all take two DWORDs as the offset write position, and then later casts them into a RECT structure which has signed values. This must for any caller be considered an error. No caller could get anything useful out of this. lock_dst.left = dstx; --- bad cast! lock_dst.top = dsty; --- bad cast! lock_dst.right = dstx + w; --- bad cast! lock_dst.bottom = dsty + h; --- bad cast! Why does this not trigger a warning? Not sure. Indeed this does not sound right. The unsigned to signed assignment doesn't look right. However, a problem should only occur if the highest bit of the DWORD is set, in which case this would be a very high value and would exeed the surface dimensions. Such a huge surface can't be created without exceeding the 2 GB userland VM size. Most likely the check in dlls/ddraw/surface.c, line 2067 runs into a signedness issue too.
Re: Direct3D Game test framework
Hello Stefan, link works, I was able to run your test. Installation is ok, however test itself ends with '3DMark Error': '3DMark needs DirectX 7 and proper drivers installed in order to run'. This happens without CxTest as well, with latest WineHq. Note that DirectX7 or newer is correctly detected during installation process. Is it a bug in my configuration, or did I hit some Wine error? Thanks, Martin Stefan Dösinger wrote: Am Dienstag, 31. Juli 2007 12:28 schrieb martin pilka: With Francois' help I could build a test package for 3DMark2000 now: http://stud4.tuwien.ac.at/~e0526822/3dmark2000.tar.bz2 It runs two tests, one at 640x480, another one at 1024x768, writes the results to a file and reads the file back. No benchmark results are sent to the server yet(just ok / fail). Stefan, this link is not valid anymore, could you make the file available again? Oops, I deleted the file accidentally when cleaning up old junk on that server. I've reuploaded it.
msvcr80 support!
--- Stefan Dösinger [EMAIL PROTECTED] wrote: Windows Live messenger still refuses to start. Do I have to do anything special(other than updating wine), or should I report a bug for this: /usr/src/wine/linux/wine msnmsgr.exe fixme:actctx:parse_depend_manifests Could not find dependent assembly LMicrosoft.Windows.Common-Controls err:module:import_dll Library MSVCR80.dll (which is needed by LC: \\Programme\\MSN Messenger\\msnmsgr.exe) not found err:module:import_dll Library MSVCR80.dll (which is needed by LC: \\Programme\\MSN Messenger\\MSNCore.dll) not found err:module:import_dll Library MSNCore.dll (which is needed by LC: \\Programme\\MSN Messenger\\msnmsgr.exe) not found err:module:import_dll Library MSVCR80.dll (which is needed by LC: \\Programme\\MSN Messenger\\ContactsUX.dll) not found err:module:import_dll Library MSVCR80.dll (which is needed by LC: \\Programme\\MSN Messenger\\MSNCore.dll) not found err:module:import_dll Library MSNCore.dll (which is needed by LC: \\Programme\\MSN Messenger\\ContactsUX.dll) not found err:module:import_dll Library ContactsUX.dll (which is needed by LC: \\Programme\\MSN Messenger\\msnmsgr.exe) not found err:module:LdrInitializeThunk Main exe initialization for LC:\\Programme\\MSN Messenger\\msnmsgr.exe failed, status c135 I ran it from its installation directory, not from C:\windows\winsxs\...\. When running it from msvcr80's directory it pops up a message box saying that the app tried to load the C runtime incorrectly. This used to work before. (Live messenger failed to connect later, for some other reasons) Did you find a fix for this? As per Alexandre's suggestion I tried installing native common controls, and also copying all the manifest files from a Windows machine (even the whole winsxs directory), but I still get the same error as you when I try to run my application. ___ Yahoo! Mail is the world's favourite email. Don't settle for less, sign up for your free account today http://uk.rd.yahoo.com/evt=44106/*http://uk.docs.yahoo.com/mail/winter07.html
Re: [PATCH 3/5] winecfg: Make winecfg resources compilable by aWindows resource compiler
Frank Richter [EMAIL PROTECTED] wrote: Why? Because if that character doesn't exist in their locale they would need to figure out first what that code was supposed to express, and find a suitable replacement next. I suppose a translator could look at the e.g. English original in the appropriate codepage(ie 1252) and easily recognize quote characters - if it can't be gathered from the context. Then finding a suitable replacement should be trivial - if you speak a language you likely know what kind of quotes are usually used there. That doesn't really match my understanding of not creating additional problems without a real necessity. Without a real gain as well IMO. -- Dmitry.
Re: Patch: VarWeekdayName
Hi Jiri,
I want to ask, is anything wrong with this patch?
Your indenting is haphazard. Please match the indenting in the rest
of the file, which in this case is no tabs, 2-space indenting. Also,
curly braces go on a new line, so e.g.:
+ if (!size) {
should be
+ if (!size)
+ {
instead.
--Juan
Re: [PATCH 3/5] winecfg: Make winecfg resources compilable by aWindows resource compiler
Dmitry Timoshkov [EMAIL PROTECTED] writes: Frank Richter [EMAIL PROTECTED] wrote: I suppose a translator could look at the e.g. English original in the appropriate codepage(ie 1252) and easily recognize quote characters - if it can't be gathered from the context. Then finding a suitable replacement should be trivial - if you speak a language you likely know what kind of quotes are usually used there. That doesn't really match my understanding of not creating additional problems without a real necessity. Without a real gain as well IMO. Like it or not different languages use different styles of quoting, and you can't force everybody to use single quotes just because a couple of places are escaping incorrectly. -- Alexandre Julliard [EMAIL PROTECTED]
Re: Direct3D Game test framework
Am Dienstag, 31. Juli 2007 16:42 schrieb martin pilka: Hello Stefan, link works, I was able to run your test. Installation is ok, however test itself ends with '3DMark Error': '3DMark needs DirectX 7 and proper drivers installed in order to run'. This happens without CxTest as well, with latest WineHq. Note that DirectX7 or newer is correctly detected during installation process. Is it a bug in my configuration, or did I hit some Wine error? Are you running on VNC? Do you have opengl support? This error occurs when I run on a system without opengl support.
Re: WineD3D: compile against standard GL headers [attempt3]
On 31/07/07, Roderick Colenbrander [EMAIL PROTECTED] wrote: Hi, In this version I have also added the prototype for the ARB multisample extension. Did you attach the wrong patch?
Re: [PATCH 3/5] winecfg: Make winecfg resources compilable byaWindows resource compiler
Alexandre Julliard [EMAIL PROTECTED] wrote: Like it or not different languages use different styles of quoting, and you can't force everybody to use single quotes just because a couple of places are escaping incorrectly. Not a couple of places! It got spreaded by copy/pasting over almost all of .rc files. For what gain? Just because somebody likes fancy things? -- Dmitry.
Re: update of msvcrt.spec
Luis C. Busquets Pérez [EMAIL PROTECTED] wrote: This patch updates the msvcrt.spec and adds the version number of the product. Note that with the same file version number there are various product version number files. msvcrt in Windows doesn't export APIs you have added by ordinal. Also there is no need to shuffle existing entries around. -- Dmitry.
Re: dpnlobby.dll implementation
Luis C. Busquets Pérez schreef: File that just forwards one function included for compatibility issues Hi, I think you're missing a few files here, are you sure you've added the files from dlls/dpnlobby? Cheers, Maarten
Re: [PATCH 3/5] winecfg: Make winecfg resources compilable byaWindows resource compiler
Dmitry Timoshkov [EMAIL PROTECTED] writes: Not a couple of places! It got spreaded by copy/pasting over almost all of .rc files. For what gain? Just because somebody likes fancy things? There's no reason not to use standard quotes just because wrc doesn't detect the wrong escaping. Fix wrc. -- Alexandre Julliard [EMAIL PROTECTED]
Re: [PATCH 3/5] winecfg: Make winecfg resources compilable byaWindows resource compiler
On 31.07.2007 17:44, Dmitry Timoshkov wrote: Alexandre Julliard [EMAIL PROTECTED] wrote: Like it or not different languages use different styles of quoting, and you can't force everybody to use single quotes just because a couple of places are escaping incorrectly. Not a couple of places! It got spreaded by copy/pasting over almost all of .rc files. For what gain? Just because somebody likes fancy things? FWIW, use of fancy quotes is sometimes featured in official rules for languages. In German, for example, but likely others, too. Also, while and ' have obviously a special meaning for the resource compiler and need to be escaped, I doubt ‘’‚‛“”„「」『』 have, so using them in strings - as far as the codepage allows - shouldn't cause any problems. -f.r. signature.asc Description: OpenPGP digital signature
Interesting bit on schedulers and Wine
Sorry for the spam. There's been a flame^H^H^H^H^Hthread over on lkml about CFS and SD schedulers, and Ingo's tested Quake3 on Wine using both: http://kerneltrap.org/node/14023 Someone else tested UT2004 with both as well, and there are pretty pictures: http://people.redhat.com/mingo/misc/cfs-vs-sd-wine-quake.jpg http://people.redhat.com/mingo/misc/cfs-sd-ut2004-perf.jpg Happy hacking, --Juan
Re: [Wine] About new environment variable
On Di, 2007-07-31 at 11:24 +0800, Zhongli Xu wrote: After I add an environment avriable in the system.reg file, e.g. The Files are Private to wine and a running wine overwrite your Changes. When you want to change the registry use wine regedit.exe and use the GUI, or create a *.reg file and use: wine regedit.exe yourfile.reg -- By by ... Detlef
Outstanding regression in unicode since 0.9.41
Regressions are easiest to fix when caught quickly. Here's one that didn't get fixed in the latest version: http://bugs.winehq.org/show_bug.cgi?id=8948 If anyone needs help reproducing it, you can ask me for help. It should be as simple as the (scrolled down) part of the bug report though - install both installers, then launch the lobby with your desktop link. Thanks, Scott Ritchie
Re: dinput - Allow the use of the standard Joystick GUID when calling CreateDevice
On Tue, 2007-07-31 at 06:34 -0600, Vitaliy Margolen wrote:
Peter Dons Tychsen wrote:
On Mon, 2007-07-30 at 21:20 +0200, Peter Dons Tychsen wrote:
On Sun, 2007-07-29 at 17:43 -0600, Vitaliy Margolen wrote:
Peter Dons Tychsen wrote:
OK. Please review this diff:
I will re-submit it if you like it.
/Pedro
Alright looks good now (you might want to remove the extra white space
your
patch adds - git complains about those). Just left to make the same
change
to the other joystick interface :)
BTW don't forget to cc: the wine-devel list when you replying.
Vitaliy.
OK. I still feel that trying to sync joystick_linuxinput.c and
joystick_linux.c is out of scope for this patch. But as my steadiness
has limits i have done some of it anyway... :). I have kept the changes
modest.
Please take a look at the new patch.
On another note i will agree with you that it would be practical if the
two files had similar (or maybe even shared) code. Redundant code is
never very practical as it always ends up as this very example. The two
implementations which were supposed to identical always drift apart. If
things are supposed to do the same, keep them together to begin with.
Thanks,
Maybe i would be more successful if i actually attached the
patch :-)
Here it is
Just few small things left:
-#undef MAX_JOYSTICKS
As I mentioned earlier you should move this instead of removing it completely.
static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID
rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev)
{
- int i;
-
- find_joydevs();
You removed a really important function call here.
+static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID
rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev)
+{
+ unsigned short index;
+
+ if ((index = get_joystick_index(rguid)) MAX_JOYDEV) {
+if ((riid == NULL) ||
If you reformat the whole function, please make it 4-space indented.
Vitaliy.
OK. Here is the new patch:
/pedro
0001-Allow-the-use-of-the-standard-Joystick-GUID-when-cal.patch
Description: application/mbox
Re: dlls/comctl32: According to the PSDK, DrawShadowText() takes a non-const RECT pointer.
Yes. It seems that the corresponding MSDN web page is out of step. -- Andy.
Re: msvcr80 support!
Hi Evan. For the case, that you are still searching apps, that need gdiplus.dll: On Mo, 2007-07-30 at 18:52 +0200, Kovács András wrote: Hi, Msn live messenger can be started by commenting out @ stdcall FindActCtxSectionStringA(long ptr long str ptr) @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) lines from kernel32.spec file. By the way it needs native gdiplus.dll, otherwise you won't get it's window. -- By by ... Detlef
Re: user32: Add a stub for GetAppCompatFlags2
On Di, 2007-07-31 at 11:03 +0200, Michael Stefaniuc wrote: Hello Detlef, +/*** + * GetAppCompatFlags (USER32.@) The comment doesn't match the function name. Upps. Thanks for the catch. Alexandre fixed this CopyPaste typo already during the commit. -- By by ... Detlef
32bit winelib builds in x86_64
What's the command for building a 32bit winelib .dll.so and .exe.so with wineg++ in an x86_64 environment? I am used to doing dlls with: $ wineg++ -shared DLL.spec -o DLL.dll.so ... and exes with: $ wineg++ -o APP.exe.so ... Seems I need to use -m32 for g++, --32 for as, and -m elf_i386 for ld. But with all the nested calls of wineg++ and winebuild I can't figure out how to get those options passed in everywhere they are needed. Any hints? Cheers... Michael Ost
Re: dinput - Allow the use of the standard Joystick GUID when calling CreateDevice
Peter Dons Tychsen wrote:
On Tue, 2007-07-31 at 06:34 -0600, Vitaliy Margolen wrote:
Peter Dons Tychsen wrote:
On Mon, 2007-07-30 at 21:20 +0200, Peter Dons Tychsen wrote:
On Sun, 2007-07-29 at 17:43 -0600, Vitaliy Margolen wrote:
Peter Dons Tychsen wrote:
OK. Please review this diff:
I will re-submit it if you like it.
/Pedro
Alright looks good now (you might want to remove the extra white space your
patch adds - git complains about those). Just left to make the same change
to the other joystick interface :)
BTW don't forget to cc: the wine-devel list when you replying.
Vitaliy.
OK. I still feel that trying to sync joystick_linuxinput.c and
joystick_linux.c is out of scope for this patch. But as my steadiness
has limits i have done some of it anyway... :). I have kept the changes
modest.
Please take a look at the new patch.
On another note i will agree with you that it would be practical if the
two files had similar (or maybe even shared) code. Redundant code is
never very practical as it always ends up as this very example. The two
implementations which were supposed to identical always drift apart. If
things are supposed to do the same, keep them together to begin with.
Thanks,
Maybe i would be more successful if i actually attached the
patch :-)
Here it is
Just few small things left:
-#undef MAX_JOYSTICKS
As I mentioned earlier you should move this instead of removing it completely.
static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid,
REFIID riid, LPDIRECTINPUTDEVICEW* pdev)
{
- int i;
-
- find_joydevs();
You removed a really important function call here.
+static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid,
REFIID riid, LPDIRECTINPUTDEVICEA* pdev)
+{
+ unsigned short index;
+
+ if ((index = get_joystick_index(rguid)) MAX_JOYDEV) {
+if ((riid == NULL) ||
If you reformat the whole function, please make it 4-space indented.
Vitaliy.
OK. Here is the new patch:
Looks good to me. The problem is, it doesn't work for me (USB joystick). I
think you forgot to look at how joystick_linuxinput.c handles that data3
field. It's not just 0 based index...
Vitaliy.
Re: [4/4] winex11.drv: draw custom dashes [try2]
On 7/30/07, Evan Stade [EMAIL PROTECTED] wrote: Hi, [try2] * matched braces style of rest of file * spread code out to make it more readable * simplified use of gdi_to_x11_dashes dlls/winex11.drv/graphics.c |3 + dlls/winex11.drv/pen.c | 123 +-- dlls/winex11.drv/x11drv.h |1 3 files changed, 120 insertions(+), 7 deletions(-) -- Evan Stade I am not sure how to make this patch more amenable. The gdi_to_x11_dashes function is indeed a bit unwieldy but it doesn't have all that simple a task. Does anyone have some suggestions on how to make it more acceptable? -- Evan Stade
Re: Implement LockWorkstation using xdg-screensaver from explorer
On 7/27/07, Alexandre Julliard [EMAIL PROTECTED] wrote:
Some sort of SendMessage to the desktop window should do the trick.
Please ignore my other email to you. So something like this? Thanks
for Vitaman on IRC for pointing out that spawnvp killed the calling
process.
--
Steven Edwards
There is one thing stronger than all the armies in the world, and
that is an idea whose time has come. - Victor Hugo
From 260c446b56c7e26775df670fef6004870d1f36a5 Mon Sep 17 00:00:00 2001
From: Steven Edwards [EMAIL PROTECTED]
Date: Wed, 1 Aug 2007 02:06:27 -0400
Subject: [PATCH] Implement LockWorkStation using xdg-screensaver
---
dlls/user32/user32.spec |2 +-
dlls/user32/user_main.c | 14 ++
programs/explorer/desktop.c | 31 +++
3 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 8bf9ad1..452e380 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -475,7 +475,7 @@ # @ stub LoadKeyboardLayoutEx
@ stdcall LockSetForegroundWindow (long)
@ stub LockWindowStation
@ stdcall LockWindowUpdate(long)
-@ stub LockWorkStation
+@ stdcall LockWorkStation()
@ stdcall LookupIconIdFromDirectory(ptr long)
@ stdcall LookupIconIdFromDirectoryEx(ptr long long long long)
@ stub MBToWCSEx
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index e572220..09255f9 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -318,3 +318,17 @@ BOOL WINAPI ExitWindowsEx( UINT flags, D
CloseHandle( pi.hThread );
return TRUE;
}
+
+/***
+ * LockWorkStation (USER32.@)
+ */
+BOOL WINAPI LockWorkStation( void )
+{
+HWND hwnd;
+int retval;
+
+hwnd = GetDesktopWindow();
+retval = SendMessageW( hwnd, 0xC000, 0, 0 );
+
+return retval;
+}
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 7f2e23f..cef1bff 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -18,7 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include config.h
+#include wine/port.h
+
+#include ctype.h
#include stdio.h
+#include string.h
+#ifdef HAVE_UNISTD_H
+#include unistd.h
+#endif
#define OEMRESOURCE
@@ -35,6 +43,26 @@ extern HANDLE __wine_make_process_system
static BOOL using_root;
+int lock_desktop( void )
+{
+/* FIXME: do something here about running in desktop mode */
+int retcode;
+const char *argv[3];
+
+argv[0] = xdg-screensaver;
+argv[1] = lock;
+argv[2] = NULL;
+
+retcode=spawnvp( _P_WAIT, xdg-screensaver, argv );
+
+if (retcode!=0)
+{
+WINE_ERR(%s returned %d\n,(const char*)argv,retcode);
+return retcode;
+}
+return TRUE;
+}
+
/* window procedure for the desktop window */
static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp,
LPARAM lp )
{
@@ -69,6 +97,9 @@ static LRESULT WINAPI desktop_wnd_proc(
}
return 0;
+case 0xC000:
+return lock_desktop();
+
default:
return DefWindowProcW( hwnd, message, wp, lp );
}
--
1.4.1
