April 2013 - Wine-commits - list.winehq.org

Stefan Leichter : setupapi: Add a stub for SetupDiSetDeviceInstallParamsA.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: a829c2b3ad5ac82ad658a22722f169a7d19dea75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a829c2b3ad5ac82ad658a2272… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Apr 18 21:28:24 2013 +0200 setupapi: Add a stub for SetupDiSetDeviceInstallParamsA. --- dlls/setupapi/devinst.c | 13 +++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c93b2c1..6ddebb0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3706,6 +3706,19 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA( return FALSE; } +/*********************************************************************** + * SetupDiSetDeviceInstallParamsA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceInstallParamsA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +{ + FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + return TRUE; +} + static HKEY SETUPDI_OpenDevKey(struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index b412e75..16cd339 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -385,7 +385,7 @@ @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stub SetupDiSetClassInstallParamsW -@ stub SetupDiSetDeviceInstallParamsA +@ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stub SetupDiSetDeviceInstallParamsW @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr)

1 0

Sam Edwards : gdi32: Prevent possible buffer overflows in get_glyph_outline .
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 147765a505fff264e7efc4666133d6772e737f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=147765a505fff264e7efc4666… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Thu Apr 18 13:57:41 2013 -0600 gdi32: Prevent possible buffer overflows in get_glyph_outline. --- dlls/gdi32/freetype.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 96c94e4..fec752a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6148,8 +6148,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, case ft_glyph_format_bitmap: { BYTE *src = ft_face->glyph->bitmap.buffer, *dst = buf; - INT w = (ft_face->glyph->bitmap.width + 7) >> 3; - INT h = ft_face->glyph->bitmap.rows; + INT w = min( pitch, (ft_face->glyph->bitmap.width + 7) >> 3 ); + INT h = min( height, ft_face->glyph->bitmap.rows ); while(h--) { memcpy(dst, src, w); src += ft_face->glyph->bitmap.pitch; @@ -6202,7 +6202,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, case ft_glyph_format_bitmap: { BYTE *src = ft_face->glyph->bitmap.buffer, *dst = buf; - INT h = ft_face->glyph->bitmap.rows; + INT h = min( height, ft_face->glyph->bitmap.rows ); INT x; memset( buf, 0, needed ); while(h--) {

1 0

Henri Verbeet : wined3d: Use WGL_ARB_create_context when available.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 5115f55eebe5cb91f13896862275e236a4954744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5115f55eebe5cb91f13896862… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 08:34:11 2013 +0200 wined3d: Use WGL_ARB_create_context when available. --- dlls/wined3d/context.c | 29 +++++++++++++++++++---------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 516e8c2..0d6550a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1266,11 +1266,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *color_format; struct wined3d_context *ret; BOOL auxBuffers = FALSE; + HGLRC ctx, share_ctx; int pixel_format; unsigned int s; int swap_interval; DWORD state; - HGLRC ctx; HDC hdc; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1367,19 +1367,28 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - if (!(ctx = wglCreateContext(hdc))) + share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; + if (gl_info->p_wglCreateContextAttribsARB) { - ERR("Failed to create a WGL context.\n"); - context_release(ret); - goto out; + if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, NULL))) + { + ERR("Failed to create a WGL context.\n"); + context_release(ret); + goto out; + } } - - if (device->context_count) + else { - if (!wglShareLists(device->contexts[0]->glCtx, ctx)) + if (!(ctx = wglCreateContext(hdc))) + { + ERR("Failed to create a WGL context.\n"); + context_release(ret); + goto out; + } + + if (share_ctx && !wglShareLists(share_ctx, ctx)) { - ERR("wglShareLists(%p, %p) failed, last error %#x.\n", - device->contexts[0]->glCtx, ctx, GetLastError()); + ERR("wglShareLists(%p, %p) failed, last error %#x.\n", share_ctx, ctx, GetLastError()); context_release(ret); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9640f9..8f1dfb7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -296,6 +296,35 @@ static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) ERR("Failed to restore previous GL context.\n"); } +static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *fake_gl_ctx, + struct wined3d_gl_info *gl_info) +{ + HGLRC new_ctx; + + if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB"))) + return; + + if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(fake_gl_ctx->dc, NULL, NULL))) + { + ERR("Failed to create a context using wglCreateContextAttribsARB(), last error %#x.\n", GetLastError()); + gl_info->p_wglCreateContextAttribsARB = NULL; + return; + } + + if (!wglMakeCurrent(fake_gl_ctx->dc, new_ctx)) + { + ERR("Failed to make new context current, last error %#x.\n", GetLastError()); + if (!wglDeleteContext(new_ctx)) + ERR("Failed to delete new context, last error %#x.\n", GetLastError()); + gl_info->p_wglCreateContextAttribsARB = NULL; + return; + } + + if (!wglDeleteContext(fake_gl_ctx->gl_ctx)) + ERR("Failed to delete old context, last error %#x.\n", GetLastError()); + fake_gl_ctx->gl_ctx = new_ctx; +} + /* Do not call while under the GL lock. */ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) { @@ -4919,6 +4948,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } + wined3d_create_fake_gl_context_attribs(&fake_gl_ctx, gl_info); + if (!wined3d_adapter_init_gl_caps(adapter)) { ERR("Failed to initialize GL caps for adapter %p.\n", adapter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ee9b9f..c8b4ff9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1552,6 +1552,7 @@ struct wined3d_gl_info BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1]; + HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops;

1 0

Henri Verbeet : wined3d: Add support for GL_ARB_debug_output.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: ee6d17cd545ccf257097ffb9dace366ed421df0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6d17cd545ccf257097ffb9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 08:34:12 2013 +0200 wined3d: Add support for GL_ARB_debug_output. --- dlls/wined3d/context.c | 72 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 15 +++++++-- dlls/wined3d/wined3d_gl.h | 6 +++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0d6550a..739a038 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -30,6 +30,8 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); +WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); static DWORD wined3d_context_tls_idx; @@ -1257,6 +1259,37 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc } } +BOOL context_debug_output_enabled(const struct wined3d_gl_info *gl_info) +{ + return gl_info->supported[ARB_DEBUG_OUTPUT] + && (ERR_ON(d3d) || FIXME_ON(d3d) || WARN_ON(d3d_perf)); +} + +static void WINE_GLAPI wined3d_debug_callback(GLenum source, GLenum type, GLuint id, + GLenum severity, GLsizei length, const char *message, void *ctx) +{ + switch (type) + { + case GL_DEBUG_TYPE_ERROR_ARB: + ERR("%p: %s.\n", ctx, debugstr_an(message, length)); + break; + + case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB: + case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB: + case GL_DEBUG_TYPE_PORTABILITY_ARB: + FIXME("%p: %s.\n", ctx, debugstr_an(message, length)); + break; + + case GL_DEBUG_TYPE_PERFORMANCE_ARB: + WARN_(d3d_perf)("%p: %s.\n", ctx, debugstr_an(message, length)); + break; + + default: + FIXME("ctx %p, type %#x: %s.\n", ctx, type, debugstr_an(message, length)); + break; + } +} + /* Do not call while under the GL lock. */ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) @@ -1370,7 +1403,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, NULL))) + unsigned int ctx_attrib_idx = 0; + GLint ctx_attribs[3]; + + if (context_debug_output_enabled(gl_info)) + { + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_DEBUG_BIT_ARB; + } + ctx_attribs[ctx_attrib_idx] = 0; + + if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) { ERR("Failed to create a WGL context.\n"); context_release(ret); @@ -1440,6 +1483,33 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } + if (context_debug_output_enabled(gl_info)) + { + GL_EXTCALL(glDebugMessageCallbackARB(wined3d_debug_callback, ret)); + if (TRACE_ON(d3d_synchronous)) + gl_info->gl_ops.gl.p_glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB); + GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_FALSE)); + if (ERR_ON(d3d)) + { + GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR_ARB, + GL_DONT_CARE, 0, NULL, GL_TRUE)); + } + if (FIXME_ON(d3d)) + { + GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB, + GL_DONT_CARE, 0, NULL, GL_TRUE)); + GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB, + GL_DONT_CARE, 0, NULL, GL_TRUE)); + GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PORTABILITY_ARB, + GL_DONT_CARE, 0, NULL, GL_TRUE)); + } + if (WARN_ON(d3d_perf)) + { + GL_EXTCALL(glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE_ARB, + GL_DONT_CARE, 0, NULL, GL_TRUE)); + } + } + switch (swapchain->desc.swap_interval) { case WINED3DPRESENT_INTERVAL_IMMEDIATE: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f1dfb7..9b3ff1f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -93,6 +93,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, + {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, @@ -297,14 +298,14 @@ static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) } static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *fake_gl_ctx, - struct wined3d_gl_info *gl_info) + struct wined3d_gl_info *gl_info, const GLint *ctx_attribs) { HGLRC new_ctx; if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB"))) return; - if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(fake_gl_ctx->dc, NULL, NULL))) + if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(fake_gl_ctx->dc, NULL, ctx_attribs))) { ERR("Failed to create a context using wglCreateContextAttribsARB(), last error %#x.\n", GetLastError()); gl_info->p_wglCreateContextAttribsARB = NULL; @@ -4902,7 +4903,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) { struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; + unsigned int ctx_attrib_idx = 0; DISPLAY_DEVICEW display_device; + GLint ctx_attribs[3]; TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); @@ -4948,7 +4951,13 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } - wined3d_create_fake_gl_context_attribs(&fake_gl_ctx, gl_info); + if (context_debug_output_enabled(gl_info)) + { + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_DEBUG_BIT_ARB; + } + ctx_attribs[ctx_attrib_idx] = 0; + wined3d_create_fake_gl_context_attribs(&fake_gl_ctx, gl_info, ctx_attribs); if (!wined3d_adapter_init_gl_caps(adapter)) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 06b5274..85756cb 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension APPLE_YCBCR_422, /* ARB */ ARB_COLOR_BUFFER_FLOAT, + ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, @@ -179,6 +180,11 @@ enum wined3d_gl_extension USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(glClampColorARB) \ + /* GL_ARB_debug_output */ \ + USE_GL_FUNC(glDebugMessageCallbackARB) \ + USE_GL_FUNC(glDebugMessageControlARB) \ + USE_GL_FUNC(glDebugMessageInsertARB) \ + USE_GL_FUNC(glGetDebugMessageLogARB) \ /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(glDrawBuffersARB) \ /* GL_ARB_draw_elements_base_vertex */ \ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8b4ff9..17f3a68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1265,6 +1265,7 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; +BOOL context_debug_output_enabled(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN;

1 0

Christian Costa : advapi32: Specify the function is a stub in some FIXME.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 0d8776fa59333a636bf8e90c31ccd47d00e44ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8776fa59333a636bf8e90c3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Apr 17 23:40:46 2013 +0200 advapi32: Specify the function is a stub in some FIXME. --- dlls/advapi32/security.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0d5aba7..359b1e2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5671,7 +5671,7 @@ DWORD WINAPI GetNamedSecurityInfoExA( LPCSTR object, SE_OBJECT_TYPE type, */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) { - FIXME("%s %08x\n", debugstr_w(lpFileName), dwReserved); + FIXME("(%s, %08x): stub\n", debugstr_w(lpFileName), dwReserved); return TRUE; } @@ -5680,7 +5680,7 @@ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) */ BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) { - FIXME("%s %08x\n", debugstr_a(lpFileName), dwReserved); + FIXME("(%s, %08x): stub\n", debugstr_a(lpFileName), dwReserved); return TRUE; } @@ -5689,7 +5689,7 @@ BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) */ BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) { - FIXME("%s\n", debugstr_w(lpFileName)); + FIXME("(%s): stub\n", debugstr_w(lpFileName)); return TRUE; } @@ -5698,7 +5698,7 @@ BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) */ BOOL WINAPI EncryptFileA(LPCSTR lpFileName) { - FIXME("%s\n", debugstr_a(lpFileName)); + FIXME("(%s): stub\n", debugstr_a(lpFileName)); return TRUE; }

1 0

Francois Gouget : dmusic: Make DMUSIC_CreateDirectMusicDownloadedInstrumentImpl() static.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 2fca1765b6bc591d488573aecb950d5b6e85635f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fca1765b6bc591d488573aec… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 18 18:57:27 2013 +0200 dmusic: Make DMUSIC_CreateDirectMusicDownloadedInstrumentImpl() static. --- dlls/dmusic/port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 459fdb8..42fd5ea 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -108,7 +108,7 @@ static inline IDirectMusicDownloadedInstrumentImpl* unsafe_impl_from_IDirectMusi return impl_from_IDirectMusicDownloadedInstrument(iface); } -HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) +static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) { IDirectMusicDownloadedInstrumentImpl *object;

1 0

Francois Gouget : d3drm: Remove a no longer used debug channel.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 3bc96bcb0382b94fe2e7e7c357877eead5f41468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc96bcb0382b94fe2e7e7c35… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 18 18:57:32 2013 +0200 d3drm: Remove a no longer used debug channel. --- dlls/d3drm/d3drm_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index c9bf703..09ca79f 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -23,9 +23,7 @@ #include "wingdi.h" #include "d3drm.h" #include "d3drm_private.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3drm); /*********************************************************************** * DllMain (D3DRM.@)

1 0

Francois Gouget : ntdll: Remove an unused debug channel.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 77a142da5528b373e905bd7ea7d3d233ed29e7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a142da5528b373e905bd7ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 18 18:58:19 2013 +0200 ntdll: Remove an unused debug channel. --- dlls/ntdll/misc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index c115c9c..a6b3b22 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -31,7 +31,6 @@ #include "wine/debug.h" #include "ntdll_misc.h" -WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #if defined(__GNUC__) && defined(__i386__) #define DO_FPU(x,y) __asm__ __volatile__( x " %0;fwait" : "=m" (y) : )

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 2dc02352726e9278f2970346ee2f38f9b007f425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc02352726e9278f2970346e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 18 18:58:27 2013 +0200 d3dx9_36: Add a trailing '\n' to a TRACE(). --- dlls/d3dx9_36/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 207d152..b60cb89 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1793,7 +1793,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 { const D3DXVECTOR2 v = *pv; - TRACE("pout %p, pv %p, pm %p", pout, pv, pm); + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 2baecad2c51e1474d8614b613879861a87339e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2baecad2c51e1474d8614b613… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 18 18:58:05 2013 +0200 Assorted spelling fixes. --- dlls/kernel32/tests/loader.c | 2 +- dlls/winemac.drv/opengl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 20ae3ec..9fd5091 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1437,7 +1437,7 @@ static void child_process(const char *dll_name, DWORD target_offset) break; case 1: - case 2: /* ExitProcess will be called by PROCESS_DETACH handler */ + case 2: /* ExitProcess will be called by the PROCESS_DETACH handler */ ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 8a29d89..095514b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1751,7 +1751,7 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, bits per pixel instead of the mode's color bits. On Windows, color bits sometimes exceeds r+g+b (e.g. it's 32 for an R8G8B8A0 pixel format). If an app depends on that and requests WGL_COLOR_BITS_ARB == 32 and - expects that to match such a pixel format, we need to accomodate that. */ + expects that to match such a pixel format, we need to accommodate that. */ if (mode->alpha_bits) { if (mode->color_bits < color_bits) @@ -2133,7 +2133,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i of color bits. On Windows, color bits sometimes exceeds r+g+b (e.g. it's 32 for an R8G8B8A0 pixel format). If an app depends on that and expects that WGL_COLOR_BITS_ARB >= 32 for such a - pixel format, we need to accomodate that. */ + pixel format, we need to accommodate that. */ if (color_modes[pf->color_mode].alpha_bits) piValues[i] = color_modes[pf->color_mode].color_bits; else @@ -3124,7 +3124,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI /* If the mode doesn't have alpha, return bits per pixel instead of color bits. On Windows, color bits sometimes exceeds r+g+b (e.g. it's 32 for an R8G8B8A0 pixel format). If an app depends on that and expects that - cColorBits >= 32 for such a pixel format, we need to accomodate that. */ + cColorBits >= 32 for such a pixel format, we need to accommodate that. */ if (mode->alpha_bits) descr->cColorBits = mode->color_bits; else

1 0