September 2010 - Wine-commits

Vincent Povirk : windowscodecs: Override libjpeg's default error handling.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 1cb7e6f87986e3990236776ef06cd43041ba029f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb7e6f87986e3990236776ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 11 13:59:25 2010 -0500 windowscodecs: Override libjpeg's default error handling. --- dlls/windowscodecs/jpegformat.c | 59 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 4923b20..5243d94 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <setjmp.h> #ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ @@ -54,6 +55,7 @@ #include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +WINE_DECLARE_DEBUG_CHANNEL(jpeg); #ifdef SONAME_LIBJPEG @@ -91,6 +93,38 @@ static void *load_libjpeg(void) return libjpeg_handle; } +static void error_exit_fn(j_common_ptr cinfo) +{ + char message[JMSG_LENGTH_MAX]; + if (ERR_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + ERR_(jpeg)("%s\n", message); + } + longjmp(*(jmp_buf*)cinfo->client_data, 1); +} + +static void emit_message_fn(j_common_ptr cinfo, int msg_level) +{ + char message[JMSG_LENGTH_MAX]; + + if (msg_level < 0 && ERR_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + ERR_(jpeg)("%s\n", message); + } + else if (msg_level == 0 && WARN_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + WARN_(jpeg)("%s\n", message); + } + else if (msg_level > 0 && TRACE_ON(jpeg)) + { + cinfo->err->format_message(cinfo, message); + TRACE_(jpeg)("%s\n", message); + } +} + typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; @@ -227,6 +261,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * JpegDecoder *This = (JpegDecoder*)iface; int ret; LARGE_INTEGER seek; + jmp_buf jmpbuf; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -237,7 +272,20 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * return WINCODEC_ERR_WRONGSTATE; } - This->cinfo.err = pjpeg_std_error(&This->jerr); + pjpeg_std_error(&This->jerr); + + This->jerr.error_exit = error_exit_fn; + This->jerr.emit_message = emit_message_fn; + + This->cinfo.err = &This->jerr; + + This->cinfo.client_data = &jmpbuf; + + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + return E_FAIL; + } pjpeg_CreateDecompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); @@ -470,6 +518,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, UINT stride; UINT data_size; UINT max_row_needed; + jmp_buf jmpbuf; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; @@ -494,6 +543,14 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } } + This->cinfo.client_data = &jmpbuf; + + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + return E_FAIL; + } + while (max_row_needed > This->cinfo.output_scanline) { UINT first_scanline = This->cinfo.output_scanline;

1 0

Matteo Bruni : d3dcompiler: D3DPreprocess implementation.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 5504395697e3e7986e63cea22ee53f5fe0698d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5504395697e3e7986e63cea22… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Sep 9 18:41:39 2010 +0200 d3dcompiler: D3DPreprocess implementation. --- dlls/d3dcompiler_43/compiler.c | 210 +++++++++++++++++++------------ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- include/d3dcompiler.h | 4 + 3 files changed, 132 insertions(+), 84 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 43a5a3a..45f85ad 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -309,6 +309,86 @@ static int wpp_close_output(void) return 1; } +static HRESULT preprocess_shader(const void *data, SIZE_T data_size, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **error_messages) +{ + int ret; + HRESULT hr = S_OK; + const D3D_SHADER_MACRO *def = defines; + + static const struct wpp_callbacks wpp_callbacks = + { + wpp_lookup_mem, + wpp_open_mem, + wpp_close_mem, + wpp_read_mem, + wpp_write_mem, + wpp_error, + wpp_warning, + }; + + if (def != NULL) + { + while (def->Name != NULL) + { + wpp_add_define(def->Name, def->Definition); + def++; + } + } + current_include = include; + includes_size = 0; + + wpp_output_size = wpp_output_capacity = 0; + wpp_output = NULL; + + wpp_set_callbacks(&wpp_callbacks); + wpp_messages_size = wpp_messages_capacity = 0; + wpp_messages = NULL; + current_shader.buffer = data; + current_shader.size = data_size; + + ret = wpp_parse("", NULL); + if (!wpp_close_output()) + ret = 1; + if (ret) + { + TRACE("Error during shader preprocessing\n"); + if (wpp_messages) + { + int size; + ID3DBlob *buffer; + + TRACE("Preprocessor messages:\n%s", wpp_messages); + + if (error_messages) + { + size = strlen(wpp_messages) + 1; + hr = D3DCreateBlob(size, &buffer); + if (FAILED(hr)) + goto cleanup; + CopyMemory(ID3D10Blob_GetBufferPointer(buffer), wpp_messages, size); + *error_messages = buffer; + } + } + if (data) + TRACE("Shader source:\n%s\n", debugstr_an(data, data_size)); + hr = E_FAIL; + } + +cleanup: + /* Remove the previously added defines */ + if (defines != NULL) + { + while (defines->Name != NULL) + { + wpp_del_define(defines->Name); + defines++; + } + } + HeapFree(GetProcessHeap(), 0, wpp_messages); + return hr; +} + static HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, LPD3DBLOB* ppShader, LPD3DBLOB* ppErrorMsgs) { @@ -396,97 +476,24 @@ static HRESULT assemble_shader(const char *preprocShader, const char *preprocMes return S_OK; } -HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename, - const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT flags, - ID3DBlob **shader, ID3DBlob **error_messages){ - int ret; +HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT flags, + ID3DBlob **shader, ID3DBlob **error_messages) +{ HRESULT hr; - CONST D3D_SHADER_MACRO* def = defines; - - static const struct wpp_callbacks wpp_callbacks = { - wpp_lookup_mem, - wpp_open_mem, - wpp_close_mem, - wpp_read_mem, - wpp_write_mem, - wpp_error, - wpp_warning, - }; EnterCriticalSection(&wpp_mutex); /* TODO: flags */ - if(flags) FIXME("flags: %x\n", flags); - - if(def != NULL) - { - while(def->Name != NULL) - { - wpp_add_define(def->Name, def->Definition); - def++; - } - } - current_include = include; - includes_size = 0; - - if(shader) *shader = NULL; - if(error_messages) *error_messages = NULL; - wpp_output_size = wpp_output_capacity = 0; - wpp_output = NULL; - - /* Preprocess shader */ - wpp_set_callbacks(&wpp_callbacks); - wpp_messages_size = wpp_messages_capacity = 0; - wpp_messages = NULL; - current_shader.buffer = data; - current_shader.size = datasize; + if (flags) FIXME("flags %x\n", flags); - ret = wpp_parse("", NULL); - if(!wpp_close_output()) - ret = 1; - if(ret) - { - TRACE("Error during shader preprocessing\n"); - if(wpp_messages) - { - int size; - LPD3DBLOB buffer; + if (shader) *shader = NULL; + if (error_messages) *error_messages = NULL; - TRACE("Preprocessor messages:\n"); - TRACE("%s", wpp_messages); + hr = preprocess_shader(data, datasize, defines, include, error_messages); + if (SUCCEEDED(hr)) + hr = assemble_shader(wpp_output, wpp_messages, shader, error_messages); - if(error_messages) - { - size = strlen(wpp_messages) + 1; - hr = D3DCreateBlob(size, &buffer); - if(FAILED(hr)) goto cleanup; - CopyMemory(ID3D10Blob_GetBufferPointer(buffer), wpp_messages, size); - *error_messages = buffer; - } - } - if(data) - { - TRACE("Shader source:\n"); - TRACE("%s\n", debugstr_an(data, datasize)); - } - hr = D3DXERR_INVALIDDATA; - goto cleanup; - } - - hr = assemble_shader(wpp_output, wpp_messages, shader, error_messages); - -cleanup: - /* Remove the previously added defines */ - if(defines != NULL) - { - while(defines->Name != NULL) - { - wpp_del_define(defines->Name); - defines++; - } - } - HeapFree(GetProcessHeap(), 0, wpp_messages); HeapFree(GetProcessHeap(), 0, wpp_output); LeaveCriticalSection(&wpp_mutex); return hr; @@ -508,3 +515,40 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena return D3DERR_INVALIDCALL; } + +HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, + ID3DBlob **shader, ID3DBlob **error_messages) +{ + HRESULT hr; + ID3DBlob *buffer; + + if (!data) + return E_INVALIDARG; + + EnterCriticalSection(&wpp_mutex); + + if (shader) *shader = NULL; + if (error_messages) *error_messages = NULL; + + hr = preprocess_shader(data, size, defines, include, error_messages); + + if (SUCCEEDED(hr)) + { + if (shader) + { + hr = D3DCreateBlob(wpp_output_size, &buffer); + if (FAILED(hr)) + goto cleanup; + CopyMemory(ID3D10Blob_GetBufferPointer(buffer), wpp_output, wpp_output_size); + *shader = buffer; + } + else + hr = E_INVALIDARG; + } + +cleanup: + HeapFree(GetProcessHeap(), 0, wpp_output); + LeaveCriticalSection(&wpp_mutex); + return hr; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index ef57d52..ecd2d04 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -11,7 +11,7 @@ @ stub D3DGetInputAndOutputSignatureBlob @ stub D3DGetInputSignatureBlob @ stub D3DGetOutputSignatureBlob -@ stub D3DPreprocess +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReflect @ stub D3DReturnFailure1 @ stub D3DStripShader diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 9929cba..3a44d7f 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -47,4 +47,8 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, + ID3DBlob **shader, ID3DBlob **error_messages); + #endif

1 0

Matteo Bruni : d3dcompiler: Add D3DPreprocess tests.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 87f00d34fdb5a5f7c0ab0bf4391e53c86920d728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f00d34fdb5a5f7c0ab0bf43… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Sep 9 18:41:39 2010 +0200 d3dcompiler: Add D3DPreprocess tests. --- dlls/d3dcompiler_43/tests/asm.c | 164 +++++++++++++++++++++++++++++++++++---- 1 files changed, 147 insertions(+), 17 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 0b9ca0c..08fff44 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -500,15 +500,15 @@ static void ps_1_3_test(void) { "texm3x3pad_x2 t2, t0\n" "texm3x3tex_x2 t3, t0\n", {0xffff0103, 0x00000042, 0xb00f0000, 0x00000049, 0xb10f0001, 0xb0e40000, - 0x00000049, 0xb10f0002, 0xb0e40000, 0x0000004a, 0xb10f0003, 0xb0e40000, - 0x0000ffff} + 0x00000049, 0xb10f0002, 0xb0e40000, 0x0000004a, 0xb10f0003, 0xb0e40000, + 0x0000ffff} }, { /* shader 35 */ "ps_1_3\n" "tex t0\n" "texdp3tex_x8 t1, t0\n", {0xffff0103, 0x00000042, 0xb00f0000, 0x00000053, 0xb30f0001, 0xb0e40000, - 0x0000ffff} + 0x0000ffff} }, }; @@ -1227,7 +1227,7 @@ static void ps_3_0_test(void) { "ps_3_0\n" "texldd_pp r0, r1, r2, r3, r4\n", {0xffff0300, 0x0500005d, 0x802f0000, 0x80e40001, 0x80e40002, 0x80e40003, - 0x80e40004, 0x0000ffff} + 0x80e40004, 0x0000ffff} }, { /* shader 10 */ "ps_3_0\n" @@ -1409,10 +1409,10 @@ static void failure_test(void) { hr = D3DAssemble(tests[i], strlen(tests[i]), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "Failure test, shader %d: " + ok(hr == D3DXERR_INVALIDDATA, "Failure test, shader %d: " "expected D3DAssemble failure with D3DXERR_INVALIDDATA, " "got 0x%x - %d\n", i, hr, hr & 0x0000FFFF); - if(messages) { + if(messages) { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1420,32 +1420,55 @@ static void failure_test(void) { DWORD *res = ID3D10Blob_GetBufferPointer(shader); dump_shader(res); ID3D10Blob_Release(shader); - } + } } } -static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, - D3D_INCLUDE_TYPE include_type, - LPCSTR filename, LPCVOID parent_data, - LPCVOID *data, UINT *bytes) { +static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ char *buffer; char include[] = "#define REGISTER r0\nvs.1.1\n"; + char include2[] = "#include \"incl3.vsh\"\n"; + char include3[] = "vs.1.1\n"; - trace("filename = %s\n",filename); + trace("filename %s\n", filename); + trace("parent_data (%p) -> %s\n", parent_data, (char *)parent_data); + + if (!strcmp(filename, "incl.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); + CopyMemory(buffer, include, sizeof(include)); + *bytes = sizeof(include); + } + else if (!strcmp(filename, "incl3.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include3)); + CopyMemory(buffer, include3, sizeof(include3)); + *bytes = sizeof(include3); + /* Also check for the correct parent_data content */ + ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value\n"); + } + else + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); + CopyMemory(buffer, include2, sizeof(include2)); + *bytes = sizeof(include2); + } - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); - CopyMemory(buffer, include, sizeof(include)); *data = buffer; - *bytes = sizeof(include); + return S_OK; } -static HRESULT WINAPI testD3DInclude_close(ID3DInclude *iface, LPCVOID data) { +static HRESULT WINAPI testD3DInclude_close(ID3DInclude *iface, const void *data) +{ HeapFree(GetProcessHeap(), 0, (LPVOID)data); return S_OK; } -static const struct ID3DIncludeVtbl D3DInclude_Vtbl = { +static const struct ID3DIncludeVtbl D3DInclude_Vtbl = +{ testD3DInclude_open, testD3DInclude_close }; @@ -1538,6 +1561,111 @@ static void assembleshader_test(void) { if(shader) ID3D10Blob_Release(shader); } +static void d3dpreprocess_test(void) +{ + const char test1[] = + { + "vs.1.1\n" + "mov DEF2, v0\n" + }; + const char testshader[] = + { + "#include \"incl.vsh\"\n" + "mov REGISTER, v0\n" + }; + const char testshader2[] = + { + "#include \"incl2.vsh\"\n" + "mov REGISTER, v0\n" + }; + HRESULT hr; + ID3DBlob *shader, *messages; + D3D_SHADER_MACRO defines[] = + { + { + "DEF1", "10 + 15" + }, + { + "DEF2", "r0" + }, + { + NULL, NULL + } + }; + struct D3DIncludeImpl include; + + /* pDefines test */ + shader = NULL; + messages = NULL; + hr = D3DPreprocess(test1, strlen(test1), NULL, + defines, NULL, &shader, &messages); + ok(hr == S_OK, "pDefines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); + + /* NULL messages test */ + shader = NULL; + hr = D3DPreprocess(test1, strlen(test1), NULL, + defines, NULL, &shader, NULL); + ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (shader) ID3D10Blob_Release(shader); + + /* NULL shader test */ + messages = NULL; + hr = D3DPreprocess(test1, strlen(test1), NULL, + defines, NULL, NULL, &messages); + ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + + /* pInclude test */ + shader = NULL; + messages = NULL; + include.lpVtbl = &D3DInclude_Vtbl; + hr = D3DPreprocess(testshader, strlen(testshader), NULL, + NULL, (ID3DInclude *)&include, &shader, &messages); + ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); + + /* recursive #include test */ + shader = NULL; + messages = NULL; + hr = D3DPreprocess(testshader2, strlen(testshader2), NULL, + NULL, (ID3DInclude *)&include, &shader, &messages); + ok(hr == S_OK, "D3DPreprocess test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("recursive D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); + + /* NULL shader tests */ + shader = NULL; + messages = NULL; + hr = D3DPreprocess(NULL, 0, NULL, + NULL, NULL, &shader, &messages); + ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); +} + START_TEST(asm) { preproc_test(); @@ -1555,4 +1683,6 @@ START_TEST(asm) failure_test(); assembleshader_test(); + + d3dpreprocess_test(); }

1 0

Matteo Bruni : d3dx9: D3DXPreprocessShader implementation with tests.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 8d7a0d5027dfc85d0885cfa6a2a741af831c95ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7a0d5027dfc85d0885cfa6a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Sep 9 18:41:39 2010 +0200 d3dx9: D3DXPreprocessShader implementation with tests. --- dlls/d3dx9_36/d3dx9_36.spec | 10 ++-- dlls/d3dx9_36/shader.c | 117 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/asm.c | 132 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 33 +++++++++++ 4 files changed, 286 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d7a0d5027dfc85d0885c…

1 0

Eric Pouech : kernel32: Fixed a couple of cases where the console was not reset in cooked mode after a bare console has been created .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: a2322e3735b04071fea80c6435da33e315b3b1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2322e3735b04071fea80c643… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Sep 10 21:50:19 2010 +0200 kernel32: Fixed a couple of cases where the console was not reset in cooked mode after a bare console has been created. --- dlls/kernel32/console.c | 103 ++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel_main.c | 1 + dlls/kernel32/kernel_private.h | 1 + server/console.c | 33 ------------- 4 files changed, 105 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 9ac7018..aa7f105 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -42,6 +42,8 @@ # include <termios.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -146,6 +148,96 @@ static BOOL get_console_mode(HANDLE conin, DWORD* mode, BOOL* bare) return ret; } +static struct termios S_termios; /* saved termios for bare consoles */ +static BOOL S_termios_raw /* = FALSE */; + +/* The scheme for bare consoles for managing raw/cooked settings is as follows: + * - a bare console is created for all CUI programs started from command line (without + * wineconsole) (let's call those PS) + * - of course, every child of a PS which requires console inheritance will get it + * - the console termios attributes are saved at the start of program which is attached to be + * bare console + * - if any program attached to a bare console requests input from console, the console is + * turned into raw mode + * - when the program which created the bare console (the program started from command line) + * exits, it will restore the console termios attributes it saved at startup (this + * will put back the console into cooked mode if it had been put in raw mode) + * - if any other program attached to this bare console is still alive, the Unix shell will put + * it in the background, hence forbidding access to the console. Therefore, reading console + * input will not be available when the bare console creator has died. + * FIXME: This is a limitation of current implementation + */ + +/* returns the fd for a bare console (-1 otherwise) */ +static int get_console_bare_fd(HANDLE hin) +{ + BOOL is_bare; + int fd; + + if (get_console_mode(hin, NULL, &is_bare) && is_bare && + wine_server_handle_to_fd(hin, 0, &fd, NULL) == STATUS_SUCCESS) + return fd; + return -1; +} + +static BOOL save_console_mode(HANDLE hin) +{ + int fd; + BOOL ret; + + if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; + ret = tcgetattr(fd, &S_termios) >= 0; + close(fd); + return ret; +} + +static BOOL put_console_into_raw_mode(HANDLE hin) +{ + int fd; + + if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; + + RtlEnterCriticalSection(&CONSOLE_CritSect); + if (!S_termios_raw) + { + struct termios term = S_termios; + + term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN); + term.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); + term.c_cflag &= ~(CSIZE | PARENB); + term.c_cflag |= CS8; + /* FIXME: we should actually disable output processing here + * and let kernel32/console.c do the job (with support of enable/disable of + * processed output) + */ + /* term.c_oflag &= ~(OPOST); */ + term.c_cc[VMIN] = 1; + term.c_cc[VTIME] = 0; + S_termios_raw = tcsetattr(fd, TCSANOW, &term) >= 0; + } + RtlLeaveCriticalSection(&CONSOLE_CritSect); + + close(fd); + return S_termios_raw; +} + +/* put back the console in cooked mode iff we're the process which created the bare console + * we don't test if thie process has set the console in raw mode as it could be one of its + * child who did it + */ +static BOOL restore_console_mode(HANDLE hin) +{ + int fd; + BOOL ret; + + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) + return TRUE; + if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; + ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0; + close(fd); + return ret; +} + /****************************************************************************** * GetConsoleWindow [KERNEL32.@] Get hwnd of the console window. * @@ -1080,6 +1172,7 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R if (bare) { + put_console_into_raw_mode(handle); if (WaitForSingleObject(GetConsoleInputWaitHandle(), 0) != WAIT_OBJECT_0) { ret = bare_console_fetch_input(handle, timeout); @@ -2893,6 +2986,7 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) { + memset(&S_termios, 0, sizeof(S_termios)); if (params->ConsoleHandle == KERNEL32_CONSOLE_SHELL) { HANDLE conin; @@ -2956,7 +3050,10 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) if (!params->hStdInput) params->hStdInput = INVALID_HANDLE_VALUE; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) + { params->hStdInput = console_handle_map(params->hStdInput); + save_console_mode(params->hStdInput); + } if (!params->hStdOutput) params->hStdOutput = INVALID_HANDLE_VALUE; @@ -2970,3 +3067,9 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) return TRUE; } + +BOOL CONSOLE_Exit(void) +{ + /* the console is in raw mode, put it back in cooked mode */ + return restore_console_mode(GetStdHandle(STD_INPUT_HANDLE)); +} diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 41647dd..42d038e 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -138,6 +138,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return process_attach( hinst ); case DLL_PROCESS_DETACH: WritePrivateProfileSectionW( NULL, NULL, NULL ); + CONSOLE_Exit(); break; } return TRUE; diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index f741a92..f180e7d 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -29,6 +29,7 @@ HANDLE WINAPI DuplicateConsoleHandle(HANDLE, DWORD, BOOL, DWORD); BOOL WINAPI CloseConsoleHandle(HANDLE handle); HANDLE WINAPI GetConsoleInputWaitHandle(void); BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params); +BOOL CONSOLE_Exit(void); static inline BOOL is_console_handle(HANDLE h) { diff --git a/server/console.c b/server/console.c index 2ca6bd4..6616bd2 100644 --- a/server/console.c +++ b/server/console.c @@ -28,9 +28,6 @@ #include <stdio.h> #include <unistd.h> #include <signal.h> -#ifdef HAVE_TERMIOS_H -#include <termios.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -66,7 +63,6 @@ struct console_input user_handle_t win; /* window handle if backend supports it */ struct event *event; /* event to wait on for input queue */ struct fd *fd; /* for bare console, attached input fd */ - struct termios termios; /* for bare console, saved termio info */ }; static void console_input_dump( struct object *obj, int verbose ); @@ -328,38 +324,12 @@ static struct object *create_console_input( struct thread* renderer, int fd ) } if (fd != -1) /* bare console */ { - struct termios term; - if (!(console_input->fd = create_anonymous_fd( &console_fd_ops, fd, &console_input->obj, FILE_SYNCHRONOUS_IO_NONALERT ))) { release_object( console_input ); return NULL; } - if (tcgetattr(fd, &term) < 0) - { - release_object( console_input ); - set_error( STATUS_INVALID_HANDLE ); - return NULL; - } - console_input->termios = term; - term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN); - term.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); - term.c_cflag &= ~(CSIZE | PARENB); - term.c_cflag |= CS8; - /* FIXME: we should actually disable output processing here - * and let kernel32/console.c do the job (with support of enable/disable of - * processed output) - */ - /* term.c_oflag &= ~(OPOST); */ - term.c_cc[VMIN] = 1; - term.c_cc[VTIME] = 0; - if (tcsetattr(fd, TCSANOW, &term) < 0) - { - release_object( console_input ); - set_error( STATUS_INVALID_HANDLE ); - return NULL; - } allow_fd_caching( console_input->fd ); } @@ -1129,10 +1099,7 @@ static void console_input_destroy( struct object *obj ) } release_object( console_in->event ); if (console_in->fd) - { - tcsetattr(get_unix_fd(console_in->fd), TCSANOW, &console_in->termios); release_object( console_in->fd ); - } for (i = 0; i < console_in->history_size; i++) free( console_in->history[i] );

1 0

Mariusz Pluciński : include: Add LOCALE_INVARIANT definition.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: cde2a4150ca9f4056a7dd35e3abcf5414010805a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde2a4150ca9f4056a7dd35e3… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Sep 13 13:30:33 2010 +0200 include: Add LOCALE_INVARIANT definition. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e3ccd8d..b1f98ff 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1950,6 +1950,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define LOCALE_SYSTEM_DEFAULT (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT)) #define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) #define LOCALE_NEUTRAL (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT)) +#define LOCALE_INVARIANT (MAKELCID(MAKELANGID(LANG_INVARIANT,SUBLANG_NEUTRAL),SORT_DEFAULT)) #define UNREFERENCED_PARAMETER(u) (void)(u) #define DBG_UNREFERENCED_PARAMETER(u) (void)(u)

1 0

Roderick Colenbrander : wined3d: Move video memory override to init_driver_info.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 4baf7a52f03f1c355238e472f769738d32da2a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baf7a52f03f1c355238e472f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 11 03:59:48 2010 +0200 wined3d: Move video memory override to init_driver_info. --- dlls/wined3d/directx.c | 12 +++++++----- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ae61d9a..b6369bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1225,6 +1225,12 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } } + if (wined3d_settings.emulated_textureram) + { + TRACE_(d3d_caps)("Overriding amount of video memory with: %d byte\n", wined3d_settings.emulated_textureram); + driver_info->vidmem = wined3d_settings.emulated_textureram; + } + /* Try to obtain driver version information for the current Windows version. This fails in * some cases: * - the gpu is not available on the currently selected OS version: @@ -5209,11 +5215,7 @@ static BOOL InitAdapters(IWineD3DImpl *This) hdc = fake_gl_ctx.dc; - /* Use the VideoRamSize registry setting when set */ - if(wined3d_settings.emulated_textureram) - adapter->TextureRam = wined3d_settings.emulated_textureram; - else - adapter->TextureRam = adapter->driver_info.vidmem; + adapter->TextureRam = adapter->driver_info.vidmem; adapter->UsedTextureRam = 0; TRACE("Emulating %dMB of texture ram\n", adapter->TextureRam/(1024*1024)); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2b06b36..6dea98a 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -70,7 +70,7 @@ wined3d_settings_t wined3d_settings = RTL_READTEX, /* Default render target locking method */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ - 0, /* The default of memory is set in FillGLCaps */ + 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ FALSE, /* No strict draw ordering. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8a765b..e152dc3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1432,7 +1432,6 @@ struct wined3d_gl_limits struct wined3d_gl_info { DWORD glsl_version; - UINT vidmem; struct wined3d_gl_limits limits; DWORD reserved_glsl_constants; DWORD quirks;

1 0

Alexandre Goujon : fusion: Improve parse_display_name.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 135a70772d16a1f696dc23d0af488300289c9d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135a70772d16a1f696dc23d0a… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Fri Sep 10 09:59:53 2010 +0200 fusion: Improve parse_display_name. --- dlls/fusion/asmname.c | 10 +++++++++- dlls/fusion/tests/asmname.c | 9 +++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index bcf49a7..54be4e8 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -522,8 +522,16 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam if (!str) return E_OUTOFMEMORY; - ptr = strstrW(str, separator); + ptr = strchrW(str, ','); if (ptr) *ptr = '\0'; + + /* no ',' but ' ' only */ + if( !ptr && strchrW(str, ' ') ) + { + hr = FUSION_E_INVALID_NAME; + goto done; + } + name->name = strdupW(str); if (!name->name) return E_OUTOFMEMORY; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 655f62f..170af23 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -868,12 +868,9 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine PublicKeyToken=1234567890abcdef"); name = (IAssemblyName *)0xdeadbeef; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); - todo_wine - { - ok(hr == FUSION_E_INVALID_NAME, - "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); - ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); - } + ok(hr == FUSION_E_INVALID_NAME, + "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); if(SUCCEEDED(hr)) IAssemblyName_Release(name); /* no '=' */

1 0

Luca Bennati : user32: Update Italian translation.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 623bf111c5abcc38f10d73dbd0fecf2de08c61b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=623bf111c5abcc38f10d73dbd… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 19:49:36 2010 +0200 user32: Update Italian translation. --- dlls/user32/resources/user32_It.rc | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/resources/user32_It.rc b/dlls/user32/resources/user32_It.rc index 5f3e287..e8a5f4f 100644 --- a/dlls/user32/resources/user32_It.rc +++ b/dlls/user32/resources/user32_It.rc @@ -19,6 +19,9 @@ #include "resources.h" +/* UTF-8 */ +#pragma codepage(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL SYSMENU MENU @@ -59,16 +62,16 @@ BEGIN PUSHBUTTON "&Abbandona", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Riprova", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ignora", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Si", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Sì", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&No", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Riprova", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Continua", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Aiuto", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Seleziona Finestra" +CAPTION "Seleziona finestra" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ @@ -80,5 +83,5 @@ END STRINGTABLE { IDS_ERROR "Errore" - IDS_MDI_MOREWINDOWS "&Pi� Finestre..." + IDS_MDI_MOREWINDOWS "&Più finestre..." }

1 0

Vincent Povirk : windowscodecs: Fix the seeking in stream region streams.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 72bd534908a62d974d953dcb93686a1de3972224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72bd534908a62d974d953dcb9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 11 19:19:34 2010 -0500 windowscodecs: Fix the seeking in stream region streams. --- dlls/windowscodecs/stream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index a00f666..d43cfd8 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -341,7 +341,7 @@ static HRESULT WINAPI StreamOnStreamRange_Read(IStream *iface, if (SUCCEEDED(hr)) { SetPosition.QuadPart = This->pos.QuadPart + This->offset.QuadPart; - hr = IStream_Seek(This->stream, SetPosition, STREAM_SEEK_CUR, NULL); + hr = IStream_Seek(This->stream, SetPosition, STREAM_SEEK_SET, NULL); } if (SUCCEEDED(hr)) { @@ -384,7 +384,7 @@ static HRESULT WINAPI StreamOnStreamRange_Write(IStream *iface, if (SUCCEEDED(hr)) { SetPosition.QuadPart = This->pos.QuadPart + This->offset.QuadPart; - hr = IStream_Seek(This->stream, SetPosition, STREAM_SEEK_CUR, NULL); + hr = IStream_Seek(This->stream, SetPosition, STREAM_SEEK_SET, NULL); } if (SUCCEEDED(hr)) {

1 0