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

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

What happened to the Fedora packages?
by Neal Gompa Aug. 2, 2014

Aug. 2, 2014

What happened to the Fedora packages? They have not been updated since 0.9.2!!!! Right now it is at 0.9.10!!! Nearly every other Linux distro supported has the up to date packages!!! And why does the Red Hat packages site not go to the SourceForge site as it does for SUSE packages and the others?? I have not really had the guts to ask until now, because I thought that maybe there was a slump, but now, its getting annoying!! And Fedora just released Fedora Core 5 yesterday!!! Please tell me new packages will be ready soon!!! Compiling WINE always crashes my computer, so I prefer to use the RPMs...

10 18

winspool: ERROR_INVALID_NAME in GetDefaultPrinter() ?
by Detlef Riekenberg Oct. 9, 2013

Oct. 9, 2013

Hi. >From which configuration does the "ERROR_INVALID_NAME" came from, when calling GetDefaultPrinter(NULL, &size) and no Printer is installed? This Test is Present in the current "dlls/winspool/tests/info.c". MSDN told us, that we receive an "ERROR_FILE_NOT_FOUND", if no Printer is installed: http://msdn.microsoft.com/library/en-us/gdi/prntspol_0hma.asp I get the "ERROR_FILE_NOT_FOUND" on win98se, winme, w2k and win2003 in this Situation. -- By By ... ... Detlef

3 3

Wine runs IE7!
by Hans Leidekker Nov. 26, 2010

Nov. 26, 2010

Well, sort of. I found bugs in shell32, rpcrt4, comctl32 and wininet that I had to implement, stub and override my way past before it would render a page, but finally, here's the obligatory screenshot. -Hans

3 2

meaning of "Hardware" field in bugzilla?
by Dan Kegel Dec. 13, 2009

Dec. 13, 2009

Does "mac" mean "powerpc mac only"? I rather thought it meant "apple macintosh", regardless of cpu. I ask because Austin has just gone through and changed lots of "mac" bugs to "pc" even though the bugs were on Intel macs, which just seems wrong.

8 8

search path redux - if office 2007 always uses a private riched20, why does wine interpose its own global one?
by Dan Kegel Oct. 18, 2009

Oct. 18, 2009

See http://bugs.winehq.org/show_bug.cgi?id=14980 Essentially, to run Office 2007, you have to set an override for riched20. Since Office installs a new, spiffier version of riched20 in its own private directory, and expects to find it there, isn't it a bug that we don't let it have it? Sounds like it's time to write a conformance test... sure would be nice if that override wasn't needed.

9 26

re: Wine t-shirts?
by Dan Kegel Sept. 3, 2009

Sept. 3, 2009

Maarten wrote: > Why don't we have wine t-shirts any more? I dunno, where were they before? I just looked, couldn't find any on cafepress.com. I'd like to bring back the Codeweavers drunken penguin t-shirts, perhaps with a slightly more generic Wine design. Coincidentally, I found some site on the net had taken the logo from that shirt and erased the Crossover logo from the wine bottle; here's a cleaned-up copy: http://kegel.com/wine/wine-penguin-corkscrew.png

15 34

winequartz.drv Mac OS X UI discontinued?
by Adam Strzelecki July 11, 2009

July 11, 2009

Hi, I know that CodeWeavers supports quite nicely Mac builds of Wine, and CrossOver for Mac, yet all of them are X11. There was also once Darwine - an effort to provide Carbon Wine UI driver and Mac optimizations & L&F. Pretty many of those were merged back to Wine, but not winequartz.drv. Do you guys think about reviving winequartz.drv? This would greatly improve Wine on Mac as we could have native Mac fonts handling that's faster than FreeType, Dock icons for Wine applications, and few others. There's still old copy of the it hanging around, but it is abandoned, and no longer compiles with Wine. Or I think it would be cool to write new winecocoa.drv or sthing like that, as Apple officially states that Carbon is deprecated. While it is not well documented, it is pretty easy with Cocoa to make console non-bundled process to be UI foreground process and handle events and Dock: (This code is copyrighted by myself ;P) > int main(int argc, const char * argv[]) { > ProcessSerialNumber psn = {0, kCurrentProcess}; > OSStatus returnCode = TransformProcessType(&psn, > kProcessTransformToForegroundApplication); > SetFrontProcess(&psn); > > NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; > [NSApplication sharedApplication]; > > NSImage *icon = [NSImage imageNamed:@"NSApplicationIcon"]; > [NSApp setApplicationIconImage:icon]; > > [NSApp finishLaunching]; > > NSWindow *window = [[NSWindow alloc] > initWithContentRect:NSMakeRect(0, 0, 100, 100) > styleMask:NSTitledWindowMask| > NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask > backing:NSBackingStoreBuffered defer:NO]; > [window center]; > [window setTitle:@"Test"]; > > NSButton *button = [[NSButton alloc] > initWithFrame:NSMakeRect(10, 10, 80, 80)]; > [button setTitle:@"What?"]; > [button setBezelStyle:1]; > [[window contentView] addSubview:button]; > [button release]; > > [window makeKeyAndOrderFront:NSApp]; > > while(1) { > NSEvent *event = [NSApp > nextEventMatchingMask:NSAnyEventMask > untilDate > :[NSDate distantFuture] > inMode:NSDefaultRunLoopMode > dequeue:YES > ]; > if(event) [NSApp sendEvent:event]; > } > [pool release]; > return 0; > } BTW. I heard that someone previously working for Wine project is now in Apple, it is true? Regards, -- Adam Strzelecki |: nanoant.com :|

20 55

Wine translation statistics sources
by Mikołaj Zalewski June 22, 2009

June 22, 2009

Hi, I didn't update the translation statistics (http://www.mikolaj.zalewski.pl/wine-transl/) very regularly lately - my server is a bit broken and I can't run the scripts from cron but have remember to do it manually from a different computer. I have plans to fix it, but in the mean time, as some people may want fresh data, I have finished the changes I've been working on and uploaded the sources. It should be very easy to run them on ones machine and check the tree one has on disk - there is a README with explanations. The archive is available at http://www.mikolaj.zalewski.pl/dl/wine-transl.tgz . It is the latest version that adds support for dumping/diffing dialogs. Mikolaj Zalewski

8 17

Wine on Windows - wiki notes
by David Gerard March 12, 2009

March 12, 2009

Wine on Windows is an idea of real-world usefulness, as newer versions of Microsoft Windows increasingly fail to support apps Wine still supports. I've started a wiki page: http://wiki.winehq.org/WineOnWindows This covers my experiments with the three main POSIX layers (Cygwin, MinGW and Interix) on XPsp3. Various people have told me they've got it to work before (native compilation and install on Windows), but I seem to be the one gathering data :-) If anyone who's done it could please (a) put there what they did with what versions of Wine and tools (b) check with current Wine, that would be most appreciated. - d.

4 7

re: makedep: let umask decide mode for Makefiles
by Dan Kegel March 5, 2009

March 5, 2009

Paul Bryan Roberts write: > The code as it stands creates makefiles with a mode of 600. This may be > benign on most (e.g. personal workstation) installations but not all. > >An example is where the wine git repository is located on an NFS >volume. Here security settings may mean that root:root is treated as >nobody:nogroup. Installation from the repository is not possible as >root (whether via su or sudo) cannot even read the makefiles Where I work, NFS is set up so root cannot access any NFS volumes, period, because you really can't trust remote systems that much with NFS.

2 1

Re: D3D: Implement vertex blending in drawStridedSlow
by David Adam March 4, 2009

March 4, 2009

2009/1/25 Claudio Ciccani <klan(a)users.sf.net> > > The patch implements a software fallback for vertex blending in > drawStridedSlow, fixing Bug #6955. > Although vertex blending is an old and outdated extension, there are > still many applications(games) relying on it nowadays. This because the > extension is generally supported by Direct3D, either directly in > hardware (using vertex programs) or in software. > This patch makes NOLF2 demo crashes. > > > Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:7e6095c7 ESP:0033f0b4 EBP:0033f1ec EFLAGS:00010246( - 00 -RIZP1) EAX:00ec1b28 EBX:7e6bbc54 ECX:0000014c EDX:00000000 ESI:00000048 EDI:00000000 Stack dump: 0x0033f0b4: 00000000 00000000 00000000 3f800000 0x0033f0c4: 0033f110 7d05e000 7c03d008 7c7aa346 0x0033f0d4: 00000000 00000003 7e6bc7a0 7e69ee95 0x0033f0e4: 7e69e648 00000001 0000000c 00000010 0x0033f0f4: 795a5f68 7d09c0ac 0002d008 00ebd44c 0x0033f104: 00eba698 00ebd7a8 00000000 00000007 Backtrace: =>0 0x7e6095c7 drawStridedSlow+0x697(iface=0xeba698, sd=0xebd44c, NumVertexes=72, glPrimType=4, idxData=0x31dca00, idxSize=2, minIndex=0, startIdx=0) [/home/david/wine/dlls/wined3d/drawprim.c:307] in wined3d (0x0033f1ec) 1 0x7e60ea1b drawPrimitive+0x101b(iface=0xeba698, PrimitiveType=4, NumPrimitives=24, numberOfVertices=24, StartIdx=0, idxSize=<is not available>, idxData=(nil), minIndex=0) [/home/david/wine/dlls/wined3d/drawprim.c:1024] in wined3d (0x0033f55c) 2 0x7e5e41f9 IWineD3DDeviceImpl_DrawIndexedPrimitive+0xe9(iface=0xeba698, PrimitiveType=WINED3DPT_TRIANGLELIST, minIndex=0, NumVertices=24, startIndex=0, primCount=24) [/home/david/wine/dlls/wined3d/device.c:5314] in wined3d (0x0033f5cc) 3 0x7e6d43b6 IDirect3DDevice8Impl_DrawIndexedPrimitive+0x96(iface=<register ESI not in topmost frame>, PrimitiveType=D3DPT_TRIANGLELIST, MinVertexIndex=0, NumVertices=24, startIndex=0, primCount=24) [/home/david/wine/dlls/d3d8/device.c:1419] in d3d8 (0x0033f5fc) 0x7e6095c7 drawStridedSlow+0x697 [/home/david/wine/dlls/wined3d/drawprim.c:307] in wined3d: flds 0x0(%ecx) 307 m = &stateBlock->transforms[WINED3DTS_WORLDMATRIX((indices ? indices[0] : 0))].u.m[0][0]; Modules:

3 4

Testing DIB Engine - Better blitting and partial ROP3 support
by Massimo Del Fedele March 2, 2009

March 2, 2009

Hi, I made some changes to DIB engine : 1) Some more consistent DIB type naming and color handling 2) Partial implementation of 256 ROP3 operations 3) Partial ROP3 implementation on blitting (stil no pattern) 4) Some optimizations in blitting code I attach here the zipped patches. Ciao Max

2 2

re: wine shirts
by Dan Kegel March 2, 2009

March 2, 2009

That's a nice, simple design, but something's missing. Oddly, the original drunken penguin shirts, or ripoffs thereof, seem to still be available at http://www.ixsoft.de/software/products/CWTSHIRTDP-L.html Original artwork is at ftp://wine.codeweavers.com/pub/wine/logos/ I would kind of like a shirt that had the penguin opening the bottle on the front (text: Support the Wine Project), and the drunken penguin on the back (text: I did my part, or something like that) but I'd have to think a bit more on the text. Other old links: Martin's design: http://cross-lfs.org/~mlankhorst/t-shirt.png Ismael Barros put some effort into this before: http://www.winehq.org/pipermail/wine-devel/2008-December/070894.html but nobody could think up good text. - Dan

2 1

storing the registry key class name to make PDFXChange-Viewer happy
by Patrick Pfeifer March 2, 2009

March 2, 2009

Dear Developpers of Wine I like wine and I like Tracker Software's PDFXChange-Viewer as well. http://www.docu-track.com/home/prod_user/PDF-XChange_Tools/pdfx_viewer So, today I was not getting any rest until i found out why these two won't work together nicely. I mean they DO, actually. But I'm kind of touchy. I was wondering all the time, why most of the settings I changed were not restored as I exited and restarted the app. I then discovered that if wineserver was preserved ("-p" option) beween restarts they WERE restored. Further investigations unveiled that the problem is triggered by the fact that wineserver is not storing the registry key class name attributes. Something M$ must have come up with in XP but that is not very wideley used. PDFXChange-Viewer however seems to rely on it when parsing it's preferences from the registry on startup. Wineservers unicode string handling gave me a though time in implementing a solution to this but i finally managed. You can see that I went quiet straightforward: adding the class name next to the key name in the {system,user}.reg files. There are two different versions of the fix. I would prefer the second one because it preserves backwards compatibility: In case the key class attribute is set, it is put in brackets between the key name and modification time. Otherwise nothing changes. It would be really nice if this could be somehow integrated into wine. (Not only because I worked on it for a whole day, but also because i really miss the feature because i don't want to reconfigure PDFXChange-Viewer every time i start it and also because I would like to make that functionality available to all of my friends and all linux users as well. Greets Patrick [Software\\Tracker Software\\PDFViewer\\FullScreen\\MainView\\Bars\\0011;ParamItem] 1235760987 "Break"=dword:00000001 "ID"=dword:000081c9 "Name"="Properties" [Software\\Tracker Software\\PDFViewer\\FullScreen\\MainView\\Bars\\0011] [ParamItem] 1235761189 "Break"=dword:00000001 "ID"=dword:000081c9 "Name"="Properties" --- registry.c 2009-02-27 19:44:14.000000000 +0100 +++ registry.PP1.c 2009-02-27 19:49:03.000000000 +0100 @@ -176,7 +176,7 @@ dump_path( key->parent, base, f ); fprintf( f, "\\\\" ); } - dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[]" ); + dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[;" ); } /* dump a value to a text file */ @@ -245,6 +245,8 @@ { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); + fprintf( f, ";" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "[]" ); fprintf( f, "] %ld\n", (long)key->modif ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } @@ -1108,20 +1110,22 @@ int prefix_len, struct file_load_info *info, int default_modif ) { - WCHAR *p; - struct unicode_str name; - int res, modif; - data_size_t len; + WCHAR *p, cls[256]; + struct unicode_str name, class; + int res, res2, modif; + data_size_t len, len2 = 256; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; len = info->tmplen; - if ((res = parse_strW( info->tmp, &len, buffer, ']' )) == -1) + if ((res = parse_strW( info->tmp, &len, buffer, ';' )) == -1 || + (res2 = parse_strW( cls, &len2, buffer+res, ']' ) == -1)) { file_read_error( "Malformed key", info ); return NULL; } - if (sscanf( buffer + res, " %d", &modif ) != 1) modif = default_modif; + + if (sscanf( buffer + res + res2, " %d", &modif ) != 1) modif = default_modif; p = info->tmp; while (prefix_len && *p) { if (*p++ == '\\') prefix_len--; } @@ -1138,7 +1142,10 @@ } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); - return create_key( base, &name, NULL, flags, modif, &res ); + class.str = cls; + class.len = len2 - sizeof(WCHAR); + + return create_key( base, &name, &class, flags, modif, &res ); } /* parse a comma-separated list of hex digits */ --- registry.c 2009-02-27 19:44:14.000000000 +0100 +++ registry.PP2.c 2009-02-27 19:59:28.000000000 +0100 @@ -245,6 +245,10 @@ { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); + if (key->class != NULL) { + fprintf( f, "] [" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "[]" ); + } fprintf( f, "] %ld\n", (long)key->modif ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } @@ -1108,10 +1112,10 @@ int prefix_len, struct file_load_info *info, int default_modif ) { - WCHAR *p; - struct unicode_str name; - int res, modif; - data_size_t len; + WCHAR *p, *c; + struct unicode_str name, class; + int res, c_res, modif; + data_size_t len, c_len; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; @@ -1121,6 +1125,23 @@ file_read_error( "Malformed key", info ); return NULL; } + + c_len = info->tmplen - len; + if ((c_res = parse_strW( info->tmp + len / sizeof(WCHAR), &c_len, buffer + res, ']' )) == -1) + { + class.len = 0; + } + else + { + res += c_res; + + c = info->tmp + len / sizeof(WCHAR); + while (*c) { if (*c++ == '[') break; } + + class.str = c; + class.len = c_len - (c - (info->tmp + len / sizeof(WCHAR)) + 1) * sizeof(WCHAR); + } + if (sscanf( buffer + res, " %d", &modif ) != 1) modif = default_modif; p = info->tmp; @@ -1138,6 +1159,9 @@ } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); + + if (class.len > 0) + return create_key( base, &name, &class, flags, modif, &res ); return create_key( base, &name, NULL, flags, modif, &res ); }

2 1

appdb issue: can't search for apps platinum on 1.0.x!
by Dan Kegel March 2, 2009

March 2, 2009

Our currently released version is 1.0, but the appdb's browse feature acts as if that version no longer exists. This will seriously confuse newcomers who are using the 1.0.1 version (e.g. anybody who installs a fresh copy of Ubuntu!). To fix this, we should add 1.0 (or 1.0.1) back into the search box in http://appdb.winehq.org/objectManager.php?sClass=application

8 25

Re: twain_32/tests: Link with twain_32.dll.
by Jeremy White March 1, 2009

March 1, 2009

Francois Gouget wrote: > --- > > winetest can detect if twain_32.dll is there or not, and if it's missing > there's nothing to test anyway. Note that make_makefiles will need to be > run. This patch breaks make crosstest for me: [apevia:~/w/wine/dlls/twain_32/tests] make crosstest i586-mingw32msvc-gcc dsm.cross.o testlist.cross.o -o twain_32_crosstest.exe -L../../../dlls -L../../../dlls/twain_32 -L../../../dlls/user32 -L../../../dlls/gdi32 -L../../../dlls/kernel32 -ltwain_32 -luser32 -lgdi32 -lkernel32 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/bin/ld: cannot find -ltwain_32 collect2: ld returned 1 exit status make: *** [twain_32_crosstest.exe] Error 1 (it also breaks make test for me, but that may be operator error). But, what's more, I do not see the point. Twain_32 is not a Microsoft DLL; it is not present by default on most Windows systems. Further, the API specifications are quite clear: you're supposed to LoadLibrary Twain32, and all Twain applications I've tested do so. I don't see the benefit in making our test behave differently than the recommended behavior for this DLL. Cheers, Jeremy

3 2

Re: rpcrt4: Check for null endpoint in RpcServerUseProtseqEpExW
by Luke Kenneth Casson Leighton March 1, 2009

March 1, 2009

see implementation in dual BSD-licensed _and_ LGPL-licensed freedce reference implementation, on which MSRPC was originally blatantly copied (thanks to the BSD license on the 1.0 reference implementation). e.g. online annotated copy here: http://www.sfr-fresh.com/linux/misc/freedce-1.1.0.7.tar.gz:a/freedce-1.1.0.… line 2470. anyone who is doing wine dce/rpc development _really_ needs to be looking at the reference implementation, side-by-side, line-for-line, in virtually every aspect except for exception handling, threading, binary-interoperability with the typelibraries and a few other areas. l.

3 3

storing the registry key class name to make PDFXChange-Viewer happy
by Patrick March 1, 2009

March 1, 2009

Dear Developpers of Wine I like wine and I like Tracker Software's PDFXChange-Viewer as well. http://www.docu-track.com/home/prod_user/PDF-XChange_Tools/pdfx_viewer So, today I was not getting any rest until i found out why these two won't work together nicely. I mean they DO, actually. But I'm kind of touchy. I was wondering all the time, why most of the settings I changed were not restored as I exited and restarted the app. I then discovered that if wineserver was preserved ("-p" option) beween restarts they WERE restored. Further investigations unveiled that the problem is triggered by the fact that wineserver is not storing the registry key class name attributes. Something M$ must have come up with in XP but that is not very wideley used. PDFXChange-Viewer however seems to rely on it when parsing it's preferences from the registry on startup. Wineservers unicode string handling gave me a though time in implementing a solution to this but i finally managed. You can see that I went quiet straightforward: adding the class name next to the key name in the {system,user}.reg files. There are two different versions of the fix. I would prefer the second one because it preserves backwards compatibility: In case the key class attribute is set, it is put in brackets between the key name and modification time. Otherwise nothing changes. It would be really nice if this could be somehow integrated into wine. (Not only because I worked on it for a whole day, but also because i really miss the feature because i don't want to reconfigure PDFXChange-Viewer every time i start it and also because I would like to make that functionality available to all of my friends and all linux users as well. Greets Patrick [Software\\Tracker Software\\PDFViewer\\FullScreen\\MainView\\Bars\\0011;ParamItem] 1235760987 "Break"=dword:00000001 "ID"=dword:000081c9 "Name"="Properties" [Software\\Tracker Software\\PDFViewer\\FullScreen\\MainView\\Bars\\0011] [ParamItem] 1235761189 "Break"=dword:00000001 "ID"=dword:000081c9 "Name"="Properties" --- registry.c 2009-02-27 19:44:14.000000000 +0100 +++ registry.PP1.c 2009-02-27 19:49:03.000000000 +0100 @@ -176,7 +176,7 @@ dump_path( key->parent, base, f ); fprintf( f, "\\\\" ); } - dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[]" ); + dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[;" ); } /* dump a value to a text file */ @@ -245,6 +245,8 @@ { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); + fprintf( f, ";" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "[]" ); fprintf( f, "] %ld\n", (long)key->modif ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } @@ -1108,20 +1110,22 @@ int prefix_len, struct file_load_info *info, int default_modif ) { - WCHAR *p; - struct unicode_str name; - int res, modif; - data_size_t len; + WCHAR *p, cls[256]; + struct unicode_str name, class; + int res, res2, modif; + data_size_t len, len2 = 256; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; len = info->tmplen; - if ((res = parse_strW( info->tmp, &len, buffer, ']' )) == -1) + if ((res = parse_strW( info->tmp, &len, buffer, ';' )) == -1 || + (res2 = parse_strW( cls, &len2, buffer+res, ']' ) == -1)) { file_read_error( "Malformed key", info ); return NULL; } - if (sscanf( buffer + res, " %d", &modif ) != 1) modif = default_modif; + + if (sscanf( buffer + res + res2, " %d", &modif ) != 1) modif = default_modif; p = info->tmp; while (prefix_len && *p) { if (*p++ == '\\') prefix_len--; } @@ -1138,7 +1142,10 @@ } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); - return create_key( base, &name, NULL, flags, modif, &res ); + class.str = cls; + class.len = len2 - sizeof(WCHAR); + + return create_key( base, &name, &class, flags, modif, &res ); } /* parse a comma-separated list of hex digits */ --- registry.c 2009-02-27 19:44:14.000000000 +0100 +++ registry.PP2.c 2009-02-27 19:59:28.000000000 +0100 @@ -245,6 +245,10 @@ { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); + if (key->class != NULL) { + fprintf( f, "] [" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "[]" ); + } fprintf( f, "] %ld\n", (long)key->modif ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } @@ -1108,10 +1112,10 @@ int prefix_len, struct file_load_info *info, int default_modif ) { - WCHAR *p; - struct unicode_str name; - int res, modif; - data_size_t len; + WCHAR *p, *c; + struct unicode_str name, class; + int res, c_res, modif; + data_size_t len, c_len; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; @@ -1121,6 +1125,23 @@ file_read_error( "Malformed key", info ); return NULL; } + + c_len = info->tmplen - len; + if ((c_res = parse_strW( info->tmp + len / sizeof(WCHAR), &c_len, buffer + res, ']' )) == -1) + { + class.len = 0; + } + else + { + res += c_res; + + c = info->tmp + len / sizeof(WCHAR); + while (*c) { if (*c++ == '[') break; } + + class.str = c; + class.len = c_len - (c - (info->tmp + len / sizeof(WCHAR)) + 1) * sizeof(WCHAR); + } + if (sscanf( buffer + res, " %d", &modif ) != 1) modif = default_modif; p = info->tmp; @@ -1138,6 +1159,9 @@ } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); + + if (class.len > 0) + return create_key( base, &name, &class, flags, modif, &res ); return create_key( base, &name, NULL, flags, modif, &res ); }

2 3

Cebit again
by Dan Kegel Feb. 28, 2009

Feb. 28, 2009

I updated the slides at http://kegel.com/cebit one more time. The talk is this coming Thursday, so I'll probably fiddle with it a bit more. I did give a second practice run in front of a live audience, including some windows sysadmins, and they said it made Wine less scary. Which is, I guess, my goal... - Dan

2 1

Re: [imaadp32 2/3] fixed adpcm_FormatSuggest
by Detlef Riekenberg Feb. 28, 2009

Feb. 28, 2009

On Fr, 2009-02-27 at 20:07 +0100, Stefano Guidoni wrote: > case WAVE_FORMAT_IMA_ADPCM: > - adfs->pwfxDst->nBlockAlign = 1024; > + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT*)adfs->pwfxDst); > /* FIXME: not handling header overhead */ > TRACE("setting spb=%u\n", > ((IMAADPCMWAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock); > + /* check if result is ok */ > + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return > ACMERR_NOTPOSSIBLE; > break; While reading the diff, it's visible, that you screw the indention up. (Mix SPACE and TAB) -- By by ... Detlef

1 0

Bugzilla down!
by Stefan Leichter Feb. 28, 2009

Feb. 28, 2009

Hi, i'm getting ------------------------------------------------------------------------------ Software error: Can't connect to the database. Error: User winehq already has more than 'max_user_connections' active connections Is your database installed and up and running? Do you have the correct username and password selected in localconfig? For help, please send mail to the webmaster (bugs-admin(a)winehq.org) giving this error message and the time and date of the error. ------------------------------------------------------------------------------ when i try to reach http://bugs.winehq.org

2 1

Lost disc 1 of WP Office 2002 :-(
by Dan Kegel Feb. 28, 2009

Feb. 28, 2009

I went to the trouble of buying a copy of WordPerfect Office 2002 a while ago, and just tried installing it again - but I seem to have lost disc 1. Anyone have a copy they're not using anymore? I have disc 2 and a serial number, just no disc 1 :-(

1 0

Revoking my gpg key 0x4C40A6D9 (Was: Re: mcicda: Compare a file handle with INVALID_HANDLE_VALUE instead of NULL.)
by Michael Stefaniuc Feb. 27, 2009

Feb. 27, 2009

How embarrassing! Having to revoke my new (9 days old) gpg key 0x4C40A6D9. Yes, that was a big part of the passphrase for that key in the CC field ... -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: A revocation certificate should follow iH4EIBECAD4FAkmocts3HQJTZW50IHBhcnQgb2YgdGhlIHBhc3NwaHJhc2UgdG8g YSBwdWJsaWMgbWFpbGluZyBsaXN0LgAKCRAiLf+YTECm2emfAJ4lg1KaduK1eDw6 gASivxMpRHxZpgCeLaO+C3Vn2XVFCoH3WaxHAO5xZV0= =zhsP -----END PGP PUBLIC KEY BLOCK----- /me hangs head in shame michael Michael Stefaniuc wrote: > --- > dlls/mcicda/mcicda.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c > index 79f3bae..81dc18f 100644 > --- a/dlls/mcicda/mcicda.c > +++ b/dlls/mcicda/mcicda.c > @@ -463,7 +463,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar > /* now, open the handle */ > root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; > wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); > - if (wmcda->handle != 0) > + if (wmcda->handle != INVALID_HANDLE_VALUE) > return 0; > > the_error: >

1 0

Time to integrate win16 test suite?
by Dan Kegel Feb. 27, 2009

Feb. 27, 2009

Now that we support building 16 bit executables, it seems like a good time to think about integrating the 16 bit test suite, currently hibernating at http://win16test.googlecode.com Any takers?

1 0