- Wine-Devel - list.winehq.org

Re: When possible, use tgkill instead of tkill syscall on Linux.
by Robert Shearman Feb. 13, 2006

Feb. 13, 2006

Eric Pouech wrote: >diff --git a/server/context_x86_64.c b/server/context_x86_64.c >index c102510..e5d8fc2 100644 >--- a/server/context_x86_64.c >+++ b/server/context_x86_64.c >@@ -271,12 +271,12 @@ int get_thread_single_step( struct threa > } > > /* send a signal to a specific thread */ >-int tkill( int pid, int sig ) >+int tkill( int tgid, int pid, int sig ) > { > #ifdef __linux__ > int ret; > __asm__( "syscall" : "=a" (ret) >- : "0" (200) /*SYS_tkill*/, "D" (pid), "S" (sig) ); >+ : "0" (200) /*SYS_tkill*/, "D" (tid), "S" (sig) ); > > Shouldn't this line change "pid" to "tgid" instead of "tid"? -- Rob Shearman

1 0

[winecfg] Localize app specific title
by Paul Vriens Feb. 13, 2006

Feb. 13, 2006

Hi, the title shown in winecfg is always in English when configuring stuff for an specific application. Any remarks on the patch? Would this work for every language? (I mean will the name of the app always be after the IDS_WINECFG_TITLE_APP) Cheers, Paul. diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 22bdeb0..6d5594d 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -199,6 +199,7 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "About" IDS_WINECFG_TITLE "Wine configuration" + IDS_WINECFG_TITLE_APP "Wine configuration for" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 4fac41f..85bf11c 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -39,6 +39,7 @@ #define IDS_WINECFG_TITLE 13 #define IDS_THEMEFILE 14 #define IDS_THEMEFILE_SELECT 15 +#define IDS_WINECFG_TITLE_APP 16 /* App specific title */ #define IDD_MAINDLG 101 #define IDB_WINE 104 #define IDD_ABOUTCFG 107 diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index df2b05f..f87ccf0 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -53,23 +53,22 @@ HMENU hPopupMenus = 0; */ void set_window_title(HWND dialog) { - char *newtitle; + char newtitle[1024]; /* update the window title */ if (current_app) { - const char *template = "Wine Configuration for %s"; - newtitle = HeapAlloc(GetProcessHeap(), 0, strlen(template) + strlen(current_app) + 1); - sprintf(newtitle, template, current_app); + char prefix[1024]; + LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE_APP, prefix, 1024); + sprintf(newtitle, "%s %s", prefix, current_app); } else { - newtitle = strdupA("Wine Configuration"); + LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE, newtitle, 1024); } WINE_TRACE("setting title to %s\n", newtitle); SendMessage(GetParent(dialog), PSM_SETTITLE, 0, (LPARAM) newtitle); - HeapFree(GetProcessHeap(), 0, newtitle); }

2 1

todo_wine help
by Phil Lodwick Feb. 13, 2006

Feb. 13, 2006

I have a test in msvcrt/file.c that requires there be no TMP environment variable. I thought I would just do a _putenv("TMP="), but this seems to interfere with todo_wine. Basically, static void test_todo( void ) { todo_wine { ok((1 == 1), "This shows up correctly\n"); } _putenv("TMP="); todo_wine { ok((1 == 1), "This does not show\n"); } } My quick search has not turned up anything obvious. Can somebody help me understand what is going on here? Assuming TMP is actually required by somebody else, how do I correctly do my test and check with no TMP environment variable? Thanks, Phil

1 0

Re: Startup time of OOo2, Firefox 1.5. Some surprises.
by Dan Kegel Feb. 13, 2006

Feb. 13, 2006

On 2/13/06, Dan Kegel <dank(a)kegel.com> wrote: > It's 4 or 6 seconds for me, too, if I run with 96 MB ram. gaah, I meant "it's fast for me too if I use 400MB of ram". -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: [TWAIN] Reconcile sane's long names to TWAIN's 32 byte limit
by Robert Shearman Feb. 13, 2006

Feb. 13, 2006

Jeremy White wrote: >libsane can return arbitrarily long names, but TWAIN supports only a maximum of 32. >Further, the name is a unique identifier, and so must be returned to libsane for processing. > >This algorithm tries to convert a long libsane name into a more reasonable short name, >but adds a crude signature process in an attempt to ensure a unique short identifier. > > > >------------------------------------------------------------------------ > > > dlls/twain/dsm_ctrl.c | 85 ++++++++++++++++++++++++++++++++++++++++++------- > 1 files changed, 73 insertions(+), 12 deletions(-) > >eabadf1c3584adda1a36b199f82bc6bbb17b71da >diff --git a/dlls/twain/dsm_ctrl.c b/dlls/twain/dsm_ctrl.c >index f744939..6d1318d 100644 >--- a/dlls/twain/dsm_ctrl.c >+++ b/dlls/twain/dsm_ctrl.c >@@ -22,6 +22,7 @@ > > #include <stdlib.h> > #include <stdarg.h> >+#include <stdio.h> > > #define NONAMELESSUNION > #define NONAMELESSSTRUCT >@@ -33,6 +34,14 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(twain); > >+inline static LPSTR TWAIN_strdup( LPCSTR str ) >+{ >+ LPSTR ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); >+ if (ret) strcpy( ret, str ); >+ return ret; >+} >+ >+ > /* DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS */ > TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) > { >@@ -83,6 +92,38 @@ TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pO > #endif > } > >+/* Sane returns device names that are longer than the 32 bytes allowed >+ by TWAIN. However, it colon separates them, and the last bit is >+ the most interesting. So we use the last bit, and add a signature >+ to ensure uniqueness */ >+static char * get_sane_short_name(const char *in) >+{ >+ char *p; >+ LPSTR ret; >+ int signature = 0; >+ >+ if (strlen(in) <= 32) >+ return TWAIN_strdup((char *) in); >+ >+ for (p = (char *) in; *p; p++) >+ signature += *p; > > These casts from const char * to char * shouldn't be necessary. -- Rob Shearman

1 1

Direct3D Z order question
by Stefan Dösinger Feb. 13, 2006

Feb. 13, 2006

Hello, I have written a small Direct3D7 test application which draws two overlapping triangles, a red one and a blue one. The red triangle has the z value 0.0 (closest to the viewer), the blue one 1.0(far away). Strangely, the blue triangle overlaps the red one on Windows. The same happens on the current ddraw implementation, but in WineD3D the red triangle overlaps the blue one, which is mathematically correct. I've studied the ddraw and wined3d drawing code over and over, but I couldn't find any difference. It seems that on Windows, the triangle that is drawn last overlaps the other one in the output, and the z value seems to be ignored completely. Can someone explain me what's going on here???? The reason for this is the Direct3D mode of Half-Life 1. I've got it working with WineD3D after a long struggle with IDirect3DVertexBuffer::ProcessVertices, except of the HUD, which is hidden. If I force the z value in the [0.0, 1.0] range, it is shown, but the rest is broken obviously. How to run my test program: I've attached a source file and a Makefile which builds a .exe with mingw, and a precompiled exe file. When you run it, it shows a black screen, and if you click anywhere, it draws the triangles. I've some bug in the flipping code, so you have to click two times actually. Pressing esc exits. Thanks, Stefan PS: If anyone needs the d3d7->wined3d code to look at, I can send patches. But it's quite messy now ;)

3 10

Re: GDI: Don't crash when copying to an EMF from a NULL bitmap.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Mike McCormack <mike(a)codeweavers.com> writes: > @@ -84,9 +84,14 @@ static BOOL EMFDRV_BitBlockTransfer( > BITMAP BM; > WORD nBPP; > LPBITMAPINFOHEADER lpBmiH; > - EMFDRV_PDEVICE* physDevSrc = (EMFDRV_PDEVICE*)devSrc; > - HBITMAP hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); > + EMFDRV_PDEVICE* physDevSrc; > + HBITMAP hBitmap; > > + physDevSrc = (EMFDRV_PDEVICE*)devSrc; > + if (!devSrc) > + return TRUE; You still need to generate the EMF record, you can't just ignore it and return TRUE. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: usp10: [RESEND] Add ScriptItemize, ScriptShape and ScriptPlace functionality
by Robert Shearman Feb. 13, 2006

Feb. 13, 2006

lats wrote: >Index: dlls/usp10/usp10.c >=================================================================== >RCS file: /home/wine/wine/dlls/usp10/usp10.c,v >retrieving revision 1.7 >diff -u -r1.7 usp10.c >--- dlls/usp10/usp10.c 9 Jan 2006 19:55:03 -0000 1.7 >+++ dlls/usp10/usp10.c 12 Feb 2006 05:25:09 -0000 >@@ -39,6 +39,42 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); > >+#define MAX_SCRIPTS 8 >+ >+/* Set up a default for ScriptGetProperties */ >+const SCRIPT_PROPERTIES Default_Script_0 = {0, 0, 0, 0, 0, 0, 0, 0, >+ 0, 0, 0, 0, 0, 0, 0}; > > This can be "static const" instead of just "const". >@@ -69,9 +108,13 @@ > */ > HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts) > { >- FIXME("%p,%p\n",ppSp,piNumScripts); >+ FIXME("%p,%p,%p\n",ppSp, *ppSp, piNumScripts); > >- if (piNumScripts) *piNumScripts = 0; >+/* Set up a sensible default and intialise pointers */ >+ *piNumScripts = MAX_SCRIPTS; >+ *ppSp = (SCRIPT_PROPERTIES *)Global_Script; >+ TRACE("ppSp:%p, *ppSp:%p, **ppSp:%p, %d\n", ppSp, *ppSp, **ppSp, >+ *piNumScripts); > return 0; > } > > > The identation of the comment is unusual. >@@ -129,7 +172,60 @@ > if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) > return E_INVALIDARG; > >- *pcItems = 0; >+/* Set a sensible default */ >+/* Set SCRIPT_ITEM */ >+ pItems[0].iCharPos = 0; >+/* Set the SCRIPT_ANALYSIS */ >+// pItems[0].a.eScript = SCRIPT_UNDEFINED; >+ pItems[0].a.eScript = 2; > > Which is it, SCRIPT_UNDEFINED or 2? Decide this and remove the dead code. -- Rob Shearman

2 1

Czech language resources encoding fix
by Petr Tesarik Feb. 13, 2006

Feb. 13, 2006

Hi everyone, On 8 Feb I sent a patch to fix the encoding of Czech resources in Wine (see wine-patches), but nothing seems to have happened. Is something wrong with the patch? Of course, I double-checked the "Sending patches" page: # Include a ChangeLog entry with your name, email address and a description of what your patch does. There is a ChangeLog entry and a (IMO concise) description of what the patch does. # Keep the patch small and the point of the change clear. # Submit one fix or group of related changes per patch. Well, OK, I could possibly break the patch into numerous smaller ones, each fixing only one of the resource files. Is that what you expect? # Generate your patch against the latest version of Wine from the WineHQ CVS (see below). It applies cleanly against latest CVS. # Test your patch, and if possible write a test case demonstrating it is correct. Umgh. Does changing a resource string need writing a test case? # Be careful to not corrupt the patch through line-wrapping. Not the case. # Avoid unnecessarily changing the formatting of the code. No. # Use standard C, avoid C++ comments and inline variable declarations. They'r resource files. No C/C++ comments at all. # Read the diff and make sure it contains only what you want in it. Done. Thanks for any clue, Petr Tesarik

2 2

Wine console windows vs. [x]terminal
by Segin Feb. 13, 2006

Feb. 13, 2006

Hi, I notice that Wine opens a Windows-like console window for console apps if they are started using the 'winedbg' loader. Is it possible to get all console apps to run like this without using winedbg? There is a Windows console program using pdcurses that I am trying to check for compatability, and having to startup winedbg to get the program to function is a bit much. It should also be noted that I do not read the wine-users mailing list at this time, but I do read wine-devel.

3 2