February 2013 - Wine-Commits

Michael Stefaniuc : d3d9: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: d86ecd4bb4471590231b31e307d573518c8e398a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86ecd4bb4471590231b31e30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:55:34 2013 +0100 d3d9: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3d9/d3d9_main.c | 6 ------ dlls/d3d9/device.c | 25 ------------------------- dlls/d3d9/directx.c | 6 ------ dlls/d3d9/swapchain.c | 3 --- dlls/d3d9/vertexdeclaration.c | 3 --- 5 files changed, 0 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 065a37e..ad2e330 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -40,10 +40,7 @@ IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate d3d9 object memory.\n"); return NULL; - } if (!d3d9_init(object, FALSE)) { @@ -64,10 +61,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E TRACE("sdk_version %#x, d3d9ex %p.\n", sdk_version, d3d9ex); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate d3d9 object memory.\n"); return E_OUTOFMEMORY; - } if (!d3d9_init(object, TRUE)) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 91543b5..7b53790 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -734,10 +734,7 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) @@ -781,10 +778,7 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate volume texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) @@ -816,10 +810,7 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate cube texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) @@ -851,10 +842,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) @@ -886,10 +874,7 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) @@ -1559,10 +1544,7 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate stateblock memory.\n"); return E_OUTOFMEMORY; - } hr = stateblock_init(object, device, type, NULL); if (FAILED(hr)) @@ -1613,7 +1595,6 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Failed to allocate stateblock memory.\n"); wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); wined3d_mutex_unlock(); @@ -2413,10 +2394,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate vertex shader memory.\n"); return E_OUTOFMEMORY; - } hr = vertexshader_init(object, device, byte_code); if (FAILED(hr)) @@ -2896,10 +2874,7 @@ static HRESULT WINAPI d3d9_device_CreateQuery(IDirect3DDevice9Ex *iface, D3DQUER object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate query memory.\n"); return E_OUTOFMEMORY; - } hr = query_init(object, device, type); if (FAILED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index a97ff57..a335375 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -456,10 +456,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; - } hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, NULL); if (FAILED(hr)) @@ -567,10 +564,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; - } hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, mode); if (FAILED(hr)) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 3b32346..8177336 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -278,10 +278,7 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha HRESULT hr; if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate swapchain memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = swapchain_init(object, device, desc))) { diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 4fe1189..502b7d3 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -419,10 +419,7 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate vertex declaration memory.\n"); return E_OUTOFMEMORY; - } hr = vertexdeclaration_init(object, device, elements); if (FAILED(hr))

1 0

Michael Stefaniuc : d3d8: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 14c3895573f0a7038e52dd810aa1641d2001dc9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c3895573f0a7038e52dd810… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:52:40 2013 +0100 d3d8: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3d8/d3d8_main.c | 3 --- dlls/d3d8/device.c | 22 ---------------------- dlls/d3d8/directx.c | 3 --- dlls/d3d8/shader.c | 3 --- dlls/d3d8/swapchain.c | 3 --- 5 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 3405447..d03bcba 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -42,10 +42,7 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate d3d8 object memory.\n"); return NULL; - } if (!d3d8_init(object)) { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d9c337a..a94d3bd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -723,10 +723,7 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) @@ -755,10 +752,7 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate volume texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) @@ -786,10 +780,7 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate cube texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) @@ -817,10 +808,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexBuffer(IDirect3DDevice8 *iface, UI object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) @@ -848,10 +836,7 @@ static HRESULT WINAPI d3d8_device_CreateIndexBuffer(IDirect3DDevice8 *iface, UIN object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) @@ -2150,7 +2135,6 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Failed to allocate vertex shader memory.\n"); *shader = 0; return E_OUTOFMEMORY; } @@ -2216,10 +2200,7 @@ static struct d3d8_vertex_declaration *d3d8_device_get_fvf_declaration(struct d3 TRACE("not found. Creating and inserting at position %d.\n", low); if (!(d3d8_declaration = HeapAlloc(GetProcessHeap(), 0, sizeof(*d3d8_declaration)))) - { - ERR("Memory allocation failed.\n"); return NULL; - } if (FAILED(hr = d3d8_vertex_declaration_init_fvf(d3d8_declaration, device, fvf))) { @@ -2532,10 +2513,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate pixel shader memmory.\n"); return E_OUTOFMEMORY; - } wined3d_mutex_lock(); handle = d3d8_allocate_handle(&device->handle_table, object, D3D8_HANDLE_PS); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 4070b3e..61d187d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -364,10 +364,7 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; - } hr = device_init(object, d3d8, d3d8->wined3d, adapter, device_type, focus_window, flags, parameters); if (FAILED(hr)) diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index db36120..f7096bb 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -61,10 +61,7 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Memory allocation failed.\n"); return E_OUTOFMEMORY; - } hr = d3d8_vertex_declaration_init(object, device, declaration, shader_handle); if (FAILED(hr)) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6686c0f..e9f4976 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -183,10 +183,7 @@ HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapcha HRESULT hr; if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate swapchain memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = swapchain_init(object, device, desc))) {

1 0

Ken Thomases : winemac: Process clicks in an inactive window in addition to activating it.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 033fe9a7c2bf1722c3cd2596dfcd78510ada12a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033fe9a7c2bf1722c3cd2596d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:30 2013 -0600 winemac: Process clicks in an inactive window in addition to activating it. --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c7739a4..bd6f086 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -216,6 +216,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[self window] rightMouseDown:theEvent]; } + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent + { + return YES; + } + @end

1 0

Ken Thomases : winemac: Implement MOUSE_MOVED(_ABSOLUTE) events.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 572324bae3eb0a1338444f7128ffe2e899740154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=572324bae3eb0a1338444f712… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:26 2013 -0600 winemac: Implement MOUSE_MOVED(_ABSOLUTE) events. --- dlls/winemac.drv/cocoa_event.m | 30 +++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 3 ++ dlls/winemac.drv/cocoa_window.m | 64 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 12 +++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++++ dlls/winemac.drv/mouse.c | 22 +++++++++++++ 7 files changed, 138 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=572324bae3eb0a1338444…

1 0

Michael Stefaniuc : krnl386.exe16: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 68c447d87efe40c37ac668860dac2b334961cf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c447d87efe40c37ac668860… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:08:42 2013 +0100 krnl386.exe16: Let C look like C. --- dlls/krnl386.exe16/int10.c | 10 +++++----- dlls/krnl386.exe16/int16.c | 2 +- dlls/krnl386.exe16/int67.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index 0edfbd7..dfba761 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -1123,7 +1123,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x0b: - switch BH_reg(context) { + switch (BH_reg(context)) { case 0x00: /* SET BACKGROUND/BORDER COLOR */ /* In text modes, this sets only the border... */ /* According to the interrupt list and one of my books. */ @@ -1192,7 +1192,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x10: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* SET SINGLE PALETTE REGISTER - A.C. */ TRACE("Set Single Palette Register - Reg 0x0%x Value 0x0%x\n", BL_reg(context),BH_reg(context)); @@ -1291,7 +1291,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) case 0x11: /* TEXT MODE CHARGEN */ /* Note that second subfunction is *almost* identical. */ /* See INTERRUPT.A for details. */ - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* LOAD USER SPECIFIED PATTERNS */ case 0x10: FIXME("Load User Specified Patterns - Not Supported\n"); @@ -1339,7 +1339,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x12: /* ALTERNATE FUNCTION SELECT */ - switch BL_reg(context) { + switch (BL_reg(context)) { case 0x10: /* GET EGA INFO */ TRACE("EGA info requested\n"); SET_BH( context, 0x00 ); /* Color screen */ @@ -1385,7 +1385,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x1a: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* GET DISPLAY COMBINATION CODE */ TRACE("Get Display Combination Code\n"); SET_AL( context, 0x1a ); /* Function supported */ diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 47e9d8e..f567ee7 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -52,7 +52,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT *context ) BIOSDATA *data = NULL; BYTE ascii, scan; - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x00: /* Get Keystroke */ /* Returns: AH = Scan code diff --git a/dlls/krnl386.exe16/int67.c b/dlls/krnl386.exe16/int67.c index 3137bc9..019d379 100644 --- a/dlls/krnl386.exe16/int67.c +++ b/dlls/krnl386.exe16/int67.c @@ -149,7 +149,7 @@ static void EMS_access_name( CONTEXT *context ) return; } - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* get name */ ptr = PTR_REAL_TO_LIN(context->SegEs, DI_reg(context)); memcpy(ptr, EMS_record->handle[hindex].name, 8); @@ -326,7 +326,7 @@ static void EMS_restore_context( CONTEXT *context ) */ void WINAPI DOSVM_Int67Handler( CONTEXT *context ) { - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x40: /* EMS - GET MANAGER STATUS */ SET_AH( context, 0 ); /* status: ok */ @@ -465,7 +465,7 @@ void EMS_Ioctl_Handler( CONTEXT *context ) { assert(AH_reg(context) == 0x44); - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* IOCTL - GET DEVICE INFORMATION */ RESET_CFLAG(context); /* operation was successful */ SET_DX( context, 0x4080 ); /* bit 14 (support ioctl read) and

1 0

Michael Stefaniuc : d3dx9_36: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 20f1016bc86db024596ae166e08c8afda4a67c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f1016bc86db024596ae166e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:56:27 2013 +0100 d3dx9_36: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3dx9_36/core.c | 3 --- dlls/d3dx9_36/effect.c | 25 ------------------------- dlls/d3dx9_36/line.c | 3 --- dlls/d3dx9_36/shader.c | 3 --- 4 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index d322091..961f023 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -145,10 +145,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_buffer_init(object, size); if (FAILED(hr)) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1681ea2..4ef900e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4608,10 +4608,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons sampler = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sampler)); if (!sampler) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_parse_sampler(sampler, data, ptr, objects); if (hr != D3D_OK) @@ -4913,7 +4910,6 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -4949,7 +4945,6 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5037,10 +5032,7 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); if (!parameter) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } state->type = ST_CONSTANT; @@ -5132,7 +5124,6 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); if (!annotation) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5207,7 +5198,6 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx_pass *pass, const char *data, annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); if (!annotation) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5316,7 +5306,6 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); if (!annotation) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5349,7 +5338,6 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co pass = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pass)); if (!pass) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5570,7 +5558,6 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); if (!parameter) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5603,7 +5590,6 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * technique = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*technique)); if (!technique) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5751,7 +5737,6 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3 object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5804,10 +5789,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); if (FAILED(hr)) @@ -5847,7 +5829,6 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5888,10 +5869,7 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_effect_compiler_init(object, srcdata, srcdatalen); if (FAILED(hr)) @@ -5980,10 +5958,7 @@ HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->ID3DXEffectPool_iface.lpVtbl = &ID3DXEffectPool_Vtbl; object->ref = 1; diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index e6cd3b0..1ec643a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -339,10 +339,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXLineImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->ID3DXLine_iface.lpVtbl = &ID3DXLine_Vtbl; object->ref = 1; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a0d36e2..75bc9b5 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1669,10 +1669,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->ID3DXConstantTable_iface.lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1;

1 0

Michael Stefaniuc : usp10: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 9f6f8bfc0088f5b466d51067489cc29355924bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6f8bfc0088f5b466d510674… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:15:38 2013 +0100 usp10: Let C look like C. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 41a7f32..a08b047 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1878,7 +1878,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - if FAILED(hr) + if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) hr = E_INVALIDARG;

1 0

Michael Stefaniuc : riched20: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 6c1b292f0b781c08041867f2508df5df164f61c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1b292f0b781c08041867f25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:14:05 2013 +0100 riched20: Let C look like C. --- dlls/riched20/txtsrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9cc5e1..0e78c53 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -77,7 +77,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_ITextServices) + else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; else { *ppv = NULL;

1 0

Michael Stefaniuc : qedit: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 2f67eb99ef0395e5905e6b4d928b372316765f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f67eb99ef0395e5905e6b4d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:12 2013 +0100 qedit: Let C look like C. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index fea3aa4..7e90c31 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -79,7 +79,7 @@ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_IMediaDet) + else if (IsEqualIID(riid, &IID_IMediaDet)) *ppv = &This->IMediaDet_iface; else WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv);

1 0

Hans Leidekker : windowscodecs: Convert the source bitmap to the requested pixel format in IWICColorTransform ::Initialize.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: d855ed4153d4485035b40f7a7a0d0f47a663e09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d855ed4153d4485035b40f7a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:52:48 2013 +0100 windowscodecs: Convert the source bitmap to the requested pixel format in IWICColorTransform::Initialize. --- dlls/windowscodecs/colortransform.c | 49 ++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/colortransform.c b/dlls/windowscodecs/colortransform.c index dae4f38..7791731 100644 --- a/dlls/windowscodecs/colortransform.c +++ b/dlls/windowscodecs/colortransform.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct ColorTransform { IWICColorTransform IWICColorTransform_iface; LONG ref; + IWICBitmapSource *dst; } ColorTransform; static inline ColorTransform *impl_from_IWICColorTransform(IWICColorTransform *iface) @@ -86,6 +87,7 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) if (ref == 0) { + if (This->dst) IWICBitmapSource_Release(This->dst); HeapFree(GetProcessHeap(), 0, This); } @@ -95,45 +97,67 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) static HRESULT WINAPI ColorTransform_GetSize(IWICColorTransform *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return IWICBitmapSource_GetSize(This->dst, puiWidth, puiHeight); } static HRESULT WINAPI ColorTransform_GetPixelFormat(IWICColorTransform *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + + return IWICBitmapSource_GetPixelFormat(This->dst, pPixelFormat); } static HRESULT WINAPI ColorTransform_GetResolution(IWICColorTransform *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + return IWICBitmapSource_GetResolution(This->dst, pDpiX, pDpiY); } static HRESULT WINAPI ColorTransform_CopyPalette(IWICColorTransform *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p)\n", iface, pIPalette); + + return IWICBitmapSource_CopyPalette(This->dst, pIPalette); } static HRESULT WINAPI ColorTransform_CopyPixels(IWICColorTransform *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return IWICBitmapSource_CopyPixels(This->dst, prc, cbStride, cbBufferSize, pbBuffer); } static HRESULT WINAPI ColorTransform_Initialize(IWICColorTransform *iface, IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) { - FIXME("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, + ColorTransform *This = impl_from_IWICColorTransform(iface); + IWICBitmapSource *dst; + HRESULT hr; + + TRACE("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, pIContextDest, debugstr_guid(pixelFmtDest)); - return E_NOTIMPL; + + FIXME("ignoring color contexts\n"); + + hr = WICConvertBitmapSource(pixelFmtDest, pIBitmapSource, &dst); + if (FAILED(hr)) return hr; + + if (This->dst) IWICBitmapSource_Release(This->dst); + This->dst = dst; + return S_OK; } static const IWICColorTransformVtbl ColorTransform_Vtbl = { @@ -159,6 +183,7 @@ HRESULT ColorTransform_Create(IWICColorTransform **colortransform) This->IWICColorTransform_iface.lpVtbl = &ColorTransform_Vtbl; This->ref = 1; + This->dst = NULL; *colortransform = &This->IWICColorTransform_iface;

1 0