September 2012 - Wine-Commits

Jacek Caban : jscript: Use jsval instead of VARIANT to pass arguments to builtin functions.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 847aebdc877482cb3954dbaa3bbe3f52bb7f1b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847aebdc877482cb3954dbaa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:16:42 2012 +0200 jscript: Use jsval instead of VARIANT to pass arguments to builtin functions. --- dlls/jscript/activex.c | 4 +- dlls/jscript/array.c | 263 +++++++++++++++++++++++------------------------ dlls/jscript/bool.c | 12 +- dlls/jscript/date.c | 190 +++++++++++++++++----------------- dlls/jscript/dispex.c | 168 ++++++++++++++++++------------ dlls/jscript/engine.c | 146 +++++++++++++++++++++------ dlls/jscript/error.c | 72 ++++++------- dlls/jscript/function.c | 101 ++++++++---------- dlls/jscript/global.c | 119 ++++++++++----------- dlls/jscript/jscript.h | 37 ++++--- dlls/jscript/jsutils.c | 175 ++++++++++++++++++++++++++++---- dlls/jscript/math.c | 78 +++++++------- dlls/jscript/number.c | 28 +++--- dlls/jscript/object.c | 22 ++-- dlls/jscript/regexp.c | 139 +++++++++++-------------- dlls/jscript/string.c | 260 ++++++++++++++++++++++------------------------- dlls/jscript/vbarray.c | 41 +++++--- 17 files changed, 1035 insertions(+), 820 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=847aebdc877482cb3954d…

1 0

Alexandre Julliard : winex11: Allow retrieving the window data structure from another thread, with appropriate locking.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 4289c74f508f01859b7bf3fa2d1b9ca4189e45bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4289c74f508f01859b7bf3fa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 13:03:52 2012 +0200 winex11: Allow retrieving the window data structure from another thread, with appropriate locking. --- dlls/winex11.drv/window.c | 105 ++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/x11drv.h | 2 + 2 files changed, 81 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7581436..421d67d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -85,6 +85,15 @@ static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char clip_window_prop[] = "__wine_x11_clip_window"; static const char managed_prop[] = "__wine_x11_managed"; +static CRITICAL_SECTION win_data_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &win_data_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": win_data_section") } +}; +static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + /*********************************************************************** * http://standards.freedesktop.org/startup-notification-spec @@ -1478,17 +1487,17 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!(data = get_win_data( hwnd ))) return; - destroy_gl_drawable( hwnd ); destroy_whole_window( thread_data->display, data, FALSE ); - if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); - XDeleteContext( thread_data->display, (XID)hwnd, win_data_context ); + XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); + release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); + destroy_gl_drawable( hwnd ); } @@ -1499,12 +1508,15 @@ void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) { Display *display = event->xdestroywindow.display; struct x11drv_win_data *data; + BOOL embedded; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); + if (!(data = get_win_data( hwnd ))) return; + embedded = data->embedded; + if (!embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); destroy_whole_window( display, data, TRUE ); - if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); + release_win_data( data ); + if (embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } @@ -1515,24 +1527,26 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->hwnd = hwnd; - XSaveContext( display, (XID)hwnd, win_data_context, (char *)data ); + EnterCriticalSection( &win_data_section ); + XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); } return data; } /* initialize the desktop window id in the desktop manager process */ -static struct x11drv_win_data *create_desktop_win_data( Display *display, HWND hwnd ) +static BOOL create_desktop_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; - if (!(data = alloc_win_data( display, hwnd ))) return NULL; + if (!(data = alloc_win_data( display, hwnd ))) return FALSE; data->whole_window = root_window; data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); + release_win_data( data ); set_initial_wm_hints( hwnd ); - return data; + return TRUE; } /********************************************************************** @@ -1607,19 +1621,49 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) /*********************************************************************** + * get_win_data + * + * Lock and return the X11 data structure associated with a window. + */ +struct x11drv_win_data *get_win_data( HWND hwnd ) +{ + char *data; + + if (!hwnd) return NULL; + EnterCriticalSection( &win_data_section ); + if (!XFindContext( gdi_display, (XID)hwnd, win_data_context, &data )) + return (struct x11drv_win_data *)data; + LeaveCriticalSection( &win_data_section ); + return NULL; +} + + +/*********************************************************************** + * release_win_data + * + * Release the data returned by get_win_data. + */ +void release_win_data( struct x11drv_win_data *data ) +{ + if (data) LeaveCriticalSection( &win_data_section ); +} + + +/*********************************************************************** * X11DRV_get_win_data * * Return the X11 data structure associated with a window. */ struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - char *data; + struct x11drv_win_data *data = get_win_data( hwnd ); - if (!thread_data) return NULL; - if (!hwnd) return NULL; - if (XFindContext( thread_data->display, (XID)hwnd, win_data_context, &data )) data = NULL; - return (struct x11drv_win_data *)data; + if (data) + { + release_win_data( data ); + if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) data = NULL; + } + return data; } @@ -1640,11 +1684,14 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi /* don't create win data for HWND_MESSAGE windows */ if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; + if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; + display = thread_init_display(); if (!(data = alloc_win_data( display, hwnd ))) return NULL; data->whole_rect = data->window_rect = *window_rect; data->client_rect = *client_rect; + release_win_data( data ); if (parent == GetDesktopWindow()) { @@ -1775,14 +1822,17 @@ HWND create_foreign_window( Display *display, Window xwin ) */ Window X11DRV_get_whole_window( HWND hwnd ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); + Window ret; if (!data) { if (hwnd == GetDesktopWindow()) return root_window; return (Window)GetPropA( hwnd, whole_window_prop ); } - return data->whole_window; + ret = data->whole_window; + release_win_data( data ); + return ret; } @@ -1793,15 +1843,18 @@ Window X11DRV_get_whole_window( HWND hwnd ) */ XIC X11DRV_get_ic( HWND hwnd ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); XIM xim; + XIC ret = 0; - if (!data) return 0; - - x11drv_thread_data()->last_xic_hwnd = hwnd; - if (data->xic) return data->xic; - if (!(xim = x11drv_thread_data()->xim)) return 0; - return X11DRV_CreateIC( xim, data ); + if (data) + { + x11drv_thread_data()->last_xic_hwnd = hwnd; + ret = data->xic; + if (!ret && (xim = x11drv_thread_data()->xim)) ret = X11DRV_CreateIC( xim, data ); + release_win_data( data ); + } + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 05d0237..28cbe6a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -553,6 +553,8 @@ struct x11drv_win_data Pixmap icon_mask; }; +extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; +extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_outputTopology opcode.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: a67ee02a4881694fd95ad5ff19b06b0f6005510e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67ee02a4881694fd95ad5ff1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:25 2012 +0200 wined3d: Recognize the SM4 dcl_outputTopology opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 4 +++- dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e5b2968..1195563 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5100,6 +5100,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, + /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, /* WINED3DSIH_DEFB */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d83371e..fbd9f38 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5032,6 +5032,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, + /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6941434..aaf3446 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -51,6 +51,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", + /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", @@ -1366,7 +1367,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } - else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE) + else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE + || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { TRACE("%s ", shader_opcode_names[ins.handler_idx]); shader_dump_primitive_type(ins.declaration.primitive_type); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 2f9094b..007b9b1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -101,6 +101,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, }; @@ -116,6 +117,13 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_NULL = 0xd, }; +enum wined3d_sm4_output_primitive_type +{ + WINED3D_SM4_OUTPUT_PT_POINTLIST = 0x1, + WINED3D_SM4_OUTPUT_PT_LINELIST = 0x3, + WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, +}; + enum wined3d_sm4_input_primitive_type { WINED3D_SM4_INPUT_PT_POINT = 0x1, @@ -213,6 +221,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, }; @@ -235,6 +244,16 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; +static const enum wined3d_primitive_type output_primitive_type_table[] = +{ + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_OUTPUT_PT_POINTLIST */ WINED3D_PT_POINTLIST, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_OUTPUT_PT_LINELIST */ WINED3D_PT_LINELIST, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ WINED3D_PT_TRIANGLESTRIP, +}; + static const enum wined3d_primitive_type input_primitive_type_table[] = { /* UNKNOWN */ WINED3D_PT_UNDEFINED, @@ -562,7 +581,22 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) + if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) + { + enum wined3d_sm4_output_primitive_type primitive_type; + + primitive_type = (opcode_token & WINED3D_SM4_PRIMITIVE_TYPE_MASK) >> WINED3D_SM4_PRIMITIVE_TYPE_SHIFT; + if (primitive_type >= sizeof(output_primitive_type_table) / sizeof(*output_primitive_type_table)) + { + FIXME("Unhandled output primitive type %#x.\n", primitive_type); + ins->declaration.primitive_type = WINED3D_PT_UNDEFINED; + } + else + { + ins->declaration.primitive_type = output_primitive_type_table[primitive_type]; + } + } + else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) { enum wined3d_sm4_input_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1900d43..8ce9db9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -440,6 +440,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CUT, WINED3DSIH_DCL, WINED3DSIH_DCL_INPUT_PRIMITIVE, + WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, WINED3DSIH_DEFB,

1 0

Alexandre Julliard : winex11: Avoid passing a window data structure to functions that can send messages.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c8ea1e50dc8142bbfb88652b76f2a4c5b8a06511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ea1e50dc8142bbfb88652b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 20:08:01 2012 +0200 winex11: Avoid passing a window data structure to functions that can send messages. --- dlls/winex11.drv/event.c | 25 +++++----- dlls/winex11.drv/mouse.c | 16 ++++--- dlls/winex11.drv/systray.c | 15 +++--- dlls/winex11.drv/window.c | 105 +++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 6 +- 5 files changed, 93 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8ea1e50dc8142bbfb886…

1 0

Piotr Caban : msvcp71: Don't forward _Getcat functions to msvcp80.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 08eab0ed229ded05aba8175433887ffe1b4f52b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eab0ed229ded05aba817543… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:26:03 2012 +0200 msvcp71: Don't forward _Getcat functions to msvcp80. --- dlls/msvcp71/locale.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 48 +++++++++++++------------- 2 files changed, 109 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08eab0ed229ded05aba81…

1 0

Hans Leidekker : wbemprox: Override variant conversion for Win32_Processor. MaxClockSpeed.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 8e5350041863300a4fc70d718dea253b1fe4be4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5350041863300a4fc70d718… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:18:58 2012 +0200 wbemprox: Override variant conversion for Win32_Processor.MaxClockSpeed. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 30dfd4c..7e416a5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -259,7 +259,7 @@ static const struct column col_processor[] = { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_maxclockspeedW, CIM_UINT32 }, + { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.Description.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 2760a70aeecb79551931b49ba5512f068fbd8919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2760a70aeecb79551931b49ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:19:30 2012 +0200 wbemprox: Implement Win32_VideoController.Description. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 41a31f3..5434fc5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -287,6 +287,7 @@ static const struct column col_videocontroller[] = { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, { prop_currentverticalresW, CIM_UINT32 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -428,6 +429,7 @@ struct record_videocontroller UINT32 current_bitsperpixel; UINT32 current_horizontalres; UINT32 current_verticalres; + const WCHAR *description; const WCHAR *device_id; const WCHAR *name; }; @@ -1050,6 +1052,7 @@ done: rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; rec->current_verticalres = vres; + rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name );

1 0

Hans Leidekker : wbemprox: Win32_Processor. MaxClockSpeed is expressed in Mhz.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c60fe4751874905ce5b763916a93de7588073c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60fe4751874905ce5b763916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:19:13 2012 +0200 wbemprox: Win32_Processor.MaxClockSpeed is expressed in Mhz. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7e416a5..41a31f3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -783,7 +783,7 @@ static void get_processor_name( WCHAR *name ) static UINT get_processor_maxclockspeed( void ) { PROCESSOR_POWER_INFORMATION *info; - UINT ret = 1000000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); NTSTATUS status; if ((info = heap_alloc( size )))

1 0

André Hentschel : vcomp90: Add new stub dll.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: a6086e1161aa12c17fa880f83c4120f6dccc4c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6086e1161aa12c17fa880f83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 16 17:10:20 2012 +0200 vcomp90: Add new stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp100/vcomp100.spec | 6 +- dlls/vcomp90/Makefile.in | 6 ++ dlls/vcomp90/main.c | 48 ++++++++++++++++++ dlls/vcomp90/vcomp90.spec | 112 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 172 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d9157fa..87f93f9 100755 --- a/configure +++ b/configure @@ -15731,6 +15731,7 @@ wine_fn_config_dll vbscript enable_vbscript wine_fn_config_test dlls/vbscript/tests vbscript_test wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vcomp100 enable_vcomp100 +wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 2c9e582..8a69570 100644 --- a/configure.ac +++ b/configure.ac @@ -3004,6 +3004,7 @@ WINE_CONFIG_DLL(vbscript) WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vcomp100) +WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index cd5a964..d888577 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -85,7 +85,7 @@ @ stub _vcomp_reduction_u8 @ stub _vcomp_sections_init @ stub _vcomp_sections_next -@ stub _vcomp_set_num_threads +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ stub _vcomp_single_begin @ stub _vcomp_single_end @ stub omp_destroy_lock @@ -93,11 +93,11 @@ @ stub omp_get_dynamic @ stub omp_get_max_threads @ stub omp_get_nested -@ stub omp_get_num_procs +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs @ stub omp_get_num_threads @ stub omp_get_thread_num @ stub omp_get_wtick -@ stub omp_get_wtime +@ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock diff --git a/dlls/vcomp90/Makefile.in b/dlls/vcomp90/Makefile.in new file mode 100644 index 0000000..48dafbd --- /dev/null +++ b/dlls/vcomp90/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp90.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vcomp90/main.c b/dlls/vcomp90/main.c new file mode 100644 index 0000000..4c2d864 --- /dev/null +++ b/dlls/vcomp90/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp90 implementation + * + * Copyright 2012 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp90); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec new file mode 100644 index 0000000..d888577 --- /dev/null +++ b/dlls/vcomp90/vcomp90.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index a39889f..301345c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -109,6 +109,7 @@ my @dll_groups = [ "vcomp", "vcomp100", + "vcomp90", ], [ "atl",

1 0

Piotr Caban : msvcp71: Removed unused functions.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 06d5c487c7e8fcf0fff64e3f1fde50ce49da4216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d5c487c7e8fcf0fff64e3f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:27:48 2012 +0200 msvcp71: Removed unused functions. --- dlls/msvcp71/cxx.h | 2 - dlls/msvcp71/exception.c | 24 +-- dlls/msvcp71/ios.c | 547 ++-------------------------------------------- dlls/msvcp71/locale.c | 450 ++++---------------------------------- dlls/msvcp71/memory.c | 248 +-------------------- dlls/msvcp71/misc.c | 49 +---- dlls/msvcp71/msvcp.h | 12 +- dlls/msvcp71/msvcp71.c | 16 -- dlls/msvcp71/string.c | 417 +---------------------------------- 9 files changed, 103 insertions(+), 1662 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06d5c487c7e8fcf0fff64…

1 0