wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Henri Verbeet : wined3d: Mask out writes to unused render targets.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 019f6a8534d49cf92e8c819a4fda33a5ab4c1ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019f6a8534d49cf92e8c819a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 22:24:12 2011 +0200 wined3d: Mask out writes to unused render targets. Outputs not written by the pixel shader are undefined in GL, but in D3D the render target is unmodified. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 30 ++++++++++++++++++++++-------- dlls/wined3d/device.c | 3 +++ dlls/wined3d/shader.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 55b31bc..cefb6e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1118,7 +1118,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else { if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); - if (reg_maps->highest_render_target > 0) + if (reg_maps->rt_mask > 1) { sprintf(register_name, "result.color[%u]", reg->idx); } @@ -3615,7 +3615,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, priv_ctx.target_version = ARB; } - if (reg_maps->highest_render_target > 0) + if (reg_maps->rt_mask > 1) { shader_addline(buffer, "OPTION ARB_draw_buffers;\n"); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5def575..f5d237e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1977,9 +1977,9 @@ static struct wined3d_context *FindContext(struct wined3d_device *device, struct } /* Context activation is done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_count, struct wined3d_surface **rts) +static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) { - if (!rt_count) + if (!rt_mask) { ENTER_GL(); glDrawBuffer(GL_NONE); @@ -1999,19 +1999,22 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; + unsigned int i = 0; - for (i = 0; i < rt_count; ++i) + while (rt_mask) { - if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if ((rt_mask & 1) && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; + + rt_mask >>= 1; + ++i; } if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(rt_count, context->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(i, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else @@ -2153,6 +2156,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d UINT rt_count, struct wined3d_surface **rts, struct wined3d_surface *depth_stencil) { const struct StateEntry *state_table = device->StateTable; + DWORD rt_mask = 0; UINT i; if (!context_validate_rt_config(rt_count, rts, depth_stencil)) @@ -2170,6 +2174,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d for (i = 0; i < rt_count; ++i) { context->blit_targets[i] = rts[i]; + rt_mask |= (1 << i); } while (i < context->gl_info->limits.buffers) { @@ -2183,12 +2188,17 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d else { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + rt_mask = 1; } LEAVE_GL(); } + else + { + rt_mask = 1; + } - context_apply_draw_buffers(context, rt_count, rts); + context_apply_draw_buffers(context, rt_mask, rts); context->draw_buffer_dirty = TRUE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2261,7 +2271,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (context->draw_buffer_dirty) { - context_apply_draw_buffers(context, context->gl_info->limits.buffers, fb->render_targets); + const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + DWORD rt_mask = ps ? ps->reg_maps.rt_mask : 1; + + rt_mask &= device->valid_rt_mask; + context_apply_draw_buffers(context, rt_mask, fb->render_targets); context->draw_buffer_dirty = FALSE; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab40d18..8724cdf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1166,6 +1166,9 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->updateStateBlock = device->stateBlock; wined3d_stateblock_incref(device->updateStateBlock); + device->valid_rt_mask = 0; + for (i = 0; i < gl_info->limits.buffers; ++i) + device->valid_rt_mask |= (1 << i); device->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device->fb.render_targets) * gl_info->limits.buffers); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f5c45f3..79a2759 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -418,7 +418,7 @@ static void shader_record_register_usage(struct wined3d_shader *shader, struct w break; case WINED3DSPR_COLOROUT: - reg_maps->highest_render_target = max(reg_maps->highest_render_target, reg->idx); + reg_maps->rt_mask |= (1 << reg->idx); break; default: @@ -821,6 +821,11 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } reg_maps->loop_depth = max_loop_depth; + /* PS before 2.0 don't have explicit color outputs. Instead the value of + * R0 is written to the render target. */ + if (shader_version.major < 2 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + reg_maps->rt_mask |= (1 << 0); + shader->functionLength = ((const char *)ptr - (const char *)byte_code); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43481ae..5ac7ee4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,9 +560,10 @@ struct wined3d_shader_reg_maps WORD usespow : 1; WORD padding : 3; + DWORD rt_mask; /* Used render targets, 32 max. */ + /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; - unsigned highest_render_target; UINT min_rel_offset, max_rel_offset; }; @@ -1716,6 +1717,7 @@ struct wined3d_device unsigned int highest_dirty_ps_const, highest_dirty_vs_const; /* Render Target Support */ + DWORD valid_rt_mask; struct wined3d_fb_state fb; struct wined3d_surface *onscreen_depth_stencil; struct wined3d_surface *auto_depth_stencil;

1 0

Henri Verbeet : wined3d: Check for unhandled resource usage flags.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: d5ee9a4014de9202bbd06c2a874fac810fa087d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ee9a4014de9202bbd06c2a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:52 2011 +0200 wined3d: Check for unhandled resource usage flags. --- dlls/wined3d/resource.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 5771b5b..4060bc6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -65,6 +65,19 @@ static DWORD resource_access_from_pool(WINED3DPOOL pool) } } +static void resource_check_usage(DWORD usage) +{ + static const DWORD handled = WINED3DUSAGE_RENDERTARGET + | WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_STATICDECL + | WINED3DUSAGE_OVERLAY; + + if (usage & ~handled) + FIXME("Unhandled usage flags %#x.\n", usage & ~handled); +} + HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, WINED3DRESOURCETYPE resource_type, const struct wined3d_format *format, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, @@ -93,6 +106,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; list_init(&resource->privateData); + resource_check_usage(usage); + if (size) { resource->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT);

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map().
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 6d3103903454cc9470204d71b081d8ba8abf6bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3103903454cc9470204d71b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:51 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 20bb6d6..5def575 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2234,7 +2234,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ - IWineD3DDeviceImpl_FindTexUnitMap(device); + device_update_tex_unit_map(device); device_preload_textures(device); if (isStateDirty(context, STATE_VDECL)) device_update_stream_info(device, context->gl_info); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12f1023..ab40d18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2980,7 +2980,7 @@ static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const s } } -void IWineD3DDeviceImpl_FindTexUnitMap(struct wined3d_device *device) +void device_update_tex_unit_map(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_state *state = &device->stateBlock->state; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b31239b..43481ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1790,7 +1790,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void IWineD3DDeviceImpl_FindTexUnitMap(struct wined3d_device *device) DECLSPEC_HIDDEN; +void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void IWineD3DDeviceImpl_MarkStateDirty(struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state)

1 0

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

25 May '11

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

Piotr Caban : msvcr90/tests: Added _getptd tests.
by Alexandre Julliard 25 May '11

25 May '11

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@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

Piotr Caban : msvcrt: Added _get_unexpected implementation.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: e253e526fc1cb96fc6ff485bfa65f99239f9b872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e253e526fc1cb96fc6ff485bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:23:43 2011 +0200 msvcrt: Added _get_unexpected implementation. --- dlls/msvcrt/cpp.c | 10 ++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 6f6b5c6..d5c0c64 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1049,6 +1049,16 @@ MSVCRT_unexpected_function CDECL MSVCRT_set_unexpected(MSVCRT_unexpected_functio } /****************************************************************** + * _get_unexpected (MSVCRT.@) + */ +MSVCRT_unexpected_function CDECL MSVCRT__get_unexpected(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + TRACE("returning %p\n", data->unexpected_handler); + return data->unexpected_handler; +} + +/****************************************************************** * ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z (MSVCRT.@) */ MSVCRT__se_translator_function CDECL MSVCRT__set_se_translator(MSVCRT__se_translator_function func) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7e00607..ac7b9e3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -489,7 +489,7 @@ # stub _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname -@ stub _get_unexpected() +@ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long)

1 0

Piotr Caban : msvcr90/tests: Don't check if msvcr90 functions exists.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 696ba80347a12fe6c15b349bd77e5822bf41c6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696ba80347a12fe6c15b349bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:23:34 2011 +0200 msvcr90/tests: Don't check if msvcr90 functions exists. --- dlls/msvcr90/tests/msvcr90.c | 202 ++++++++++++------------------------------ 1 files changed, 57 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=696ba80347a12fe6c15b3…

1 0

Piotr Caban : msvcrt: Added _getptd implementation.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 6e777041b2b14ceb94832cdec4d34d5d04c273e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e777041b2b14ceb94832cdec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:23:24 2011 +0200 msvcrt: Added _getptd implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/thread.c | 9 +++++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 607c866..ecdb758 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -708,7 +708,7 @@ @ cdecl _getmaxstdio() msvcrt._getmaxstdio @ cdecl _getmbcp() msvcrt._getmbcp @ cdecl _getpid() msvcrt._getpid -@ stub _getptd +@ cdecl _getptd() msvcrt._getptd @ cdecl _getsystime(ptr) msvcrt._getsystime @ cdecl _getw(ptr) msvcrt._getw @ stub _getwch diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 905737f..59dd2f5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -555,7 +555,7 @@ @ cdecl _getmaxstdio() msvcrt._getmaxstdio @ cdecl _getmbcp() msvcrt._getmbcp @ cdecl _getpid() msvcrt._getpid -@ stub _getptd +@ cdecl _getptd() msvcrt._getptd @ cdecl _getsystime(ptr) msvcrt._getsystime @ cdecl _getw(ptr) msvcrt._getw @ stub _getwch diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c667d04..842dd25 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -543,7 +543,7 @@ @ cdecl _getmaxstdio() msvcrt._getmaxstdio @ cdecl _getmbcp() msvcrt._getmbcp @ cdecl _getpid() msvcrt._getpid -@ stub _getptd +@ cdecl _getptd() msvcrt._getptd @ cdecl _getsystime(ptr) msvcrt._getsystime @ cdecl _getw(ptr) msvcrt._getw @ stub _getwch diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3534c1e..7e00607 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1502,3 +1502,4 @@ @ cdecl _wdupenv_s(ptr ptr wstr) @ cdecl _get_printf_count_output() @ cdecl _set_printf_count_output(long) +@ cdecl _getptd() diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 8515477..2486a3f 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -159,3 +159,12 @@ void CDECL _endthreadex( /* FIXME */ ExitThread(retval); } + +/********************************************************************* + * _getptd - not exported in native msvcrt + */ +thread_data_t* CDECL _getptd(void) +{ + FIXME("returns undocumented/not fully filled data\n"); + return msvcrt_get_thread_data(); +}

1 0

Piotr Caban : msvcrt: Improved tmpnam/wtmpnam implementation.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: abb3db5c5780620c1c19a67094d8619e512298cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb3db5c5780620c1c19a6709… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:23:13 2011 +0200 msvcrt: Improved tmpnam/wtmpnam implementation. --- dlls/msvcrt/file.c | 27 ++++++++++++++++++++------- dlls/msvcrt/msvcrt.h | 4 +++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d47a25a..7ee7b62 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -108,8 +108,6 @@ static int MSVCRT_umask = 0; /* INTERNAL: static data for tmpnam and _wtmpname functions */ static int tmpnam_unique; -static char MSVCRT_tmpname[MAX_PATH]; -static MSVCRT_wchar_t MSVCRT_wtmpname[MAX_PATH]; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; @@ -3654,8 +3652,16 @@ char * CDECL MSVCRT_tmpnam(char *s) char tmpstr[16]; char *p; int count, size; - if (s == 0) - s = MSVCRT_tmpname; + + if (!s) { + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data->tmpnam_buffer) + data->tmpnam_buffer = MSVCRT_malloc(MAX_PATH); + + s = data->tmpnam_buffer; + } + msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); p = s + sprintf(s, "\\s%s.", tmpstr); for (count = 0; count < MSVCRT_TMP_MAX; count++) @@ -3672,14 +3678,21 @@ char * CDECL MSVCRT_tmpnam(char *s) /********************************************************************* * _wtmpnam (MSVCRT.@) */ -MSVCRT_wchar_t * MSVCRT_wtmpnam(MSVCRT_wchar_t *s) +MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s) { static const MSVCRT_wchar_t format[] = {'\\','s','%','s','.',0}; MSVCRT_wchar_t tmpstr[16]; MSVCRT_wchar_t *p; int count, size; - if (s == 0) - s = MSVCRT_wtmpname; + if (!s) { + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data->wtmpnam_buffer) + data->wtmpnam_buffer = MSVCRT_malloc(sizeof(MSVCRT_wchar_t[MAX_PATH])); + + s = data->wtmpnam_buffer; + } + msvcrt_int_to_base32_w(GetCurrentProcessId(), tmpstr); p = s + MSVCRT__snwprintf(s, MAX_PATH, format, tmpstr); for (count = 0; count < MSVCRT_TMP_MAX; count++) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 90056ba..a0d3acb 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -169,7 +169,9 @@ struct __thread_data { 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 *tmpnam_buffer; /* buffer for tmpname() */ + MSVCRT_wchar_t *wtmpnam_buffer; /* buffer for wtmpname() */ + void *unk2[2]; char *asctime_buffer; /* buffer for asctime */ MSVCRT_wchar_t *wasctime_buffer; /* buffer for wasctime */ struct MSVCRT_tm *time_buffer; /* buffer for localtime/gmtime */

1 0

Piotr Caban : msvcrt: Change the way how localtime/ gmtime buffer is stored in __thread_data.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 12229aeeb28b55add3356e3fe17924319f014a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12229aeeb28b55add3356e3fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:54 2011 +0200 msvcrt: Change the way how localtime/gmtime buffer is stored in __thread_data. --- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/time.c | 14 ++++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index e6c21f5..902fb64 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -73,6 +73,7 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); HeapFree(GetProcessHeap(),0,tls->strerror_buffer); HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); + HeapFree(GetProcessHeap(),0,tls->time_buffer); free_locinfo(tls->locinfo); free_mbcinfo(tls->mbcinfo); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9b8ac38..90056ba 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -172,7 +172,7 @@ struct __thread_data { 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 */ + struct MSVCRT_tm *time_buffer; /* buffer for localtime/gmtime */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ int unk3[2]; void *unk4[4]; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9dc2a3e..0aa1e58 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -212,10 +212,13 @@ struct MSVCRT_tm* CDECL MSVCRT__localtime64(const MSVCRT___time64_t* secs) } data = msvcrt_get_thread_data(); - unix_tm_to_msvcrt( &data->time_buffer, tm ); + if(!data->time_buffer) + data->time_buffer = MSVCRT_malloc(sizeof(struct MSVCRT_tm)); + + unix_tm_to_msvcrt( data->time_buffer, tm ); _munlock(_TIME_LOCK); - return &data->time_buffer; + return data->time_buffer; } /********************************************************************* @@ -344,9 +347,12 @@ struct MSVCRT_tm* CDECL MSVCRT__gmtime64(const MSVCRT___time64_t *secs) { thread_data_t * const data = msvcrt_get_thread_data(); - if(MSVCRT__gmtime64_s(&data->time_buffer, secs)) + if(!data->time_buffer) + data->time_buffer = MSVCRT_malloc(sizeof(struct MSVCRT_tm)); + + if(MSVCRT__gmtime64_s(data->time_buffer, secs)) return NULL; - return &data->time_buffer; + return data->time_buffer; } /*********************************************************************

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011