September 2007 - Wine-Commits

Jason Edmeades : cmd.exe: Allow = and , to be delimiters.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 118f3a6592887bc662e7a3204d41b4443f8fcd01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118f3a6592887bc662e7a3204… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:04 2007 +0100 cmd.exe: Allow = and , to be delimiters. --- programs/cmd/batch.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1e60848..37eafb1 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -134,7 +134,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN /******************************************************************* * WCMD_parameter - extract a parameter from a command line. * - * Returns the 'n'th space-delimited parameter on the command line (zero-based). + * Returns the 'n'th delimited parameter on the command line (zero-based). * Parameter is in static storage overwritten on the next call. * Parameters in quotes (and brackets) are handled. * Also returns a pointer to the location of the parameter in the command line. @@ -150,7 +150,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { p = param; while (TRUE) { switch (*s) { - case ' ': + case ' ': /* Skip leading spaces */ s++; break; case '"': @@ -176,15 +176,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { default: /* Only return where if it is for the right parameter */ if (where != NULL && i==n) *where = s; - while ((*s != '\0') && (*s != ' ')) { + while ((*s != '\0') && (*s != ' ') && (*s != ',') && (*s != '=')) { *p++ = *s++; } - if (i == n) { + if (i == n && (p!=param)) { *p = '\0'; return param; } + /* Skip double delimiters, eg. dir a.a,,,,,b.b */ + if (p != param) { param[0] = '\0'; i++; + } else { + s++; /* Skip delimter */ + } p = param; } }

1 0

Jason Edmeades : cmd.exe: Expand for variables at last with tilda modifications.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: b69241124ed6246dc43f4da73ec0861be7767c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69241124ed6246dc43f4da73… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:03 2007 +0100 cmd.exe: Expand for variables at last with tilda modifications. --- programs/cmd/batch.c | 34 ++++--- programs/cmd/builtins.c | 36 +-------- programs/cmd/wcmd.h | 3 +- programs/cmd/wcmdmain.c | 220 +++++++++++++++++++++++++++++----------------- 4 files changed, 161 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b69241124ed6246dc43f4…

1 0

Jason Edmeades : cmd.exe: Enhance FOR support.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: dc372175d438cf3f235683f5db198d00beece3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc372175d438cf3f235683f5d… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:02 2007 +0100 cmd.exe: Enhance FOR support. --- programs/cmd/builtins.c | 205 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 170 insertions(+), 35 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1228206..027f2bd 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -639,8 +639,6 @@ void WCMD_echo (const WCHAR *command) { * next cmdlist contains the DO cmd * following that is either brackets or && entries (as per if) * - * FIXME: We don't exhaustively check syntax. Any command which works in MessDOS - * will probably work here, but the reverse is not necessarily the case... */ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { @@ -648,29 +646,89 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WIN32_FIND_DATA fd; HANDLE hff; int i; - const WCHAR inW[] = {'i', 'n', '\0'}; - const WCHAR doW[] = {'d', 'o', ' ','\0'}; + const WCHAR inW[] = {'i', 'n', ' ', '\0'}; + const WCHAR doW[] = {'d', 'o', ' ', '\0'}; CMD_LIST *setStart, *thisSet, *cmdStart, *cmdEnd; WCHAR variable[4]; WCHAR *firstCmd; int thisDepth; - /* Check: - the first line includes the % variable name as first parm - we have been provided with more parts to the command - and there is at least some set data - and IN as the one after that */ - if (lstrcmpiW (WCMD_parameter (p, 1, NULL), inW) - || (*cmdList) == NULL - || (*cmdList)->nextcommand == NULL - || (param1[0] != '%') - || (strlenW(param1) > 3)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); - return; + WCHAR *curPos = p; + BOOL expandDirs = FALSE; + BOOL useNumbers = FALSE; + BOOL doRecursive = FALSE; + BOOL doFileset = FALSE; + LONG numbers[3] = {0,0,0}; /* Defaults to 0 in native */ + int itemNum; + CMD_LIST *thisCmdStart; + + + /* Handle optional qualifiers (multiple are allowed) */ + while (*curPos && *curPos == '/') { + WINE_TRACE("Processing qualifier at %s\n", wine_dbgstr_w(curPos)); + curPos++; + switch (toupperW(*curPos)) { + case 'D': curPos++; expandDirs = TRUE; break; + case 'L': curPos++; useNumbers = TRUE; break; + + /* Recursive is special case - /R can have an optional path following it */ + /* filenamesets are another special case - /F can have an optional options following it */ + case 'R': + case 'F': + { + BOOL isRecursive = (*curPos == 'R'); + + if (isRecursive) doRecursive = TRUE; + else doFileset = TRUE; + + /* Skip whitespace */ + curPos++; + while (*curPos && *curPos==' ') curPos++; + + /* Next parm is either qualifier, path/options or variable - + only care about it if it is the path/options */ + if (*curPos && *curPos != '/' && *curPos != '%') { + if (isRecursive) WINE_FIXME("/R needs to handle supplied root\n"); + else WINE_FIXME("/F needs to handle options\n"); + } + break; + } + default: + WINE_FIXME("for qualifier '%c' unhandled\n", *curPos); + curPos++; + } + + /* Skip whitespace between qualifiers */ + while (*curPos && *curPos==' ') curPos++; + } + + /* Skip whitespace before variable */ + while (*curPos && *curPos==' ') curPos++; + + /* Ensure line continues with variable */ + if (!*curPos || *curPos != '%') { + WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + return; + } + + /* Variable should follow */ + i = 0; + while (curPos[i] && curPos[i]!=' ') i++; + memcpy(&variable[0], curPos, i*sizeof(WCHAR)); + variable[i] = 0x00; + WINE_TRACE("Variable identified as %s\n", wine_dbgstr_w(variable)); + curPos = &curPos[i]; + + /* Skip whitespace before IN */ + while (*curPos && *curPos==' ') curPos++; + + /* Ensure line continues with IN */ + if (!*curPos || lstrcmpiW (curPos, inW)) { + WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + return; } /* Save away where the set of data starts and the variable */ - strcpyW(variable, param1); thisDepth = (*cmdList)->bracketDepth; *cmdList = (*cmdList)->nextcommand; setStart = (*cmdList); @@ -702,6 +760,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { cmdStart = *cmdList; cmdEnd = *cmdList; firstCmd = (*cmdList)->command + 3; /* Skip 'do ' */ + itemNum = 0; thisSet = setStart; /* Loop through all set entries */ @@ -721,27 +780,83 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { * otherwise do a literal substitution. */ static const WCHAR wildcards[] = {'*','?','\0'}; - CMD_LIST *thisCmdStart = cmdStart; + thisCmdStart = cmdStart; + + itemNum++; + WINE_TRACE("Processing for item %d '%s'\n", itemNum, wine_dbgstr_w(item)); + + if (!useNumbers && !doFileset) { + if (strpbrkW (item, wildcards)) { + hff = FindFirstFile (item, &fd); + if (hff != INVALID_HANDLE_VALUE) { + do { + BOOL isDirectory = FALSE; + + if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) isDirectory = TRUE; + + /* Handle as files or dirs appropriately, but ignore . and .. */ + if (isDirectory == expandDirs && + (strcmpW(fd.cFileName, dotdotW) != 0) && + (strcmpW(fd.cFileName, dotW) != 0)) + { + thisCmdStart = cmdStart; + WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName)); + WCMD_part_execute (&thisCmdStart, firstCmd, variable, + fd.cFileName, FALSE, TRUE); + } - WINE_TRACE("Processing for item '%s'\n", wine_dbgstr_w(item)); - if (strpbrkW (item, wildcards)) { - hff = FindFirstFile (item, &fd); - if (hff != INVALID_HANDLE_VALUE) { - do { - BOOL isDirectory = (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - if (!isDirectory) - { - thisCmdStart = cmdStart; - WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName)); - WCMD_part_execute (&thisCmdStart, firstCmd, variable, - fd.cFileName, FALSE, TRUE); + } while (FindNextFile(hff, &fd) != 0); + FindClose (hff); } + } else { + WCMD_part_execute(&thisCmdStart, firstCmd, variable, item, FALSE, TRUE); + } - } while (FindNextFile(hff, &fd) != 0); - FindClose (hff); - } - } else { - WCMD_part_execute(&thisCmdStart, firstCmd, variable, item, FALSE, TRUE); + } else if (useNumbers) { + /* Convert the first 3 numbers to signed longs and save */ + if (itemNum <=3) numbers[itemNum-1] = atolW(item); + /* else ignore them! */ + + } else if (doFileset) { + + HANDLE input; + + WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, + wine_dbgstr_w(item)); + + /* Open the file, read line by line and process */ + input = CreateFile (item, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + + if (input == INVALID_HANDLE_VALUE) { + WCMD_print_error (); + WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), item); + errorlevel = 1; + return; /* FOR loop aborts at first failure here */ + + } else { + + WCHAR buffer[MAXSTRING] = {'\0'}; + WCHAR *where, *parm; + + while (WCMD_fgets (buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + + /* Skip blank lines*/ + parm = WCMD_parameter (buffer, 0, &where); + WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), + wine_dbgstr_w(buffer)); + + if (where) { + thisCmdStart = cmdStart; + WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); + cmdEnd = thisCmdStart; + } + + buffer[0] = 0x00; + + } + CloseHandle (input); + } } WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd); @@ -753,6 +868,26 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { thisSet = thisSet->nextcommand; } + /* If /L is provided, now run the for loop */ + if (useNumbers) { + WCHAR thisNum[20]; + static const WCHAR fmt[] = {'%','d','\0'}; + + WINE_TRACE("FOR /L provided range from %d to %d step %d\n", + numbers[0], numbers[2], numbers[1]); + for (i=numbers[0]; + (numbers[1]<0)? i>numbers[2] : i<numbers[2]; + i=i + numbers[1]) { + + sprintfW(thisNum, fmt, i); + WINE_TRACE("Processing FOR number %s\n", wine_dbgstr_w(thisNum)); + + thisCmdStart = cmdStart; + WCMD_part_execute(&thisCmdStart, firstCmd, variable, thisNum, FALSE, TRUE); + cmdEnd = thisCmdStart; + } + } + /* When the loop ends, either something like a GOTO or EXIT /b has terminated all processing, OR it should be pointing to the end of && processing OR it should be pointing at the NULL end of bracket for the DO. The return

1 0

Chris Robinson : winex11: Don't assume just one on-screen pixel format.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: f825db6d0f2e07e35874842f859ec611ae1d5bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f825db6d0f2e07e35874842f8… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 11 13:16:54 2007 -0700 winex11: Don't assume just one on-screen pixel format. --- dlls/winex11.drv/opengl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6fffb80..b30ab37 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -149,6 +149,7 @@ static int WineGLExtensionListSize; static WineGLPixelFormat *WineGLPixelFormatList; static int WineGLPixelFormatListSize = 0; +static int WineGLPixelFormatOnScreenSize = 0; static void X11DRV_WineGL_LoadExtensions(void); static BOOL glxRequireVersion(int requiredVersion); @@ -854,6 +855,7 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); WineGLPixelFormatList[0].offscreenOnly = FALSE; WineGLPixelFormatListSize = 1; + WineGLPixelFormatOnScreenSize = 1; /* Fill the list with offscreen formats */ for(i=0; i<nCfgs; i++) { @@ -904,7 +906,7 @@ static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixe if(AllowOffscreen) *fmt_count = WineGLPixelFormatListSize; else - *fmt_count = 1; + *fmt_count = WineGLPixelFormatOnScreenSize; TRACE("Number of returned pixelformats=%d\n", *fmt_count);

1 0

Chris Robinson : winex11: Simplify ConvertPixelFormatWGLtoGLX.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 6c5b58a44adcb52fba92058be7f09df1b77743cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5b58a44adcb52fba92058be… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 11 13:09:14 2007 -0700 winex11: Simplify ConvertPixelFormatWGLtoGLX. --- dlls/winex11.drv/opengl.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index be215ae..6fffb80 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -894,22 +894,18 @@ static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixe /* Check if the pixelformat is valid. Note that it is legal to pass an invalid * iPixelFormat in case of probing the number of pixelformats. */ - if((iPixelFormat <= 0) || (iPixelFormat > WineGLPixelFormatListSize)) { - if(AllowOffscreen) - *fmt_count = WineGLPixelFormatListSize; - else - *fmt_count = 1; /* Only show the format of our main visual */ - } - else if(iPixelFormat == 1) { - res = &WineGLPixelFormatList[0]; - *fmt_count = 1; /* Only show the format of our main visual */ - } - else if((WineGLPixelFormatList[iPixelFormat-1].offscreenOnly == TRUE) && AllowOffscreen) { + if((iPixelFormat > 0) && (iPixelFormat <= WineGLPixelFormatListSize) && + ((WineGLPixelFormatList[iPixelFormat-1].offscreenOnly == FALSE) || + AllowOffscreen)) { res = &WineGLPixelFormatList[iPixelFormat-1]; - *fmt_count = WineGLPixelFormatListSize; TRACE("Returning FBConfig=%p for iPixelFormat=%d\n", res->fbconfig, iPixelFormat); } + if(AllowOffscreen) + *fmt_count = WineGLPixelFormatListSize; + else + *fmt_count = 1; + TRACE("Number of returned pixelformats=%d\n", *fmt_count); return res;

1 0

Stefan Dösinger : wined3d: Implement texbeml.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 5ab9d85c39cf430a32f28fd96ecb00e930e8c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab9d85c39cf430a32f28fd96… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 1 20:11:17 2007 +0200 wined3d: Implement texbeml. --- dlls/wined3d/baseshader.c | 7 ++++- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++++++++++++++--- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/state.c | 50 ++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_gl.h | 6 ++-- 6 files changed, 82 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ab9d85c39cf430a32f28…

1 0

Stefan Dösinger : wined3d: Implement mipmap auto generation.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 160258b6372f0fbebb4f5694bcd4c2684367ada7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160258b6372f0fbebb4f5694b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:56:15 2007 +0200 wined3d: Implement mipmap auto generation. --- dlls/d3d9/tests/texture.c | 68 +++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/basetexture.c | 38 +++++++++++++++ dlls/wined3d/device.c | 36 +++++++++++++- dlls/wined3d/directx.c | 10 ++++ include/wine/wined3d_gl.h | 8 +++ 6 files changed, 267 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=160258b6372f0fbebb4f5…

1 0

Chris Robinson : winex11: Don' t choose pixel formats with incorrect doublebuffer/stereo settings.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 5221921fa61fc3bcebff8435bc9e2ba6061c596f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5221921fa61fc3bcebff8435b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 11 13:00:13 2007 -0700 winex11: Don't choose pixel formats with incorrect doublebuffer/stereo settings. --- dlls/winex11.drv/opengl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f6216b6..be215ae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1035,6 +1035,8 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, bestFormat = i; continue; } + if(bestDBuffer != -1 && (dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) + continue; } /* Stereo, see the comments above. */ @@ -1052,6 +1054,8 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, bestFormat = i; continue; } + if(bestStereo != -1 && (dwFlags & PFD_STEREO) != bestStereo) + continue; } /* Below we will do a number of checks to select the 'best' pixelformat.

1 0

Stefan Dösinger : wined3d: Emulate D3DFMT_L6V5U5.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 0ed81b20afa640466b0f88335a4a35c3403cca7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed81b20afa640466b0f88335… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:41:03 2007 +0200 wined3d: Emulate D3DFMT_L6V5U5. --- dlls/wined3d/surface.c | 54 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4904f24..c41e2eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1576,6 +1576,20 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 3; break; + case WINED3DFMT_L6V5U5: + *convert = CONVERT_L6V5U5; + if(GL_SUPPORT(NV_TEXTURE_SHADER)) { + *target_bpp = 3; + /* Use format and types from table */ + } else { + /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ + *target_bpp = 2; + *format = GL_RGB; + *internal = GL_RGB5; + *type = GL_UNSIGNED_SHORT_5_6_5; + } + break; + case WINED3DFMT_X8L8V8U8: *convert = CONVERT_X8L8V8U8; *target_bpp = 4; @@ -1838,6 +1852,46 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN break; } + case CONVERT_L6V5U5: + { + unsigned int x, y; + WORD *Source; + unsigned char *Dest; + + if(GL_SUPPORT(NV_TEXTURE_SHADER)) { + /* This makes the gl surface bigger(24 bit instead of 16), but it works with + * fixed function and shaders without further conversion once the surface is + * loaded + */ + for(y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (unsigned char *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + short color = (*Source++); + unsigned char l = ((color >> 10) & 0xfc); + char v = ((color >> 5) & 0x3e); + char u = ((color ) & 0x1f); + + /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign + * and doubles the positive range. Thus shift left only once, gl does the 2nd + * shift. GL reads a signed value and converts it into an unsigned value. + */ + /* M */ Dest[2] = l << 1; + + /* Those are read as signed, but kept signed. Just left-shift 3 times to scale + * from 5 bit values to 8 bit values. + */ + /* V */ Dest[1] = v << 3; + /* U */ Dest[0] = u << 3; + Dest += 3; + } + } + } else { + FIXME("Add D3DFMT_L6V5U5 emulation using standard unsigned RGB and shaders\n"); + } + break; + } + case CONVERT_X8L8V8U8: { unsigned int x, y; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 472907f..d5131e1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -169,7 +169,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A4L4 ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE }, /* Bump mapping stuff */ {WINED3DFMT_V8U8 ,GL_DSDT8_NV ,GL_DSDT8_NV ,GL_DSDT_NV ,GL_BYTE }, - {WINED3DFMT_L6V5U5 ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT_5_5_5_1 }, + {WINED3DFMT_L6V5U5 ,GL_DSDT8_MAG8_NV ,GL_DSDT8_MAG8_NV ,GL_DSDT_MAG_NV ,GL_BYTE }, {WINED3DFMT_X8L8V8U8 ,GL_DSDT8_MAG8_INTENSITY8_NV ,GL_DSDT8_MAG8_INTENSITY8_NV ,GL_DSDT_MAG_VIB_NV ,GL_UNSIGNED_INT_8_8_S8_S8_REV_NV}, {WINED3DFMT_Q8W8V8U8 ,GL_SIGNED_RGBA8_NV ,GL_SIGNED_RGBA8_NV ,GL_RGBA ,GL_BYTE }, {WINED3DFMT_V16U16 ,GL_SIGNED_HILO16_NV ,GL_SIGNED_HILO16_NV ,GL_HILO_NV ,GL_SHORT }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 27ef553..b8cbbe7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1231,6 +1231,7 @@ typedef enum { CONVERT_CK_8888_ARGB, CONVERT_RGB32_888, CONVERT_V8U8, + CONVERT_L6V5U5, CONVERT_X8L8V8U8, CONVERT_Q8W8V8U8, CONVERT_V16U16,

1 0

Stefan Dösinger : wined3d: Disable W11V11U10 and A2W10V10U10.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 9ef5231566620e151c33c88b78cebf2ebc535d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef5231566620e151c33c88b7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:40:00 2007 +0200 wined3d: Disable W11V11U10 and A2W10V10U10. --- dlls/wined3d/directx.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774bf38..ce2c6cf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1688,7 +1688,8 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3D_OK; /***** - * Not supported for now: Bump mapping formats + * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or + * GL_NV_texture_shader), but advertized to make apps happy. * Enable some because games often fail when they are not available * and are still playable even without bump mapping */ @@ -1697,11 +1698,19 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt case WINED3DFMT_L6V5U5: case WINED3DFMT_X8L8V8U8: case WINED3DFMT_Q8W8V8U8: - case WINED3DFMT_W11V11U10: - case WINED3DFMT_A2W10V10U10: WARN_(d3d_caps)("[Not supported, but pretended to do]\n"); return WINED3D_OK; + /* Those are not advertized by the nvidia windows driver, and not + * supported natively by GL_NV_texture_shader or GL_ATI_envmap_bumpmap. + * WINED3DFMT_A2W10V10U10 could be loaded into shaders using the unsigned + * ARGB format if needed + */ + case WINED3DFMT_W11V11U10: + case WINED3DFMT_A2W10V10U10: + WARN_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + /***** * DXTN Formats: Handled above * WINED3DFMT_DXT1

1 0