November 2005 - Wine-Devel - list.winehq.org

Re: [wined3d] D3DCOLOR fixup begin
by Oliver Stieber Nov. 4, 2005

Nov. 4, 2005

--- Oliver Stieber <oliver_stieber(a)yahoo.co.uk> wrote: > > --- Raphael <fenix(a)club-internet.fr> wrote: > > > Hi, > > > > Changelog: > > - defined D3DCOLOR_B macros to access byte values of D3DCOLOR > > - use D3DCOLOR macros instead of using shift + masks > > - fix a bug where diffuse.lpData checked instead of specular.lpData > > - implement color fixup on ARB VShader compilation code: > > -> on input parameters using swizzle > > -> add is_color parameter on vshader_program_add_param > > > The input swizzel needs to be an output swizzel because it should be possible to use anything to > generate a colour for output and not just the input colours, that should also get around the > is_colour problem. Having thought about it again the swizell need to be on the input, it shouldn't be too hard to work out which inputs need to be swizelled in the parser first pass. > > Todo: > > - check shader declaration while compiling VShader to value is_color > > parameter (Oliver have you an idea how to do that ?) > > > - implement a fixup code for drawPrimitiveSlow and VBO unlock > > I've got some fixup code to go in so that drawStridedSlow doesn't have to be used. > Oliver. > > > > > > Regards, > > Raphael > > > ? wined3d.dll.dbg.c > > ? wined3d.spec.def > > Index: device.c > > =================================================================== > > RCS file: /home/wine/wine/dlls/wined3d/device.c,v > > retrieving revision 1.91 > > diff -u -r1.91 device.c > > --- device.c 2 Nov 2005 20:01:54 -0000 1.91 > > +++ device.c 2 Nov 2005 23:11:55 -0000 > > @@ -4598,10 +4598,10 @@ > > if (Flags & D3DCLEAR_TARGET) { > > TRACE("Clearing screen with glClear to color %lx\n", Color); > > glGetFloatv(GL_COLOR_CLEAR_VALUE, old_color_clear_value); > > - glClearColor(((Color >> 16) & 0xFF) / 255.0f, > > - ((Color >> 8) & 0xFF) / 255.0f, > > - ((Color >> 0) & 0xFF) / 255.0f, > > - ((Color >> 24) & 0xFF) / 255.0f); > > + glClearColor(D3DCOLOR_R(Color), > > + D3DCOLOR_G(Color), > > + D3DCOLOR_B(Color), > > + D3DCOLOR_A(Color)); > > checkGLcall("glClearColor"); > > > > /* Clear ALL colors! */ > > Index: drawprim.c > > =================================================================== > > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > > retrieving revision 1.31 > > diff -u -r1.31 drawprim.c > > --- drawprim.c 11 Oct 2005 20:27:54 -0000 1.31 > > +++ drawprim.c 2 Nov 2005 23:11:56 -0000 > > @@ -1410,30 +1410,30 @@ > > > > /* Diffuse -------------------------------- */ > > if (sd->u.s.diffuse.lpData != NULL) { > > - glColor4ub((diffuseColor >> 16) & 0xFF, > > - (diffuseColor >> 8) & 0xFF, > > - (diffuseColor >> 0) & 0xFF, > > - (diffuseColor >> 24) & 0xFF); > > - VTRACE(("glColor4f: r,g,b,a=%f,%f,%f,%f\n", > > - ((diffuseColor >> 16) & 0xFF) / 255.0f, > > - ((diffuseColor >> 8) & 0xFF) / 255.0f, > > - ((diffuseColor >> 0) & 0xFF) / 255.0f, > > - ((diffuseColor >> 24) & 0xFF) / 255.0f)); > > + glColor4ub(D3DCOLOR_B_R(diffuseColor), > > + D3DCOLOR_B_G(diffuseColor), > > + D3DCOLOR_B_B(diffuseColor), > > + D3DCOLOR_B_A(diffuseColor)); > > + VTRACE(("glColor4ub: r,g,b,a=%u,%u,%u,%u\n", > > + D3DCOLOR_B_R(diffuseColor), > > + D3DCOLOR_B_G(diffuseColor), > > + D3DCOLOR_B_B(diffuseColor), > > + D3DCOLOR_B_A(diffuseColor))); > > } else { > > if (vx_index == 0) glColor4f(1.0f, 1.0f, 1.0f, 1.0f); > > } > > > > /* Specular ------------------------------- */ > > - if (sd->u.s.diffuse.lpData != NULL) { > > - VTRACE(("glSecondaryColor4ub: r,g,b=%f,%f,%f\n", > > - ((specularColor >> 16) & 0xFF) / 255.0f, > > - ((specularColor >> 8) & 0xFF) / 255.0f, > > - ((specularColor >> 0) & 0xFF) / 255.0f)); > > + if (sd->u.s.specular.lpData != NULL) { > > + VTRACE(("glSecondaryColor4ub: r,g,b=%u,%u,%u\n", > > + D3DCOLOR_B_R(specularColor), > > + D3DCOLOR_B_G(specularColor), > > + D3DCOLOR_B_B(specularColor))); > > if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { > > GL_EXTCALL(glSecondaryColor3ubEXT)( > > - (specularColor >> 16) & 0xFF, > > - (specularColor >> 8) & 0xFF, > > - (specularColor >> 0) & 0xFF); > > + D3DCOLOR_B_R(specularColor), > > + D3DCOLOR_B_G(specularColor), > > + D3DCOLOR_B_B(specularColor)); > > } else { > > /* Do not worry if specular colour missing and disable request */ > > VTRACE(("Specular color extensions not supplied\n")); > > Index: vertexshader.c > > =================================================================== > > RCS file: /home/wine/wine/dlls/wined3d/vertexshader.c,v > > retrieving revision 1.14 > > diff -u -r1.14 vertexshader.c > > --- vertexshader.c 27 Oct 2005 10:23:53 -0000 1.14 > > +++ vertexshader.c 2 Nov 2005 23:11:57 -0000 > > @@ -887,10 +887,70 @@ > > return D3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK); > > } > > > > -inline static void vshader_program_add_param(const DWORD param, int input, char *hwLine, BOOL > > namedArrays, CHAR constantsUsedBitmap[]) { > > +inline static void vshader_program_add_output_param_swizzle(const DWORD param, int is_color, > > char *hwLine) { > > + /** operand output */ > > + if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) { > > + strcat(hwLine, "."); > > + if (param & D3DSP_WRITEMASK_0) { strcat(hwLine, "x"); } > > + if (param & D3DSP_WRITEMASK_1) { strcat(hwLine, "y"); } > > + if (param & D3DSP_WRITEMASK_2) { strcat(hwLine, "z"); } > > + if (param & D3DSP_WRITEMASK_3) { strcat(hwLine, "w"); } > > + } > > +} > > + > > +inline static void vshader_program_add_input_param_swizzle(const DWORD param, int is_color, > > char *hwLine) { > > + static const char swizzle_reg_chars_color_fix[] = "zyxw"; > > + static const char swizzle_reg_chars[] = "xyzw"; > > + const char* swizzle_regs = NULL; > > + char tmpReg[255]; > > + > > + /** operand input */ > > + DWORD swizzle = (param & D3DVS_SWIZZLE_MASK) >> D3DVS_SWIZZLE_SHIFT; > > + DWORD swizzle_x = swizzle & 0x03; > > + DWORD swizzle_y = (swizzle >> 2) & 0x03; > > + DWORD swizzle_z = (swizzle >> 4) & 0x03; > > + DWORD swizzle_w = (swizzle >> 6) & 0x03; > > + > > + if (is_color) { > > + swizzle_regs = swizzle_reg_chars_color_fix; > > + } else { > > + swizzle_regs = swizzle_reg_chars; > > + } > > + > > + /** > > + * swizzle bits fields: > > + * WWZZYYXX > > + */ > > + if ((D3DVS_NOSWIZZLE >> D3DVS_SWIZZLE_SHIFT) == swizzle) { /* D3DVS_NOSWIZZLE == 0xE4 << > > D3DVS_SWIZZLE_SHIFT */ > > + if (is_color) { > > + sprintf(tmpReg, ".%c%c%c%c", > > + swizzle_regs[swizzle_x], > > + swizzle_regs[swizzle_y], > > + swizzle_regs[swizzle_z], > > + swizzle_regs[swizzle_w]); > > + strcat(hwLine, tmpReg); > > + } > > + return ; > > + } > > + if (swizzle_x == swizzle_y && > > + swizzle_x == swizzle_z && > > + swizzle_x == swizzle_w) > > + { > > + sprintf(tmpReg, ".%c", swizzle_regs[swizzle_x]); > > + strcat(hwLine, tmpReg); > > + } else { > > + sprintf(tmpReg, ".%c%c%c%c", > > + swizzle_regs[swizzle_x], > > + swizzle_regs[swizzle_y], > > + swizzle_regs[swizzle_z], > > + swizzle_regs[swizzle_w]); > > + strcat(hwLine, tmpReg); > > + } > > +} > > + > > +inline static void vshader_program_add_param(const DWORD param, int input, int is_color, char > > *hwLine, BOOL namedArrays, CHAR constantsUsedBitmap[]) { > > /*static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; */ > > static const char* hwrastout_reg_names[] = { "result.position", "result.fogcoord", > > "result.pointsize" }; > > - static const char swizzle_reg_chars[] = "xyzw"; > > > > DWORD reg = param & 0x00001FFF; > > DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); > > @@ -954,49 +1014,9 @@ > > } > > > > if (!input) { > > - /** operand output */ > > - if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) { > > - strcat(hwLine, "."); > > - if (param & D3DSP_WRITEMASK_0) { > > - strcat(hwLine, "x"); > > - } > > - if (param & D3DSP_WRITEMASK_1) { > > - strcat(hwLine, "y"); > > - } > > - if (param & D3DSP_WRITEMASK_2) { > > - strcat(hwLine, "z"); > > - } > > - if (param & D3DSP_WRITEMASK_3) { > > - strcat(hwLine, "w"); > > - } > > - } > > + vshader_program_add_output_param_swizzle(param, is_color, hwLine); > > } else { > > - /** operand input */ > > - DWORD swizzle = (param & D3DVS_SWIZZLE_MASK) >> D3DVS_SWIZZLE_SHIFT; > > - DWORD swizzle_x = swizzle & 0x03; > > - DWORD swizzle_y = (swizzle >> 2) & 0x03; > > - DWORD swizzle_z = (swizzle >> 4) & 0x03; > > - DWORD swizzle_w = (swizzle >> 6) & 0x03; > > - /** > > - * swizzle bits fields: > > - * WWZZYYXX > > - */ > > - if ((D3DVS_NOSWIZZLE >> D3DVS_SWIZZLE_SHIFT) != swizzle) { /* ! D3DVS_NOSWIZZLE == 0xE4 > << > > D3DVS_SWIZZLE_SHIFT */ > > - if (swizzle_x == swizzle_y && > > - swizzle_x == swizzle_z && > > - swizzle_x == swizzle_w) > > - { > > - sprintf(tmpReg, ".%c", swizzle_reg_chars[swizzle_x]); > > - strcat(hwLine, tmpReg); > > - } else { > > - sprintf(tmpReg, ".%c%c%c%c", > > - swizzle_reg_chars[swizzle_x], > > - swizzle_reg_chars[swizzle_y], > > - swizzle_reg_chars[swizzle_z], > > - swizzle_reg_chars[swizzle_w]); > > - strcat(hwLine, tmpReg); > > - } > > - } > > + vshader_program_add_input_param_swizzle(param, is_color, hwLine); > > } > > } > > > > @@ -1540,7 +1560,7 @@ > > char tmpChar[80]; > > ++pToken; > > sprintf(tmpLine, "ATTRIB "); > > - vshader_program_add_param(*pToken, 0, tmpLine, This->namedArrays, > > This->constantsUsedBitmap); > > + vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, > > This->constantsUsedBitmap); > > sprintf(tmpChar," = %s", attribName); > > strcat(tmpLine, tmpChar); > > strcat(tmpLine,";\n"); > > @@ -1592,12 +1612,12 @@ > > } > > } > > if (curOpcode->num_params > 0) { > > - vshader_program_add_param(*pToken, 0, tmpLine, This->namedArrays, > > This->constantsUsedBitmap); > > + vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, > > This->constantsUsedBitmap); > > > > ++pToken; > > for (i = 1; i < curOpcode->num_params; ++i) { > > strcat(tmpLine, ","); > > - vshader_program_add_param(*pToken, 1, tmpLine, This->namedArrays, > > This->constantsUsedBitmap); > > + vshader_program_add_param(*pToken, 1, 0, tmpLine, This->namedArrays, > > This->constantsUsedBitmap); > > ++pToken; > > } > > } > > Index: wined3d_private.h > > =================================================================== > > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > > retrieving revision 1.67 > > diff -u -r1.67 wined3d_private.h > > --- wined3d_private.h 29 Oct 2005 10:30:36 -0000 1.67 > > +++ wined3d_private.h 2 Nov 2005 23:11:57 -0000 > > @@ -161,6 +161,11 @@ > > #define GL_EXTCALL(FuncName) (GLINFO_LOCATION.FuncName) > > #define GL_VEND(_VendName) (GLINFO_LOCATION.gl_vendor == VENDOR_##_VendName ? TRUE > : > > FALSE) > > > > +#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) > > +#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) > > +#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xFF) > > +#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xFF) > > + > > #define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xFF)) / 255.0f) > > #define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xFF)) / 255.0f) > > #define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xFF)) / 255.0f) > > > > > > > > > > ___________________________________________________________ > To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. > http://uk.security.yahoo.com > ___________________________________________________________ To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. http://uk.security.yahoo.com

2 2

Re: RESUBMIT: olepicture loading from streams without Stat
by Alexandre Julliard Nov. 4, 2005

Nov. 4, 2005

Marcus Meissner <marcus(a)jet.franken.de> writes: > Hi, > > Third submission... Should I change anything? Make it cleaner? > > Sample app is in http://bugs.winehq.org/show_bug.cgi?id=2683 > > Ciao, Marcus > > Changelog: > Implemented OLEPicture loading from IStreams that do > not support IStream::Stat(). > Added testcase for this behaviour. You need to allocate a larger buffer, and grow it by doubling the size or something like that. Reallocating every 4096 bytes is going to be very slow on large files. Also you shouldn't use ntdll functions in the tests. -- Alexandre Julliard julliard(a)winehq.org

1 0

IE6 setup requires a registered inseng.dll
by James Hawkins Nov. 3, 2005

Nov. 3, 2005

Hey, I tried to install IE6 with some success. I used a native advpack.dll because wine's advpack isn't complete enough yet. The install bails out with the following errors on the command line: err:ole:CoGetClassObject class {6e449686-c509-11cf-aafa-00aa00b6015c} not registered err:ole:create_server class {6e449686-c509-11cf-aafa-00aa00b6015c} not registered fixme:ole:CoCreateInstance no classfactory created for CLSID {6e449686-c509-11cf-aafa-00aa00b6015c}, hres is 0x80040150 I looked up the UID and it belongs to inseng.dll, which is extracted to the temporary install directory. On windows, inseng.dll is already registered by the time you run the installer, but is not registered on wine. Running regsvr32 inseng.dll solves the problem, and the install succeeds, but that is just a workaround. One solution is to add the registration to wine.inf. The other option is to add a skeleton inseng.dll with the DllRegister function implemented. I find the second solution most appealing, because it provides more incentive to implement that dll. What solution would be most acceptable? -- James Hawkins

1 0

Re: program works under winedbg but not under wine
by Matheus Izvekov Nov. 3, 2005

Nov. 3, 2005

On 11/3/05, James Liggett <jrliggett(a)cox.net> wrote: > On Tue, 2005-11-01 at 23:34 -0200, Matheus Izvekov wrote: > > yes, i develop it in a windows xp environment. > > what kind of stack problem do you think might be related? > > i think its unlikely that its because of stack overflow, it uses very > > little stack, but ill investigate. > > If it works on Windows, then the stack problems I'm referring to aren't > in your code but in wine. I'll have some free time for the next few > days, so send your code and I'll try and see if I can help. By the way, > does this program do? > > James > Its used for generating a 2 dimension float array dumped on a file. You start with a bitmap and assign a float value for each color. its still WIP and a bit messed up, but i believe it will be enough for the purpose of testing. Beware that this program does not use the C runtime. The entry point is "WinMainStartup" in gui.c.

1 0

Re: [Resent] Fix the separator for VarDateFromStr
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > @@ -3419,6 +3419,16 @@ > DFS("1/2/1970"); EXPECT_DBL(25570.0); > DFS("1-2-1970"); EXPECT_DBL(25570.0); > /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ > + > + /* some tests for the german locale */ > + lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); > + DFS("1.2.1970"); EXPECT_DBL(25600.0); > + /* Unusual format in German locale, but accepted by native oleaut32*/ > + DFS("1-2-1970"); EXPECT_DBL(25600.0); > + DFS("01.02.1970"); EXPECT_DBL(25600.0); > + DFS("1. Februar 1970"); EXPECT_DBL(25600.0); > + DFS("1. Feb. 1970"); EXPECT_DBL(25600.0); > + You should add test cases that fail in English and succeed in German and the other way around, otherwise it doesn't really tell us anything about which separators work in which language. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: New eject command issue
by Christian Costa Nov. 3, 2005

Nov. 3, 2005

> > > FSCTL_DISMOUNT_VOLUME : > > in DIR_unmount_device (in ntdll/directory.c): > > - unmount_device server call (in fd.c) is called but in unmount_device, > > the function tries to retreive a device object given the device > > return by fstat but no device object has been previously created so > > get_device fails. My understanding is that this server call > > should closed all fds associated with the device but files stay > > opened. > > It closes them in the server, but it can't close them in the > client. They are open in the client because your CD has not been > detected as a removable device so the client doesn't know that it > shouldn't cache fds. > I will hack FILE_GetDeviceInfo just to make it recognize my cdrom as removable and try to see if it helps. However, I don't understand well why forcing the drive as cdrom (instead of relying on autodetection) is not taken into account. This could be also usefull for ISO images. Unless this option is planned to be removed !?! Thx, Christian

2 2

c2man comment rejection
by Markus Amsler Nov. 3, 2005

Nov. 3, 2005

Hi, I identified 80 function comments, that have a description and a PARAMS section, but no RETURNS section. IMHO it would generate in most cases acceptable documentation, but gets rejected because of the missing RETURNS section. 2 possible fixes: - patch c2man so it accepts also PARAMS sections pro: small change, more html documented functions in general con: some functions have unsuitable comments - add RETURNS section to comments pro: cleaner documentation con: more changes, a lot of "RETURNS TRUE on success FALSE otherwise"- style comments. Which way to go? Markus identified Functions: IsTextUnicode CryptAcquireContextW SystemFunction036 SystemFunction040 SystemFunction041 BuildSecurityDescriptorA SetFileSecurityW StartServiceCtrlDispatcherA StartServiceCtrlDispatcherW GetEnhMetaFileHeader GetEnhMetaFileDescriptionW PlayEnhMetaFile PolyTextOutA PolyTextOutW GdiInit216 PlayMetaFile GetMetaFileBits16 SetMetaFileBits16 SetMetaFileBitsEx GetMetaFileBitsEx SetPixelFormat SwapBuffers PolyBezier PolyBezierTo AbortPath WaitCommEvent CommConfigDialogW WriteConsoleOutputCharacterA SetConsoleCursorPosition GetDriveType16 IsValidLocale SetLastError GetLastError GetCurrentProcessId GetCurrentThreadId SetLastError ThunkConnect32 ThunkInitSL SSCall FreeSLCallback ThunkConnect16 VirtualAllocEx GetColorDirectoryW ICInfo AcceptEx TransmitFile RtlSetLastWin32Error RtlSetLastWin32ErrorAndNtStatusFromNtStatus RtlOpenCurrentUser RtlCreateSecurityDescriptor RtlCopySecurityDescriptor _splitpath CreateILockBytesOnHGlobal16 CoInitialize16 ProgIDFromCLSID16 CoRegisterClassObject16 ReadClassStg16 SetupOpenInfFileW ILAppend ILFree ILGlobalFree RegisterShellHook SHUpdateImageW IShellFolder_ParseDisplayName SHFileOperationA SHFreeNameMappings IUnknown_SetSite CreateIcon SetCursor SetDebugErrorLevel DestroyAcceleratorTable SetScrollRange ShowScrollBar OpenThemeFile CloseThemeFile ApplyTheme GetThemeDefaults EnumThemes CheckThemeSignature EnumPrintersW

3 2

Re: 25% success rate on wife's must-have apps!
by Dan Kegel Nov. 3, 2005

Nov. 3, 2005

On 11/3/05, Michael Jung <mjung(a)iss.tu-darmstadt.de> wrote: > On Monday 31 October 2005 08:39, Dan Kegel wrote: > > Can't install: > > Adobe Photoshop Elements > > Just saw Photoshop Elements on Frank's Corner and remembered your mail: > http://frankscorner.org/index.php?p=pselements2 Frank may think it's ok to install IE, but I'm trying to go for a pure Wine. (I'll install things like MDAC and the VB Runtime, since those are allowed by Microsoft more or less, but iirc recent IE's are expressly forbidden becuase "IE is part of Windows".) But it's good to know that installing IE helps; that points us to what needs to be fixed in Wine. Thanks, Dan

1 0

Re: [wined3d] D3DCOLOR fixup begin
by Oliver Stieber Nov. 3, 2005

Nov. 3, 2005

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - defined D3DCOLOR_B macros to access byte values of D3DCOLOR > - use D3DCOLOR macros instead of using shift + masks > - fix a bug where diffuse.lpData checked instead of specular.lpData > - implement color fixup on ARB VShader compilation code: > -> on input parameters using swizzle > -> add is_color parameter on vshader_program_add_param > The input swizzel needs to be an output swizzel because it should be possible to use anything to generate a colour for output and not just the input colours, that should also get around the is_colour problem. > Todo: > - check shader declaration while compiling VShader to value is_color > parameter (Oliver have you an idea how to do that ?) > - implement a fixup code for drawPrimitiveSlow and VBO unlock I've got some fixup code to go in so that drawStridedSlow doesn't have to be used. Oliver. > > Regards, > Raphael > > ? wined3d.dll.dbg.c > ? wined3d.spec.def > Index: device.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/device.c,v > retrieving revision 1.91 > diff -u -r1.91 device.c > --- device.c 2 Nov 2005 20:01:54 -0000 1.91 > +++ device.c 2 Nov 2005 23:11:55 -0000 > @@ -4598,10 +4598,10 @@ > if (Flags & D3DCLEAR_TARGET) { > TRACE("Clearing screen with glClear to color %lx\n", Color); > glGetFloatv(GL_COLOR_CLEAR_VALUE, old_color_clear_value); > - glClearColor(((Color >> 16) & 0xFF) / 255.0f, > - ((Color >> 8) & 0xFF) / 255.0f, > - ((Color >> 0) & 0xFF) / 255.0f, > - ((Color >> 24) & 0xFF) / 255.0f); > + glClearColor(D3DCOLOR_R(Color), > + D3DCOLOR_G(Color), > + D3DCOLOR_B(Color), > + D3DCOLOR_A(Color)); > checkGLcall("glClearColor"); > > /* Clear ALL colors! */ > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.31 > diff -u -r1.31 drawprim.c > --- drawprim.c 11 Oct 2005 20:27:54 -0000 1.31 > +++ drawprim.c 2 Nov 2005 23:11:56 -0000 > @@ -1410,30 +1410,30 @@ > > /* Diffuse -------------------------------- */ > if (sd->u.s.diffuse.lpData != NULL) { > - glColor4ub((diffuseColor >> 16) & 0xFF, > - (diffuseColor >> 8) & 0xFF, > - (diffuseColor >> 0) & 0xFF, > - (diffuseColor >> 24) & 0xFF); > - VTRACE(("glColor4f: r,g,b,a=%f,%f,%f,%f\n", > - ((diffuseColor >> 16) & 0xFF) / 255.0f, > - ((diffuseColor >> 8) & 0xFF) / 255.0f, > - ((diffuseColor >> 0) & 0xFF) / 255.0f, > - ((diffuseColor >> 24) & 0xFF) / 255.0f)); > + glColor4ub(D3DCOLOR_B_R(diffuseColor), > + D3DCOLOR_B_G(diffuseColor), > + D3DCOLOR_B_B(diffuseColor), > + D3DCOLOR_B_A(diffuseColor)); > + VTRACE(("glColor4ub: r,g,b,a=%u,%u,%u,%u\n", > + D3DCOLOR_B_R(diffuseColor), > + D3DCOLOR_B_G(diffuseColor), > + D3DCOLOR_B_B(diffuseColor), > + D3DCOLOR_B_A(diffuseColor))); > } else { > if (vx_index == 0) glColor4f(1.0f, 1.0f, 1.0f, 1.0f); > } > > /* Specular ------------------------------- */ > - if (sd->u.s.diffuse.lpData != NULL) { > - VTRACE(("glSecondaryColor4ub: r,g,b=%f,%f,%f\n", > - ((specularColor >> 16) & 0xFF) / 255.0f, > - ((specularColor >> 8) & 0xFF) / 255.0f, > - ((specularColor >> 0) & 0xFF) / 255.0f)); > + if (sd->u.s.specular.lpData != NULL) { > + VTRACE(("glSecondaryColor4ub: r,g,b=%u,%u,%u\n", > + D3DCOLOR_B_R(specularColor), > + D3DCOLOR_B_G(specularColor), > + D3DCOLOR_B_B(specularColor))); > if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { > GL_EXTCALL(glSecondaryColor3ubEXT)( > - (specularColor >> 16) & 0xFF, > - (specularColor >> 8) & 0xFF, > - (specularColor >> 0) & 0xFF); > + D3DCOLOR_B_R(specularColor), > + D3DCOLOR_B_G(specularColor), > + D3DCOLOR_B_B(specularColor)); > } else { > /* Do not worry if specular colour missing and disable request */ > VTRACE(("Specular color extensions not supplied\n")); > Index: vertexshader.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexshader.c,v > retrieving revision 1.14 > diff -u -r1.14 vertexshader.c > --- vertexshader.c 27 Oct 2005 10:23:53 -0000 1.14 > +++ vertexshader.c 2 Nov 2005 23:11:57 -0000 > @@ -887,10 +887,70 @@ > return D3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK); > } > > -inline static void vshader_program_add_param(const DWORD param, int input, char *hwLine, BOOL > namedArrays, CHAR constantsUsedBitmap[]) { > +inline static void vshader_program_add_output_param_swizzle(const DWORD param, int is_color, > char *hwLine) { > + /** operand output */ > + if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) { > + strcat(hwLine, "."); > + if (param & D3DSP_WRITEMASK_0) { strcat(hwLine, "x"); } > + if (param & D3DSP_WRITEMASK_1) { strcat(hwLine, "y"); } > + if (param & D3DSP_WRITEMASK_2) { strcat(hwLine, "z"); } > + if (param & D3DSP_WRITEMASK_3) { strcat(hwLine, "w"); } > + } > +} > + > +inline static void vshader_program_add_input_param_swizzle(const DWORD param, int is_color, > char *hwLine) { > + static const char swizzle_reg_chars_color_fix[] = "zyxw"; > + static const char swizzle_reg_chars[] = "xyzw"; > + const char* swizzle_regs = NULL; > + char tmpReg[255]; > + > + /** operand input */ > + DWORD swizzle = (param & D3DVS_SWIZZLE_MASK) >> D3DVS_SWIZZLE_SHIFT; > + DWORD swizzle_x = swizzle & 0x03; > + DWORD swizzle_y = (swizzle >> 2) & 0x03; > + DWORD swizzle_z = (swizzle >> 4) & 0x03; > + DWORD swizzle_w = (swizzle >> 6) & 0x03; > + > + if (is_color) { > + swizzle_regs = swizzle_reg_chars_color_fix; > + } else { > + swizzle_regs = swizzle_reg_chars; > + } > + > + /** > + * swizzle bits fields: > + * WWZZYYXX > + */ > + if ((D3DVS_NOSWIZZLE >> D3DVS_SWIZZLE_SHIFT) == swizzle) { /* D3DVS_NOSWIZZLE == 0xE4 << > D3DVS_SWIZZLE_SHIFT */ > + if (is_color) { > + sprintf(tmpReg, ".%c%c%c%c", > + swizzle_regs[swizzle_x], > + swizzle_regs[swizzle_y], > + swizzle_regs[swizzle_z], > + swizzle_regs[swizzle_w]); > + strcat(hwLine, tmpReg); > + } > + return ; > + } > + if (swizzle_x == swizzle_y && > + swizzle_x == swizzle_z && > + swizzle_x == swizzle_w) > + { > + sprintf(tmpReg, ".%c", swizzle_regs[swizzle_x]); > + strcat(hwLine, tmpReg); > + } else { > + sprintf(tmpReg, ".%c%c%c%c", > + swizzle_regs[swizzle_x], > + swizzle_regs[swizzle_y], > + swizzle_regs[swizzle_z], > + swizzle_regs[swizzle_w]); > + strcat(hwLine, tmpReg); > + } > +} > + > +inline static void vshader_program_add_param(const DWORD param, int input, int is_color, char > *hwLine, BOOL namedArrays, CHAR constantsUsedBitmap[]) { > /*static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; */ > static const char* hwrastout_reg_names[] = { "result.position", "result.fogcoord", > "result.pointsize" }; > - static const char swizzle_reg_chars[] = "xyzw"; > > DWORD reg = param & 0x00001FFF; > DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); > @@ -954,49 +1014,9 @@ > } > > if (!input) { > - /** operand output */ > - if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) { > - strcat(hwLine, "."); > - if (param & D3DSP_WRITEMASK_0) { > - strcat(hwLine, "x"); > - } > - if (param & D3DSP_WRITEMASK_1) { > - strcat(hwLine, "y"); > - } > - if (param & D3DSP_WRITEMASK_2) { > - strcat(hwLine, "z"); > - } > - if (param & D3DSP_WRITEMASK_3) { > - strcat(hwLine, "w"); > - } > - } > + vshader_program_add_output_param_swizzle(param, is_color, hwLine); > } else { > - /** operand input */ > - DWORD swizzle = (param & D3DVS_SWIZZLE_MASK) >> D3DVS_SWIZZLE_SHIFT; > - DWORD swizzle_x = swizzle & 0x03; > - DWORD swizzle_y = (swizzle >> 2) & 0x03; > - DWORD swizzle_z = (swizzle >> 4) & 0x03; > - DWORD swizzle_w = (swizzle >> 6) & 0x03; > - /** > - * swizzle bits fields: > - * WWZZYYXX > - */ > - if ((D3DVS_NOSWIZZLE >> D3DVS_SWIZZLE_SHIFT) != swizzle) { /* ! D3DVS_NOSWIZZLE == 0xE4 << > D3DVS_SWIZZLE_SHIFT */ > - if (swizzle_x == swizzle_y && > - swizzle_x == swizzle_z && > - swizzle_x == swizzle_w) > - { > - sprintf(tmpReg, ".%c", swizzle_reg_chars[swizzle_x]); > - strcat(hwLine, tmpReg); > - } else { > - sprintf(tmpReg, ".%c%c%c%c", > - swizzle_reg_chars[swizzle_x], > - swizzle_reg_chars[swizzle_y], > - swizzle_reg_chars[swizzle_z], > - swizzle_reg_chars[swizzle_w]); > - strcat(hwLine, tmpReg); > - } > - } > + vshader_program_add_input_param_swizzle(param, is_color, hwLine); > } > } > > @@ -1540,7 +1560,7 @@ > char tmpChar[80]; > ++pToken; > sprintf(tmpLine, "ATTRIB "); > - vshader_program_add_param(*pToken, 0, tmpLine, This->namedArrays, > This->constantsUsedBitmap); > + vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, > This->constantsUsedBitmap); > sprintf(tmpChar," = %s", attribName); > strcat(tmpLine, tmpChar); > strcat(tmpLine,";\n"); > @@ -1592,12 +1612,12 @@ > } > } > if (curOpcode->num_params > 0) { > - vshader_program_add_param(*pToken, 0, tmpLine, This->namedArrays, > This->constantsUsedBitmap); > + vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, > This->constantsUsedBitmap); > > ++pToken; > for (i = 1; i < curOpcode->num_params; ++i) { > strcat(tmpLine, ","); > - vshader_program_add_param(*pToken, 1, tmpLine, This->namedArrays, > This->constantsUsedBitmap); > + vshader_program_add_param(*pToken, 1, 0, tmpLine, This->namedArrays, > This->constantsUsedBitmap); > ++pToken; > } > } > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.67 > diff -u -r1.67 wined3d_private.h > --- wined3d_private.h 29 Oct 2005 10:30:36 -0000 1.67 > +++ wined3d_private.h 2 Nov 2005 23:11:57 -0000 > @@ -161,6 +161,11 @@ > #define GL_EXTCALL(FuncName) (GLINFO_LOCATION.FuncName) > #define GL_VEND(_VendName) (GLINFO_LOCATION.gl_vendor == VENDOR_##_VendName ? TRUE : > FALSE) > > +#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) > +#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) > +#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xFF) > +#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xFF) > + > #define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xFF)) / 255.0f) > #define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xFF)) / 255.0f) > #define D3DCOLOR_B(dw) (((float) (((dw) >> 0) & 0xFF)) / 255.0f) > > > ___________________________________________________________ To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. http://uk.security.yahoo.com

1 0

Re: [Resend] printer dialog fixes part1 + french + other rcs
by Andreas Mohr Nov. 3, 2005

Nov. 3, 2005

Hi, On Thu, Nov 03, 2005 at 12:02:21PM +0100, Jonathan Ernst wrote: > Try2:This time, we just tell the user he needs to install a printer (we don't let him install one from Wine as it is not (won't ever?) be implemented). You really should have written: ...install a printer... *on your system.* Otherwise many of such people will fiddle with Windows printer drivers for hours completely in vain. Andreas

3 5