May 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9/tests: Add a test for unwritten pixel shader outputs.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: ea34d7aaba0512e0812e2cb3c3c4de0ef0ab45f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea34d7aaba0512e0812e2cb3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:54 2011 +0200 d3d9/tests: Add a test for unwritten pixel shader outputs. --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e90bcaf..6b30f3e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8619,7 +8619,14 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - static const DWORD pshader_code[] = + static const DWORD pshader_code1[] = + { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ + 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ + 0x0000ffff /* end */ + }; + static const DWORD pshader_code2[] = { 0xffff0300, /* ps_3_0 */ 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ @@ -8631,11 +8638,12 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) HRESULT hr; IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps; + IDirect3DPixelShader9 *ps1, *ps2; IDirect3DTexture9 *tex1, *tex2; IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; D3DCAPS9 caps; DWORD color; + UINT i, j; float quad[] = { -1.0, -1.0, 0.1, 1.0, -1.0, 0.1, @@ -8677,8 +8685,10 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &ps); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code1, &ps1); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code2, &ps2); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuf); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget failed, hr=%08x\n", hr); @@ -8689,8 +8699,6 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, vs); ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, ps); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surf1); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 1, surf2); @@ -8711,6 +8719,32 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), "Expected color 0x000000ff, got 0x%08x.\n", color); + /* Render targets not written by the pixel shader should be unmodified. */ + hr = IDirect3DDevice9_SetPixelShader(device, ps1); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0xff00ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + for (i = 6; i < 10; ++i) + { + for (j = 6; j < 10; ++j) + { + color = getPixelColorFromSurface(readback, j, i); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0xff0000ff, got 0x%08x at %u, %u.\n", color, j, i); + } + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); @@ -8724,6 +8758,9 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_SetPixelShader(device, ps2); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%08x\n", hr); if(SUCCEEDED(hr)) { @@ -8764,7 +8801,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color == 0x000000ff, "Texture 2(output color 2) has color 0x%08x, expected 0x000000ff\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - IDirect3DPixelShader9_Release(ps); + IDirect3DPixelShader9_Release(ps2); + IDirect3DPixelShader9_Release(ps1); IDirect3DVertexShader9_Release(vs); IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2);

1 0

Marcus Meissner : winex11.drv: Mark internal symbols with hidden visibility .
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 5a9b623212e160d315290770f5f1c4f2afa5c901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9b623212e160d315290770f… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:52:35 2011 +0200 winex11.drv: Mark internal symbols with hidden visibility. --- dlls/winex11.drv/x11drv.h | 415 ++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/x11font.h | 6 +- dlls/winex11.drv/xcomposite.h | 2 +- dlls/winex11.drv/xrandr.h | 2 +- dlls/winex11.drv/xvidmode.h | 4 +- 6 files changed, 217 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a9b623212e160d315290…

1 0

Marcus Meissner : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 451a656f2f1563dfb311f6c4d6c6029825490254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451a656f2f1563dfb311f6c4d… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:41:29 2011 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/data/agl.h | 70 +++++++++--------- dlls/wineps.drv/mkagl.c | 2 +- dlls/wineps.drv/psdrv.h | 180 ++++++++++++++++++++++---------------------- 4 files changed, 127 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451a656f2f1563dfb311f…

1 0

Piotr Caban : msvcr90/tests: Added _getptd tests.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 197826b12d0e1fb468e2ff3b897318caaf1e8d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=197826b12d0e1fb468e2ff3b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:23:57 2011 +0200 msvcr90/tests: Added _getptd tests. --- dlls/msvcr90/tests/msvcr90.c | 118 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 95cedd1..c3a837d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -23,6 +23,8 @@ #include <fcntl.h> #include <share.h> #include <sys/stat.h> +#include <time.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -78,6 +80,25 @@ static int (__cdecl *p_wsopen_s)(int*, const wchar_t*, int, int, int); static void* (__cdecl *p_realloc_crt)(void*, size_t); static void* (__cdecl *p_malloc)(size_t); static void (__cdecl *p_free)(void*); +static void* (__cdecl *p_getptd)(void); +static int* (__cdecl *p_errno)(void); +static __msvcrt_ulong* (__cdecl *p_doserrno)(void); +static void (__cdecl *p_srand)(unsigned int); +static char* (__cdecl *p_strtok)(char*, const char*); +static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*); +static char* (__cdecl *p_strerror)(int); +static wchar_t* (__cdecl *p_wcserror)(int); +static char* (__cdecl *p_tmpnam)(char*); +static wchar_t* (__cdecl *p_wtmpnam)(wchar_t*); +static char* (__cdecl *p_asctime)(struct tm*); +static wchar_t* (__cdecl *p_wasctime)(struct tm*); +static struct tm* (__cdecl *p_localtime64)(__time64_t*); +static char* (__cdecl *p_ecvt)(double, int, int*, int*); +static int* (__cdecl *p_fpecode)(void); +static int (__cdecl *p_configthreadlocale)(int); +static void* (__cdecl *p_get_terminate)(void); +static void* (__cdecl *p_get_unexpected)(void); + /* type info */ typedef struct __type_info @@ -225,6 +246,24 @@ static BOOL init(void) SET(p_realloc_crt, "_realloc_crt"); SET(p_malloc, "malloc"); SET(p_free, "free"); + SET(p_getptd, "_getptd"); + SET(p_errno, "_errno"); + SET(p_doserrno, "__doserrno"); + SET(p_srand, "srand"); + SET(p_strtok, "strtok"); + SET(p_wcstok, "wcstok"); + SET(p_strerror, "strerror"); + SET(p_wcserror, "_wcserror"); + SET(p_tmpnam, "tmpnam"); + SET(p_wtmpnam, "_wtmpnam"); + SET(p_asctime, "asctime"); + SET(p_wasctime, "_wasctime"); + SET(p_localtime64, "_localtime64"); + SET(p_ecvt, "_ecvt"); + SET(p_fpecode, "__fpecode"); + SET(p_configthreadlocale, "_configthreadlocale"); + SET(p_get_terminate, "_get_terminate"); + SET(p_get_unexpected, "_get_unexpected"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -864,6 +903,84 @@ static void test_typeinfo(void) call_func1(ptype_info_dtor, &t1); } +/* Keep in sync with msvcrt/msvcrt.h */ +struct __thread_data { + DWORD tid; + HANDLE handle; + int thread_errno; + __msvcrt_ulong thread_doserrno; + int unk1; + unsigned int random_seed; + char *strtok_next; + wchar_t *wcstok_next; + unsigned char *mbstok_next; + char *strerror_buffer; + wchar_t *wcserror_buffer; + char *tmpnam_buffer; + wchar_t *wtmpnam_buffer; + void *unk2[2]; + char *asctime_buffer; + wchar_t *wasctime_buffer; + struct tm *time_buffer; + char *efcvt_buffer; + int unk3[2]; + void *unk4[4]; + int fpecode; + pthreadmbcinfo mbcinfo; + pthreadlocinfo locinfo; + BOOL have_locale; + int unk5[1]; + void* terminate_handler; + void* unexpected_handler; + void* se_translator; + void *unk6[3]; + int unk7; + EXCEPTION_RECORD *exc_record; +}; + +static void test_getptd(void) +{ + struct __thread_data *ptd = p_getptd(); + DWORD tid = GetCurrentThreadId(); + wchar_t testW[] = {'t','e','s','t',0}, tW[] = {'t',0}, *wp; + char test[] = "test", *p; + struct tm time; + __time64_t secs = 0; + int dec, sign; + void *mbcinfo, *locinfo; + + ok(ptd->tid == tid, "ptd->tid = %x, expected %x\n", ptd->tid, tid); + ok(ptd->handle == INVALID_HANDLE_VALUE, "ptd->handle = %p\n", ptd->handle); + ok(p_errno() == &ptd->thread_errno, "ptd->thread_errno is different then _errno()\n"); + ok(p_doserrno() == &ptd->thread_doserrno, "ptd->thread_doserrno is different then __doserrno()\n"); + p_srand(1234); + ok(ptd->random_seed == 1234, "ptd->random_seed = %d\n", ptd->random_seed); + p = p_strtok(test, "t"); + ok(ptd->strtok_next == p+3, "ptd->strtok_next is incorrect\n"); + wp = p_wcstok(testW, tW); + ok(ptd->wcstok_next == wp+3, "ptd->wcstok_next is incorrect\n"); + ok(p_strerror(0) == ptd->strerror_buffer, "ptd->strerror_buffer is incorrect\n"); + ok(p_wcserror(0) == ptd->wcserror_buffer, "ptd->wcserror_buffer is incorrect\n"); + ok(p_tmpnam(NULL) == ptd->tmpnam_buffer, "ptd->tmpnam_buffer is incorrect\n"); + ok(p_wtmpnam(NULL) == ptd->wtmpnam_buffer, "ptd->wtmpnam_buffer is incorrect\n"); + memset(&time, 0, sizeof(time)); + time.tm_mday = 1; + ok(p_asctime(&time) == ptd->asctime_buffer, "ptd->asctime_buffer is incorrect\n"); + ok(p_wasctime(&time) == ptd->wasctime_buffer, "ptd->wasctime_buffer is incorrect\n"); + ok(p_localtime64(&secs) == ptd->time_buffer, "ptd->time_buffer is incorrect\n"); + ok(p_ecvt(3.12, 1, &dec, &sign) == ptd->efcvt_buffer, "ptd->efcvt_buffer is incorrect\n"); + ok(p_fpecode() == &ptd->fpecode, "ptd->fpecode is incorrect\n"); + mbcinfo = ptd->mbcinfo; + locinfo = ptd->locinfo; + todo_wine ok(ptd->have_locale == 1, "ptd->have_locale = %x\n", ptd->have_locale); + p_configthreadlocale(1); + todo_wine ok(mbcinfo == ptd->mbcinfo, "ptd->mbcinfo != mbcinfo\n"); + todo_wine ok(locinfo == ptd->locinfo, "ptd->locinfo != locinfo\n"); + todo_wine ok(ptd->have_locale == 3, "ptd->have_locale = %x\n", ptd->have_locale); + ok(p_get_terminate() == ptd->terminate_handler, "ptd->terminate_handler != _get_terminate()\n"); + ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -883,4 +1000,5 @@ START_TEST(msvcr90) test__wsopen_s(); test__realloc_crt(); test_typeinfo(); + test_getptd(); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a0d3acb..48d200b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -157,6 +157,7 @@ typedef struct MSVCRT_localeinfo_struct /* TLS data */ extern DWORD msvcrt_tls_index; +/* Keep in sync with msvcr90/tests/msvcr90.c */ struct __thread_data { DWORD tid; HANDLE handle;

1 0

Henri Verbeet : d3d9/tests: Fix the depth clamping test.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 6d31824a6e2df9069440d49f1c037f3d901ba157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d31824a6e2df9069440d49f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:50 2011 +0200 d3d9/tests: Fix the depth clamping test. --- dlls/d3d9/tests/visual.c | 133 ++++++++++++++++++++++++++------------------- 1 files changed, 77 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d31824a6e2df9069440d…

1 0

Alexandre Julliard : include: Add compatibility macros for non-widl compilers.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: ea9750d773ded6b86a3e28f38666b8376f984d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9750d773ded6b86a3e28f38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:58:55 2011 +0200 include: Add compatibility macros for non-widl compilers. --- include/msxml2.idl | 6 ++++++ include/xmldom.idl | 6 ++++++ include/xmldso.idl | 6 ++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index f9c10ef..6680518 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -25,6 +25,12 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(3.0), diff --git a/include/xmldom.idl b/include/xmldom.idl index 45e9f13..a388592 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -19,6 +19,12 @@ #include <xmldomdid.h> #include <idispids.h> +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; diff --git a/include/xmldso.idl b/include/xmldso.idl index cde98dc..86f2a3a 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -19,6 +19,12 @@ #include <idispids.h> #include <xmldsodid.h> +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + interface IXMLDOMDocument; [

1 0

Alexandre Julliard : widl: Also compute buffer size for non-ref pointers.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 96a5def6787c543f7fe2050a12aef7219e675bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a5def6787c543f7fe2050a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:53:11 2011 +0200 widl: Also compute buffer size for non-ref pointers. --- tools/widl/typegen.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f6bb2f9..4bdc94c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3185,13 +3185,19 @@ static unsigned int get_required_buffer_size_type( break; case TGT_POINTER: - if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) { + unsigned int size, align; const type_t *ref = type_pointer_get_ref(type); if (is_string_type( attrs, ref )) break; - return get_required_buffer_size_type( ref, name, ref->attrs, FALSE, alignment ); + if (!(size = get_required_buffer_size_type( ref, name, NULL, FALSE, &align ))) break; + if (get_pointer_fc(type, attrs, toplevel_param) != RPC_FC_RP) + { + size += 4 + align; + align = 4; + } + *alignment = align; + return size; } - break; case TGT_ARRAY: if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP)

1 0

Alexandre Julliard : widl: Don' t call the buffer sizer routine when the size is known already.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: bf9d2904dc2e5d229b34b16cd614b0f2742b593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9d2904dc2e5d229b34b16cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 22:47:07 2011 +0200 widl: Don't call the buffer sizer routine when the size is known already. --- tools/widl/typegen.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 51f531d..324211e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3537,7 +3537,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { int in_attr, out_attr, pointer_type; const type_t *type = var->type; - unsigned int start_offset = type->typestring_offset; + unsigned int alignment, start_offset = type->typestring_offset; if (is_ptr(type) || is_array(type)) pointer_type = get_pointer_fc(type, var->attrs, pass != PASS_RETURN); @@ -3562,6 +3562,8 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const break; } + if (phase == PHASE_BUFFERSIZE && get_required_buffer_size( var, &alignment, pass )) return; + write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var); switch (typegen_detect_type(type, var->attrs, TDT_ALL_TYPES))

1 0

Piotr Caban : msvcrt: Reorder fields of __thread_data structure.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 093909cf8819082612824fe9c8c3e19efdb9978e URL: http://source.winehq.org/git/wine.git/?a=commit;h=093909cf8819082612824fe9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:14 2011 +0200 msvcrt: Reorder fields of __thread_data structure. --- dlls/msvcrt/msvcrt.h | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8fc3b03..58fd0b7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -111,22 +111,30 @@ struct __thread_data { HANDLE handle; int thread_errno; MSVCRT_ulong thread_doserrno; + int unk1; unsigned int random_seed; /* seed for rand() */ char *strtok_next; /* next ptr for strtok() */ - unsigned char *mbstok_next; /* next ptr for mbstok() */ MSVCRT_wchar_t *wcstok_next; /* next ptr for wcstok() */ - char *efcvt_buffer; /* buffer for ecvt/fcvt */ + unsigned char *mbstok_next; /* next ptr for mbstok() */ + char *strerror_buffer; /* buffer for strerror */ + MSVCRT_wchar_t *wcserror_buffer; /* buffer for wcserror */ + void *unk2[4]; char *asctime_buffer; /* buffer for asctime */ MSVCRT_wchar_t *wasctime_buffer; /* buffer for wasctime */ struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ - char *strerror_buffer; /* buffer for strerror */ - MSVCRT_wchar_t *wcserror_buffer; /* buffer for wcserror */ + char *efcvt_buffer; /* buffer for ecvt/fcvt */ + int unk3[2]; + void *unk4[4]; int fpecode; + struct MSVCRT_localeinfo_struct *locale; + int unk5[2]; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; MSVCRT__se_translator_function se_translator; + void *unk6[3]; + int unk7; EXCEPTION_RECORD *exc_record; - struct MSVCRT_localeinfo_struct *locale; + void *unk8[100]; }; typedef struct __thread_data thread_data_t;

1 0

Piotr Caban : msvcrt: Change the way locale information is stored in __thread_data.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: e15ac98cbcf01f64333d7ae75c266dab12e0ee54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15ac98cbcf01f64333d7ae75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:42 2011 +0200 msvcrt: Change the way locale information is stored in __thread_data. --- dlls/msvcrt/locale.c | 253 +++++++++++++++++++++++++++----------------------- dlls/msvcrt/main.c | 4 +- dlls/msvcrt/msvcrt.h | 110 +++++++++++----------- dlls/msvcrt/thread.c | 2 + 4 files changed, 198 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e15ac98cbcf01f64333d7…

1 0