September 2010 - Wine-commits

Vincent Povirk : windowscodecs: Decode CMYK/YCCK JPEG images as CMYK.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 116cf47df30ed3a0f5753b53954d69f1d2162c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116cf47df30ed3a0f5753b539… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 11 15:07:45 2010 -0500 windowscodecs: Decode CMYK/YCCK JPEG images as CMYK. --- dlls/windowscodecs/jpegformat.c | 26 ++++++++++++++++++++++++-- dlls/windowscodecs/regsvr.c | 1 + include/wincodec.idl | 2 ++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 41abe24..4923b20 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -266,10 +266,24 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * return E_FAIL; } - if (This->cinfo.jpeg_color_space == JCS_GRAYSCALE) + switch (This->cinfo.jpeg_color_space) + { + case JCS_GRAYSCALE: This->cinfo.out_color_space = JCS_GRAYSCALE; - else + break; + case JCS_RGB: + case JCS_YCbCr: This->cinfo.out_color_space = JCS_RGB; + break; + case JCS_CMYK: + case JCS_YCCK: + This->cinfo.out_color_space = JCS_CMYK; + break; + default: + ERR("Unknown JPEG color space %i\n", This->cinfo.jpeg_color_space); + LeaveCriticalSection(&This->lock); + return E_FAIL; + } if (!pjpeg_start_decompress(&This->cinfo)) { @@ -427,6 +441,8 @@ static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *if TRACE("(%p,%p)\n", iface, pPixelFormat); if (This->cinfo.out_color_space == JCS_RGB) memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); + else if (This->cinfo.out_color_space == JCS_CMYK) + memcpy(pPixelFormat, &GUID_WICPixelFormat32bppCMYK, sizeof(GUID)); else /* This->cinfo.out_color_space == JCS_GRAYSCALE */ memcpy(pPixelFormat, &GUID_WICPixelFormat8bppGray, sizeof(GUID)); return S_OK; @@ -457,6 +473,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; + else if (This->cinfo.out_color_space == JCS_CMYK) bpp = 32; else bpp = 24; stride = bpp * This->cinfo.output_width; @@ -514,6 +531,11 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } } } + + if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + /* Adobe JPEG's have inverted CMYK data. */ + for (i=0; i<data_size; i++) + This->image_data[i] ^= 0xff; } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index ef87a38..61ed96e 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1036,6 +1036,7 @@ static const BYTE jpeg_magic[] = {0xff, 0xd8, 0xff, 0xe0}; static GUID const * const jpeg_formats[] = { &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat32bppCMYK, &GUID_WICPixelFormat8bppGray, NULL }; diff --git a/include/wincodec.idl b/include/wincodec.idl index 2fe51d7..76aac1b 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -166,6 +166,8 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4fbe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") + typedef struct WICRect { INT X; INT Y;

1 0

Vincent Povirk : windowscodecs: Implement conversion from CMYK to RGB.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 9293ad7e1382ccf9ef95fd4c6a6067ed013ee56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9293ad7e1382ccf9ef95fd4c6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 11 16:03:12 2010 -0500 windowscodecs: Implement conversion from CMYK to RGB. --- dlls/windowscodecs/converter.c | 23 +++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index b1c0952..86cdf55 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -52,6 +52,7 @@ enum pixelformat { format_32bppBGRA, format_48bppRGB, format_64bppRGBA, + format_32bppCMYK, }; typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc, @@ -673,6 +674,27 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe return res; } return S_OK; + case format_32bppCMYK: + if (prc) + { + HRESULT res; + UINT x, y; + + res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(res)) return res; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE *pixel = pbBuffer+cbStride*y+4*x; + BYTE c=pixel[0], m=pixel[1], y=pixel[2], k=pixel[3]; + pixel[0] = (255-y)*(255-k)/255; /* blue */ + pixel[1] = (255-m)*(255-k)/255; /* green */ + pixel[2] = (255-c)*(255-k)/255; /* red */ + pixel[3] = 255; /* alpha */ + } + } + return S_OK; default: return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -710,6 +732,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, + {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL}, {0} }; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 61ed96e..ac84368 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1231,6 +1231,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat32bppCMYK, NULL };

1 0

Paul Vriens : msvcp80/msvcr90: Fix some typos in the forwards.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: ba5e80986462acd07ff2903329d1f060f5c48683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5e80986462acd07ff290332… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Sep 10 18:06:28 2010 +0200 msvcp80/msvcr90: Fix some typos in the forwards. --- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index a3e490e..eda3b7c 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5550,7 +5550,7 @@ @ cdecl -arch=win32 ?to_char_type@?$char_traits(a)D@std@@SADABH(a)Z(ptr) msvcp90.?to_char_type@?$char_traits(a)D@std@@SADABH(a)Z @ cdecl -arch=win64 ?to_char_type@?$char_traits(a)D@std@@SADAEBH(a)Z(ptr) msvcp90.?to_char_type@?$char_traits(a)D@std@@SADAEBH(a)Z @ cdecl -arch=win32 ?to_char_type@?$char_traits(a)G@std@@SAGABG(a)Z(ptr) msvcp90.?to_char_type@?$char_traits(a)G@std@@SAGABG(a)Z -@ cdecl -arch=win64 ?to_char_type@?$char_traits(a)G@std@@SAGAEBG(a)Z(ptr) msvcp90.to_char_type@?$char_traits(a)G@std@@SAGAEBG(a)Z +@ cdecl -arch=win64 ?to_char_type@?$char_traits(a)G@std@@SAGAEBG(a)Z(ptr) msvcp90.?to_char_type@?$char_traits(a)G@std@@SAGAEBG(a)Z @ cdecl -arch=win32 ?to_char_type@?$char_traits(a)_W@std@@SA_WABG(a)Z(ptr) msvcp90.?to_char_type@?$char_traits(a)_W@std@@SA_WABG(a)Z @ cdecl -arch=win64 ?to_char_type@?$char_traits(a)_W@std@@SA_WAEBG(a)Z(ptr) msvcp90.?to_char_type@?$char_traits(a)_W@std@@SA_WAEBG(a)Z @ cdecl -arch=win32 ?to_int_type@?$char_traits(a)D@std@@SAHABD(a)Z(ptr) msvcp90.?to_int_type@?$char_traits(a)D@std@@SAHABD(a)Z diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 650d0a7..01df496 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -564,7 +564,7 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ cdecl _hypotf(float float) msvcrt.hypotf +@ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow

1 0

Eric Pouech : dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 1e12e90cc9ff62a3fd4a6180326454fbedffa8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e12e90cc9ff62a3fd4a61803… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 11 12:14:59 2010 +0200 dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context. --- dlls/dbghelp/cpu_i386.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index a88b00f..7739d13 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -108,6 +108,9 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val; BOOL do_switch; unsigned deltapc = 1; +#ifdef __i386__ + CONTEXT _context; +#endif /* sanity check */ if (curr_mode >= stm_done) return FALSE; @@ -120,6 +123,21 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); +#ifdef __i386__ + if (!context) + { + /* setup a pseudo context for the rest of the code (esp. unwinding) */ + context = &_context; + memset(context, 0, sizeof(*context)); + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS; + if (frame->AddrPC.Mode != AddrModeFlat) context->SegCs = frame->AddrPC.Segment; + context->Eip = frame->AddrPC.Offset; + if (frame->AddrFrame.Mode != AddrModeFlat) context->SegSs = frame->AddrFrame.Segment; + context->Ebp = frame->AddrFrame.Offset; + if (frame->AddrStack.Mode != AddrModeFlat) context->SegSs = frame->AddrStack.Segment; + context->Esp = frame->AddrStack.Offset; + } +#endif if (curr_mode == stm_start) { THREAD_BASIC_INFORMATION info;

1 0

Andrew Talbot : dsound: Constify some variables.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: ab6ad77243790921b06bd5bed0dd8de539f4eccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6ad77243790921b06bd5bed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 11 17:02:12 2010 +0100 dsound: Constify some variables. --- dlls/dsound/propset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0645610..04c7b58 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -344,7 +344,7 @@ static HRESULT DSPROPERTY_EnumerateW( return S_OK; } -static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, +static BOOL DSPROPERTY_descWtoA(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA *dataA) { DWORD modlen, desclen; @@ -372,7 +372,7 @@ static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA return TRUE; } -static void DSPROPERTY_descWto1(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, +static void DSPROPERTY_descWto1(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) { data1->DeviceId = dataW->DeviceId;

1 0

Francois Gouget : d3dcompiler_43: Move asmparser_message() and asmshader_error() up to avoid forward declarations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 330520980ab371882793c897eccc108c2b8de4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330520980ab371882793c897e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:14 2010 +0200 d3dcompiler_43: Move asmparser_message() and asmshader_error() up to avoid forward declarations. --- dlls/d3dcompiler_43/asmshader.y | 94 +++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 4e22c95..db83ec3 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -32,9 +32,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader); struct asm_parser asm_ctx; -/* Needed lexer functions declarations */ -void asmshader_error(const char *s); -int asmshader_lex(void); +/* Error reporting function */ +void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { + va_list args; + char* newbuffer; + int rc, newsize; + + if(ctx->messagecapacity == 0) { + ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE); + if(ctx->messages == NULL) { + ERR("Error allocating memory for parser messages\n"); + return; + } + ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE; + } + + while(1) { + va_start(args, fmt); + rc = vsnprintf(ctx->messages + ctx->messagesize, + ctx->messagecapacity - ctx->messagesize, fmt, args); + va_end(args); + + if (rc < 0 || /* C89 */ + rc >= ctx->messagecapacity - ctx->messagesize) { /* C99 */ + /* Resize the buffer */ + newsize = ctx->messagecapacity * 2; + newbuffer = asm_realloc(ctx->messages, newsize); + if(newbuffer == NULL){ + ERR("Error reallocating memory for parser messages\n"); + return; + } + ctx->messages = newbuffer; + ctx->messagecapacity = newsize; + } else { + ctx->messagesize += rc; + return; + } + } +} + +void asmshader_error(char const *s) { + asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s); + set_parse_status(&asm_ctx, PARSE_ERR); +} void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { /* We can have an additional offset without true relative addressing @@ -53,6 +93,10 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { } } +/* Needed lexer functions declarations */ +int asmshader_lex(void); + + %} %union { @@ -1660,50 +1704,6 @@ predicate: '(' REG_PREDICATE swizzle ')' %% -void asmshader_error (char const *s) { - asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s); - set_parse_status(&asm_ctx, PARSE_ERR); -} - -/* Error reporting function */ -void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { - va_list args; - char* newbuffer; - int rc, newsize; - - if(ctx->messagecapacity == 0) { - ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE); - if(ctx->messages == NULL) { - ERR("Error allocating memory for parser messages\n"); - return; - } - ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE; - } - - while(1) { - va_start(args, fmt); - rc = vsnprintf(ctx->messages + ctx->messagesize, - ctx->messagecapacity - ctx->messagesize, fmt, args); - va_end(args); - - if (rc < 0 || /* C89 */ - rc >= ctx->messagecapacity - ctx->messagesize) { /* C99 */ - /* Resize the buffer */ - newsize = ctx->messagecapacity * 2; - newbuffer = asm_realloc(ctx->messages, newsize); - if(newbuffer == NULL){ - ERR("Error reallocating memory for parser messages\n"); - return; - } - ctx->messages = newbuffer; - ctx->messagecapacity = newsize; - } else { - ctx->messagesize += rc; - return; - } - } -} - /* New status is the worst between current status and parameter value */ void set_parse_status(struct asm_parser *ctx, enum parse_status status) { if(status == PARSE_ERR) ctx->status = PARSE_ERR;

1 0

Francois Gouget : d3dcompiler_43: Make asmshader_error() and set_rel_reg() static.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 7d9cd71db77959a2d8734cecfc71cc503df40681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9cd71db77959a2d8734cecf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:39 2010 +0200 d3dcompiler_43: Make asmshader_error() and set_rel_reg() static. --- dlls/d3dcompiler_43/asmshader.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index db83ec3..5dc0914 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -71,12 +71,12 @@ void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { } } -void asmshader_error(char const *s) { +static void asmshader_error(char const *s) { asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s); set_parse_status(&asm_ctx, PARSE_ERR); } -void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { +static void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { /* We can have an additional offset without true relative addressing * ex. c2[ 4 ] */ reg->regnum += rel->additional_offset;

1 0

Francois Gouget : shell32/tests: Make create_commdlgbrowser3() static.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 75bb4359d70c785de2f924fca889e730230456be URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bb4359d70c785de2f924fca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:46 2010 +0200 shell32/tests: Make create_commdlgbrowser3() static. --- dlls/shell32/tests/ebrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c39e17c..faaf6c7 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -411,7 +411,7 @@ static const ICommDlgBrowser3Vtbl cdbvtbl = ICommDlgBrowser3_fnOnPreviewCreated }; -ICommDlgBrowser3Impl *create_commdlgbrowser3(void) +static ICommDlgBrowser3Impl *create_commdlgbrowser3(void) { ICommDlgBrowser3Impl *cdb;

1 0

Francois Gouget : usp10: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 0d3b4b3c0c3b1a1372bc501f2747e74f5760aa4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3b4b3c0c3b1a1372bc501f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 13 10:45:50 2010 +0200 usp10: Add a trailing '\n' to a TRACE() call. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c103cef..65f6d2c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -688,7 +688,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || New_Script != pItems[index].a.eScript || New_Script == Script_Control) { - TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d ", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); + TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); if (strength && strength[cnt] != 0) str = strength[cnt];

1 0

Roderick Colenbrander : wined3d: Add legacy ATI cards.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 27fb5e2d74858dc01a80a6001269d01a0d1c3442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb5e2d74858dc01a80a6001… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 11 03:59:46 2010 +0200 wined3d: Add legacy ATI cards. --- dlls/wined3d/directx.c | 12 +++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4269052..70ddc15 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -993,7 +993,11 @@ static const struct driver_version_information driver_version_table[] = { /* ATI * - Radeon HD2x00 (R600) and up supported by current drivers. - * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) */ + * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) + * - Radeon 7xxx (R100) - 9250 (RV250) supported upto Catalyst 6.11 (XP) + * - Rage 128 supported upto XP, latest official build 6.13.3279 dated October 2001 */ + {DRIVER_ATI_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, + {DRIVER_ATI_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_ATI_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_ATI_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, {DRIVER_ATI_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, @@ -1075,7 +1079,11 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6 }, /* ATI cards */ + {HW_VENDOR_ATI, CARD_ATI_RAGE_128PRO, "ATI Rage Fury", DRIVER_ATI_RAGE_128PRO, }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_7200, "ATI RADEON 7200 SERIES", DRIVER_ATI_R100, }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_8500, "ATI RADEON 8500 SERIES", DRIVER_ATI_R100, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", DRIVER_ATI_R300, }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_XPRESS_200M, "ATI RADEON XPRESS 200M Series", DRIVER_ATI_R300, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X700, "ATI Radeon X700 SE", DRIVER_ATI_R300, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X1600, "ATI Radeon X1600 Series", DRIVER_ATI_R300, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2350, "ATI Mobility Radeon HD 2350", DRIVER_ATI_R600, }, @@ -1095,8 +1103,6 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900 }, {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950 }, {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000 } - - /* TODO: Add information about legacy ATI hardware and other cards. */ }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61a97f5..61e58a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1239,6 +1239,8 @@ typedef struct WineD3D_PixelFormat * R3xx, R4xx and R5xx GPUs. */ enum wined3d_display_driver { + DRIVER_ATI_RAGE_128PRO, + DRIVER_ATI_R100, DRIVER_ATI_R300, DRIVER_ATI_R600, DRIVER_INTEL_GMA800,

1 0