October 2011 - Wine-commits

Piotr Caban : msvcp90: Added more basic_string::assing functions.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 044e07d1f84cfc225ad2246a0a7a4f4234f3c52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=044e07d1f84cfc225ad2246a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:03 2011 +0200 msvcp90: Added more basic_string::assing functions. --- dlls/msvcp90/msvcp90.spec | 24 ++++++++-------- dlls/msvcp90/string.c | 66 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=044e07d1f84cfc225ad22…

1 0

Piotr Caban : msvcp90: Added more basic_string constructor implementations.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 796a13c80d2be359a5b89ab38119645f3a0f8039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796a13c80d2be359a5b89ab38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:12 2011 +0200 msvcp90: Added more basic_string constructor implementations. --- dlls/msvcp90/msvcp90.spec | 56 +++++++++--------- dlls/msvcp90/string.c | 136 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=796a13c80d2be359a5b89…

1 0

Piotr Caban : msvcp90: Added basic_string::max_size implementation.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 72fb8e2c654b398a970c7ee19883faa763a393b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fb8e2c654b398a970c7ee19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:22 2011 +0200 msvcp90: Added basic_string::max_size implementation. --- dlls/msvcp90/msvcp90.h | 2 ++ dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 0639a67..1365223 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -187,8 +187,10 @@ typedef struct _basic_string_wchar char* __stdcall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); void __stdcall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); +MSVCP_size_t __stdcall MSVCP_allocator_char_max_size(void*); wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); +MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); /* class locale */ typedef struct diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 078762f..11271cf 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4515,12 +4515,12 @@ @ cdecl -arch=win64 ?max_size@?$allocator(a)G@std@@QEBA_KXZ(ptr) MSVCP_allocator_short_max_size @ thiscall -arch=win32 ?max_size@?$allocator(a)_W@std@@QBEIXZ(ptr) MSVCP_allocator_wchar_max_size @ cdecl -arch=win64 ?max_size@?$allocator(a)_W@std@@QEBA_KXZ(ptr) MSVCP_allocator_wchar_max_size -@ stub -arch=win32 ?max_size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ -@ stub -arch=win64 ?max_size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?max_size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ(ptr) basic_string_char_max_size +@ cdecl -arch=win64 ?max_size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ(ptr) basic_string_char_max_size @ stub -arch=win32 ?max_size@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ @ stub -arch=win64 ?max_size@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ -@ stub -arch=win32 ?max_size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ -@ stub -arch=win64 ?max_size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?max_size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ(ptr) basic_string_wchar_max_size +@ cdecl -arch=win64 ?max_size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ(ptr) basic_string_wchar_max_size @ cdecl ?min@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_min @ cdecl ?min@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_min @ cdecl ?min@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_min diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 529eb02..1f2bf7d 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -999,6 +999,15 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) return this->size; } +/* ?max_size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ +/* ?max_size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ */ +DEFINE_THISCALL_WRAPPER(basic_string_char_max_size, 4) +MSVCP_size_t __thiscall basic_string_char_max_size(const basic_string_char *this) +{ + TRACE("%p\n", this); + return MSVCP_allocator_char_max_size(this->allocator)-1; +} + /* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ */ /* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_empty, 4) @@ -2440,6 +2449,15 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this return this->size; } +/* ?max_size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ */ +/* ?max_size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ */ +DEFINE_THISCALL_WRAPPER(basic_string_wchar_max_size, 4) +MSVCP_size_t __thiscall basic_string_wchar_max_size(const basic_string_wchar *this) +{ + TRACE("%p\n", this); + return MSVCP_allocator_wchar_max_size(this->allocator)-1; +} + /* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ */ /* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_empty, 4)

1 0

Henri Verbeet : gameux: Don't shadow hr in GAMEUX_RegisterGame().
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: a4ee6226ae4ecbf921a4dac2060c796f1b1ad5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee6226ae4ecbf921a4dac20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:05 2011 +0200 gameux: Don't shadow hr in GAMEUX_RegisterGame(). --- dlls/gameux/gameexplorer.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index c6935c9..bada386 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -565,7 +565,6 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, { struct parse_gdf_thread_param thread_param; HANDLE thread; - HRESULT hr; DWORD ret; thread_param.GameData = &GameData;

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused "pfd" variable in context_create().
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 67b097cd6e92567d0335bc8894c87eaaca3bc5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b097cd6e92567d0335bc889… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:06 2011 +0200 wined3d: Get rid of the mostly unused "pfd" variable in context_create(). --- dlls/wined3d/context.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e44ee81..61398e6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1294,7 +1294,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; - PIXELFORMATDESCRIPTOR pfd; BOOL auxBuffers = FALSE; int pixel_format; unsigned int s; @@ -1363,7 +1362,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - DescribePixelFormat(hdc, pixel_format, sizeof(pfd), &pfd); if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc);

1 0

Henri Verbeet : wined3d: Cleanup context_create() error handling a bit.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 7ffa768e712420576728777f5919eac5a8daedc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffa768e712420576728777f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:07 2011 +0200 wined3d: Cleanup context_create() error handling a bit. --- dlls/wined3d/context.c | 123 ++++++++++++++++++++++++++--------------------- 1 files changed, 68 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 61398e6..9d15176 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1311,6 +1311,53 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return NULL; } + if (device->shader_backend->shader_dirtifyable_constants()) + { + /* Create the dirty constants array and initialize them to dirty */ + ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, + sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); + if (!ret->vshader_const_dirty) + goto out; + + ret->pshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, + sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); + if (!ret->pshader_const_dirty) + goto out; + + memset(ret->vshader_const_dirty, 1, + sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); + memset(ret->pshader_const_dirty, 1, + sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); + } + + ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->blit_targets)); + if (!ret->blit_targets) + goto out; + + ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->draw_buffers)); + if (!ret->draw_buffers) + goto out; + + ret->free_occlusion_query_size = 4; + ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, + ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); + if (!ret->free_occlusion_queries) + goto out; + + list_init(&ret->occlusion_queries); + + ret->free_event_query_size = 4; + ret->free_event_queries = HeapAlloc(GetProcessHeap(), 0, + ret->free_event_query_size * sizeof(*ret->free_event_queries)); + if (!ret->free_event_queries) + goto out; + + list_init(&ret->event_queries); + list_init(&ret->fbo_list); + list_init(&ret->fbo_destroy_list); + if (!(hdc = GetDC(swapchain->win_handle))) { WARN("Failed to retireve device context, trying swapchain backup.\n"); @@ -1362,36 +1409,41 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } + context_enter(ret); + if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + context_release(ret); + goto out; + } + + if (!(ctx = pwglCreateContext(hdc))) + { + ERR("Failed to create a WGL context.\n"); + context_release(ret); goto out; } - ctx = pwglCreateContext(hdc); if (device->context_count) { if (!pwglShareLists(device->contexts[0]->glCtx, ctx)) { - DWORD err = GetLastError(); ERR("wglShareLists(%p, %p) failed, last error %#x.\n", - device->contexts[0]->glCtx, ctx, err); + device->contexts[0]->glCtx, ctx, GetLastError()); + context_release(ret); + if (!pwglDeleteContext(ctx)) + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); + goto out; } } - if(!ctx) { - ERR("Failed to create a WGL context\n"); - goto out; - } - if (!device_context_add(device, ret)) { ERR("Failed to add the newly created context to the context list\n"); + context_release(ret); if (!pwglDeleteContext(ctx)) - { - DWORD err = GetLastError(); - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, err); - } + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); goto out; } @@ -1419,53 +1471,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->hdc = hdc; ret->pixel_format = pixel_format; - if (device->shader_backend->shader_dirtifyable_constants()) - { - /* Create the dirty constants array and initialize them to dirty */ - ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, - sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); - ret->pshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, - sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); - memset(ret->vshader_const_dirty, 1, - sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); - memset(ret->pshader_const_dirty, 1, - sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); - } - - ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - gl_info->limits.buffers * sizeof(*ret->blit_targets)); - if (!ret->blit_targets) goto out; - - ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - gl_info->limits.buffers * sizeof(*ret->draw_buffers)); - if (!ret->draw_buffers) goto out; - - ret->free_occlusion_query_size = 4; - ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, - ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); - if (!ret->free_occlusion_queries) goto out; - - list_init(&ret->occlusion_queries); - - ret->free_event_query_size = 4; - ret->free_event_queries = HeapAlloc(GetProcessHeap(), 0, - ret->free_event_query_size * sizeof(*ret->free_event_queries)); - if (!ret->free_event_queries) goto out; - - list_init(&ret->event_queries); - - TRACE("Successfully created new context %p\n", ret); - - list_init(&ret->fbo_list); - list_init(&ret->fbo_destroy_list); - - context_enter(ret); - /* Set up the context defaults */ if (!context_set_current(ret)) { - ERR("Cannot activate context to set up defaults\n"); + ERR("Cannot activate context to set up defaults.\n"); + device_context_remove(device, ret); context_release(ret); + if (!pwglDeleteContext(ctx)) + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); goto out; }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_raster_status() const.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 39f898b26a5985e35fd776641c827a901abc625d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f898b26a5985e35fd776641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:08 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_raster_status() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec9126f..4509d93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4568,7 +4568,7 @@ BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_de return device->softwareVertexProcessing; } -HRESULT CDECL wined3d_device_get_raster_status(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c6949bd..92d7d4d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2234,7 +2234,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_raster_status(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: a9fcaed6105bdbb75f0689317e0cc5cd2e616ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fcaed6105bdbb75f0689317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:09 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4509d93..20bf808 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4613,7 +4613,7 @@ HRESULT CDECL wined3d_device_set_npatch_mode(struct wined3d_device *device, floa return WINED3D_OK; } -float CDECL wined3d_device_get_npatch_mode(struct wined3d_device *device) +float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) { static BOOL warned; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 92d7d4d..e466400 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2224,7 +2224,7 @@ HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *dev HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, WINED3DMATERIAL *material); -float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); +float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology);

1 0

Dan Kegel : gdiplus/tests: Must define biClrUsed when calling CreateDIBSection.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: fa4cafd80eacea5b180aad3fc7c9deeb117b4fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4cafd80eacea5b180aad3fc… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 13 13:47:10 2011 -0700 gdiplus/tests: Must define biClrUsed when calling CreateDIBSection. --- dlls/gdiplus/tests/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 44554a5..8535aad 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -886,6 +886,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bmi.bmiHeader.biBitCount = 24; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hbm != NULL, "CreateDIBSection failed\n");

1 0

Andrew Talbot : winealsa.drv: Add some return statements to mark semantic separations.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 654f280947e638ddf622f9226c86a7b68db130d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654f280947e638ddf622f9226… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 13 22:17:47 2011 +0100 winealsa.drv: Add some return statements to mark semantic separations. --- dlls/winealsa.drv/midi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 24fe227..ff762eb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1314,6 +1314,7 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: ALSA_MidiInit(); + return 0; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1357,6 +1358,7 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: ALSA_MidiInit(); + return 0; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE:

1 0