wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Frédéric Delanoy : krnl386.exe16: Avoid hardcoding array lengths.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ebf4ae03b5bcaf44a64dbb11415791bf1b738769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf4ae03b5bcaf44a64dbb114… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 19:19:48 2011 +0100 krnl386.exe16: Avoid hardcoding array lengths. --- dlls/krnl386.exe16/int21.c | 6 +++--- dlls/krnl386.exe16/int25.c | 2 +- dlls/krnl386.exe16/int26.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 2ec6345..f8e235a 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -336,7 +336,7 @@ static BYTE INT21_MapDrive( BYTE drive ) { if (drive) { - WCHAR drivespec[3] = {'A', ':', 0}; + WCHAR drivespec[] = {'A', ':', 0}; UINT drivetype; drivespec[0] += drive - 1; @@ -359,7 +359,7 @@ static BYTE INT21_MapDrive( BYTE drive ) */ static void INT21_SetCurrentDrive( BYTE drive ) { - WCHAR drivespec[3] = {'A', ':', 0}; + WCHAR drivespec[] = {'A', ':', 0}; drivespec[0] += drive; @@ -2451,7 +2451,7 @@ static void INT21_Ioctl_Block( CONTEXT *context ) { BYTE *dataptr; BYTE drive = INT21_MapDrive( BL_reg(context) ); - WCHAR drivespec[4] = {'A', ':', '\\', 0}; + WCHAR drivespec[] = {'A', ':', '\\', 0}; UINT drivetype; drivespec[0] += drive; diff --git a/dlls/krnl386.exe16/int25.c b/dlls/krnl386.exe16/int25.c index 5aa0b55..0513c8f 100644 --- a/dlls/krnl386.exe16/int25.c +++ b/dlls/krnl386.exe16/int25.c @@ -82,7 +82,7 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL f */ void WINAPI DOSVM_Int25Handler( CONTEXT *context ) { - WCHAR drivespec[4] = {'A', ':', '\\', 0}; + WCHAR drivespec[] = {'A', ':', '\\', 0}; BYTE *dataptr = CTX_SEG_OFF_TO_LIN( context, context->SegDs, context->Ebx ); DWORD begin; DWORD length; diff --git a/dlls/krnl386.exe16/int26.c b/dlls/krnl386.exe16/int26.c index e475c8d..bb3d90b 100644 --- a/dlls/krnl386.exe16/int26.c +++ b/dlls/krnl386.exe16/int26.c @@ -71,7 +71,7 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL */ void WINAPI DOSVM_Int26Handler( CONTEXT *context ) { - WCHAR drivespec[4] = {'A', ':', '\\', 0}; + WCHAR drivespec[] = {'A', ':', '\\', 0}; BYTE *dataptr = CTX_SEG_OFF_TO_LIN( context, context->SegDs, context->Ebx ); DWORD begin; DWORD length;

1 0

Frédéric Delanoy : comctl32: Avoid hardcoding array lengths.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 954e6eba7e2c4df401e3c1de4bb23216314c349c URL: http://source.winehq.org/git/wine.git/?a=commit;h=954e6eba7e2c4df401e3c1de4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 19:19:46 2011 +0100 comctl32: Avoid hardcoding array lengths. --- dlls/comctl32/ipaddress.c | 2 +- dlls/comdlg32/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index e51ae08..97b6a0f 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -339,7 +339,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { - WCHAR nil[1] = { 0 }; + static const WCHAR nil[] = { 0 }; int i; TRACE("\n"); diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ee4dab2..aea5224 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2433,7 +2433,7 @@ static WCHAR get_decimal_sep(void) if(!sep) { - WCHAR buf[2] = {'.',0}; + WCHAR buf[] = {'.', 0}; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buf, sizeof(buf) / sizeof(buf[0])); sep = buf[0]; }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DGAMMARAMP typedef.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 2e1c0d83c14c57331ef103478ad28b82148d81db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1c0d83c14c57331ef103478… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:41 2011 +0100 wined3d: Get rid of the WINED3DGAMMARAMP typedef. --- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/surface.c | 9 +++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 12 ++++++------ 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 049c4e0..869da69 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -661,9 +661,9 @@ static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(IDirect3DDevice8 *iface, DW TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const WINED3DGAMMARAMP *)pRamp); + wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } @@ -673,9 +673,9 @@ static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(IDirect3DDevice8 *iface, D3 TRACE("iface %p, ramp %p.\n", iface, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (WINED3DGAMMARAMP *)pRamp); + wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 29dd180..2b47eb4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -668,9 +668,9 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(IDirect3DDevice9Ex *iface, TRACE("iface %p, swapchain %u, flags %#x, ramp %p.\n", iface, iSwapChain, Flags, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const WINED3DGAMMARAMP *)pRamp); + wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } @@ -681,9 +681,9 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(IDirect3DDevice9Ex *iface, TRACE("iface %p, swapchain %u, ramp %p.\n", iface, iSwapChain, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (WINED3DGAMMARAMP *)pRamp); + wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 864b3ba..c7f92fd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4502,8 +4502,8 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl * wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP. */ - wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (WINED3DGAMMARAMP *)gamma_ramp); + /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ + wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (struct wined3d_gamma_ramp *)gamma_ramp); } else { @@ -4544,8 +4544,9 @@ static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl * wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ - wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, 0, flags, (WINED3DGAMMARAMP *)gamma_ramp); + /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ + wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, + 0, flags, (struct wined3d_gamma_ramp *)gamma_ramp); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ab205d..7e70841 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5713,7 +5713,7 @@ HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device } void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp) + UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain; @@ -5728,7 +5728,7 @@ void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, } void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DGAMMARAMP *ramp) + UINT swapchain_idx, struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d09c9d0..fbf19d9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -254,7 +254,7 @@ HRESULT CDECL wined3d_swapchain_get_present_parameters(const struct wined3d_swap } HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const WINED3DGAMMARAMP *ramp) + DWORD flags, const struct wined3d_gamma_ramp *ramp) { HDC dc; @@ -271,7 +271,7 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s } HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, - WINED3DGAMMARAMP *ramp) + struct wined3d_gamma_ramp *ramp) { HDC dc; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a43830e..9e44f69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,7 @@ struct wined3d_swapchain WINED3DPRESENT_PARAMETERS presentParms; DWORD orig_width, orig_height; enum wined3d_format_id orig_fmt; - WINED3DGAMMARAMP orig_gamma; + struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo; const struct wined3d_format *ds_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abf2c61..f228e44 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1583,12 +1583,12 @@ struct wined3d_viewport float max_z; }; -typedef struct _WINED3DGAMMARAMP +struct wined3d_gamma_ramp { WORD red[256]; WORD green[256]; WORD blue[256]; -} WINED3DGAMMARAMP; +}; typedef struct _WINED3DLINEPATTERN { @@ -2211,7 +2211,7 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DGAMMARAMP *ramp); + UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, @@ -2290,7 +2290,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device, UINT swapchain_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp); + UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, @@ -2457,7 +2457,7 @@ HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchai HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_surface *dst_surface); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, - WINED3DGAMMARAMP *ramp); + struct wined3d_gamma_ramp *ramp); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_present_parameters(const struct wined3d_swapchain *swapchain, WINED3DPRESENT_PARAMETERS *present_parameters); @@ -2468,7 +2468,7 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const WINED3DGAMMARAMP *ramp); + DWORD flags, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVIEWPORT typedef.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: be8917cd914b2d10972da945d21d3092996d5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8917cd914b2d10972da945d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:40 2011 +0100 wined3d: Get rid of the WINED3DVIEWPORT typedef. --- dlls/d3d8/device.c | 8 +++--- dlls/d3d9/device.c | 8 +++--- dlls/ddraw/device.c | 8 +++--- dlls/wined3d/device.c | 42 ++++++++++++++++++++-------------------- dlls/wined3d/state.c | 34 ++++++++++++++++---------------- dlls/wined3d/stateblock.c | 12 +++++----- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 6 ++-- include/wine/wined3d.h | 20 +++++++++--------- 9 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be8917cd914b2d10972da…

1 0

Henri Verbeet : wined3d: Recognize the SM4 xor opcode.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 14cf780fde834cadee7fd0ca87b73345323572ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cf780fde834cadee7fd0ca8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:39 2011 +0100 wined3d: Recognize the SM4 xor opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 03b525f..451d34a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5130,6 +5130,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_XOR */ NULL, }; static BOOL get_bool_const(const struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1c9b61..68e2f8f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5085,6 +5085,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_XOR */ NULL, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5f2448c..d7ba818 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -141,6 +141,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", + /* WINED3DSIH_XOR */ "xor", }; static const char * const semantic_names[] = diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5c675c2..25bb72a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -97,6 +97,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, + WINED3D_SM4_OP_XOR = 0x57, }; enum wined3d_sm4_register_type @@ -185,6 +186,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, 1, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, + {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, 1, 2}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 72ffe73..ee29934 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_UDIV, WINED3DSIH_USHR, WINED3DSIH_UTOF, + WINED3DSIH_XOR, WINED3DSIH_TABLE_SIZE };

1 0

Henri Verbeet : wined3d: Recognize the SM4 ushr opcode.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: d695dd3af4502a1e91284b606b97e157f0c75321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d695dd3af4502a1e91284b606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:38 2011 +0100 wined3d: Recognize the SM4 ushr opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5739733..03b525f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5128,6 +5128,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e1724c..b1c9b61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5083,6 +5083,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 998b431..5f2448c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -139,6 +139,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b78f03b..5c675c2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -95,6 +95,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -182,6 +183,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, + {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, 1, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e77347..72ffe73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -512,6 +512,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Henri Verbeet : wined3d: Recognize the SM4 udiv opcode.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 9afff037e50a6c173287182cd5703a2f4bdb6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afff037e50a6c173287182cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:37 2011 +0100 wined3d: Recognize the SM4 udiv opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 32197d5..5739733 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5127,6 +5127,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2AR */ pshader_hw_texreg2ar, /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, + /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9d88794..8e1724c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5082,6 +5082,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, + /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e182435..998b431 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -138,6 +138,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2AR */ "texreg2ar", /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", + /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_UTOF */ "utof", }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 973d606..b78f03b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -94,6 +94,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, + WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -180,6 +181,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, + {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a22faf..7e77347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2AR, WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, + WINED3DSIH_UDIV, WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Francois Gouget : gphoto2.ds: Remove an unused and untranslatable listview label.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: cc1bfa79691fa0ccaf4c3ee2e531c98708eda222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1bfa79691fa0ccaf4c3ee2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 21 17:56:20 2011 +0100 gphoto2.ds: Remove an unused and untranslatable listview label. Spotted by Luca Bennati. --- dlls/gphoto2.ds/gphoto2_Da.rc | 2 +- dlls/gphoto2.ds/gphoto2_De.rc | 2 +- dlls/gphoto2.ds/gphoto2_En.rc | 2 +- dlls/gphoto2.ds/gphoto2_Es.rc | 2 +- dlls/gphoto2.ds/gphoto2_Fr.rc | 2 +- dlls/gphoto2.ds/gphoto2_He.rc | 2 +- dlls/gphoto2.ds/gphoto2_Hu.rc | 2 +- dlls/gphoto2.ds/gphoto2_It.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ja.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ko.rc | 2 +- dlls/gphoto2.ds/gphoto2_Lt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Nl.rc | 2 +- dlls/gphoto2.ds/gphoto2_No.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pl.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ro.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ru.rc | 2 +- dlls/gphoto2.ds/gphoto2_Si.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sr.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sv.rc | 2 +- dlls/gphoto2.ds/gphoto2_Uk.rc | 2 +- dlls/gphoto2.ds/gphoto2_Zh.rc | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc1bfa79691fa0ccaf4c3…

1 0

Michael Stefaniuc : qedit/tests: Add SampleGrabber COM aggregation test.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 24da40fa8556e247bb2521ac4ad920ad51532883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24da40fa8556e247bb2521ac4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 21 14:46:57 2011 +0100 qedit/tests: Add SampleGrabber COM aggregation test. --- dlls/qedit/tests/mediadet.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index de9b3a4..1d9a2f1 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include "initguid.h" #include "ole2.h" @@ -28,6 +29,47 @@ #include "qedit.h" #include "rc.h" +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + + static WCHAR test_avi_filename[MAX_PATH]; static WCHAR test_sound_avi_filename[MAX_PATH]; @@ -294,6 +336,31 @@ static void test_mediadet(void) DeleteFileW(test_sound_avi_filename); } +static void test_samplegrabber(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + ISampleGrabber *sg; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + todo_wine ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + if (hr != S_OK) return; + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_ISampleGrabber, (void**)&sg); + ok(hr == S_OK, "QueryInterface for IID_ISampleGrabber failed: %08x\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); +} + START_TEST(mediadet) { if (!init_tests()) @@ -304,5 +371,6 @@ START_TEST(mediadet) CoInitialize(NULL); test_mediadet(); + test_samplegrabber(); CoUninitialize(); }

1 0

Jacek Caban : jscript: Use bytecode for unary '+' expression.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 35b9c42f530a9a338eaae928c96bd12c7a3514aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b9c42f530a9a338eaae928c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 21 15:35:41 2011 +0100 jscript: Use bytecode for unary '+' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 24 ++++++------------------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8431b5c..1bc887c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -115,6 +115,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); + case EXPR_PLUS: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); default: assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 17d8fa6..1f5863a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2532,32 +2532,20 @@ HRESULT minus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag } /* ECMA-262 3rd Edition 11.4.6 */ -HRESULT plus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_tonum(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; - VARIANT val, num; + VARIANT *v, num; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); + v = stack_pop(ctx); + hres = to_number(ctx->parser->script, v, &ctx->ei, &num); + VariantClear(v); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = num; - return S_OK; + return stack_push(ctx, &num); } /* ECMA-262 3rd Edition 11.3.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8692b0a..c004af3 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -46,6 +46,7 @@ typedef struct _func_stack { X(eq2, 1, 0) \ X(neg, 1, 0) \ X(neq2, 1, 0) \ + X(tonum, 1, 0) \ X(tree, 1, ARG_EXPR) \ X(ret, 0, 0) @@ -537,7 +538,6 @@ HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT void_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT minus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT plus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d580ec0..92c79fc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1322,7 +1322,7 @@ static const expression_eval_t expression_eval_table[] = { void_expression_eval, typeof_expression_eval, minus_expression_eval, - plus_expression_eval, + compiled_expression_eval, post_increment_expression_eval, post_decrement_expression_eval, pre_increment_expression_eval,

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
86
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 November 2011