January 2012 - Wine-commits

Stefan Dösinger : ddraw/tests: Add an IDirect3DDevice7 ::Load color key test.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 4775c76208d90cc402e6cbacf86c1f678ffe39fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4775c76208d90cc402e6cbacf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:19 2012 +0100 ddraw/tests: Add an IDirect3DDevice7::Load color key test. --- dlls/ddraw/tests/ddraw7.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0460a3f..ecafcec 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1128,6 +1128,93 @@ static void test_depth_blit(void) DestroyWindow(window); } +static void test_texture_load_ckey(void) +{ + HWND window; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + IDirectDrawSurface7 *src; + IDirectDrawSurface7 *dst; + DDSURFACEDESC2 ddsd; + HRESULT hr; + DDCOLORKEY ckey; + IDirect3D7 *d3d; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw7 interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + /* No surface has a color key */ + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0xdeadbeef; + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0xdeadbeef, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0xdeadbeef, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Source surface has a color key */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface7_SetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Both surfaces have a color key: Dest ckey is overwritten */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface7_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Only the destination has a color key: It is deleted. This behavior differs from + * IDirect3DTexture(2)::Load */ + hr = IDirectDrawSurface7_SetColorKey(src, DDCKEY_SRCBLT, NULL); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + todo_wine ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(dst); + IDirectDrawSurface7_Release(src); + IDirectDraw7_Release(ddraw); + IDirect3DDevice7_Release(device); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -1145,4 +1232,5 @@ START_TEST(ddraw7) test_surface_interface_mismatch(); test_coop_level_threaded(); test_depth_blit(); + test_texture_load_ckey(); }

1 0

Juan Lang : crypt32: Only accept trailing NULLs in a certificate common name.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: ab7f8a160f8fb8ae6a970778b40fdcd455521aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7f8a160f8fb8ae6a970778b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 31 08:59:36 2012 -0800 crypt32: Only accept trailing NULLs in a certificate common name. --- dlls/crypt32/chain.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 748c7ce..d112673 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3163,10 +3163,6 @@ static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, *see_wildcard = FALSE; - /* permit server_len to be one byte short if allowed_component is NULL terminated */ - if(allowed_component[allowed_len-1] == 0) - allowed_len--; - if (server_len < allowed_len) { WARN_(chain)("domain component %s too short for %s\n", @@ -3226,6 +3222,13 @@ static BOOL match_common_name(LPCWSTR server_name, const CERT_RDN_ATTR *nameAttr TRACE_(chain)("CN = %s\n", debugstr_wn(allowed_component, allowed_len)); + /* Remove trailing NULLs from the allowed name; while they shouldn't appear + * in a certificate in the first place, they sometimes do, and they should + * be ignored. + */ + while (allowed_len && allowed_component[allowed_len - 1] == 0) + allowed_len--; + /* From RFC 2818 (HTTP over TLS), section 3.1: * "Names may contain the wildcard character * which is considered to match * any single domain name component or component fragment. E.g.,

1 0

Andrew Eikum : winmm: Initialize COM for MULTITHREADED, not APARTMENTTHREADED.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 6847e882b8e7776a8ff9a77fd8795b062fadff6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6847e882b8e7776a8ff9a77fd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 31 12:53:00 2012 -0600 winmm: Initialize COM for MULTITHREADED, not APARTMENTTHREADED. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 59fc0a2..e800653 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2040,7 +2040,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) HRESULT hr; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if(FAILED(hr)){ ERR("CoInitializeEx failed: %08x\n", hr); return 1;

1 0

Alexandre Julliard : kernel32: Only change the Unix current after exec_process to make sure it' s inherited properly.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: e31dd6dba1e77ca0d2a6073424a0cf65c8f82ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31dd6dba1e77ca0d2a607342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 13:44:40 2012 +0100 kernel32: Only change the Unix current after exec_process to make sure it's inherited properly. --- dlls/kernel32/process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ad389ec..21f0817 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -904,7 +904,6 @@ static void init_current_directory( CURDIR *cur_dir ) HeapFree( GetProcessHeap(), 0, cwd ); done: - if (!cur_dir->Handle) chdir("/"); /* change to root directory so as not to lock cdroms */ TRACE( "starting in %s %p\n", debugstr_w( cur_dir->DosPath.Buffer ), cur_dir->Handle ); } @@ -1251,6 +1250,8 @@ void CDECL __wine_kernel_init(void) ExitProcess( error ); } + if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ + LdrInitializeThunk( start_process, 0, 0, 0 ); error:

1 0

Alexandre Julliard : winex11: Reset clipping when a fullscreen window is unmapped.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: a534925a4817cf5afa8fd692f9502c91c95ad58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a534925a4817cf5afa8fd692f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 13:45:04 2012 +0100 winex11: Reset clipping when a fullscreen window is unmapped. --- dlls/winex11.drv/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fcf5e0e..a172cd2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2543,7 +2543,10 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || (!event_type && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) + { unmap_window( display, data ); + if (is_window_rect_fullscreen( &old_window_rect )) reset_clipping_window(); + } } /* don't change position if we are about to minimize or maximize a managed window */

1 0

Henri Verbeet : ddraw: AddAttachedSurface() just references whatever we pass it.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 0d8e6719d524ad7bbaf616dff90a1ed6ca15937b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e6719d524ad7bbaf616dff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 21:19:48 2012 +0100 ddraw: AddAttachedSurface() just references whatever we pass it. --- dlls/ddraw/surface.c | 16 ++++++++-------- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 4 +++- dlls/ddraw/tests/ddraw7.c | 4 +++- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f4a4d56..ced64a9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1605,8 +1605,8 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa { return hr; } - ddraw_surface7_AddRef(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); return hr; } @@ -1624,9 +1624,9 @@ static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *ifa { return hr; } - ddraw_surface4_AddRef(&attachment_impl->IDirectDrawSurface4_iface); - ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); return hr; } static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) @@ -1670,8 +1670,8 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa { return hr; } - ddraw_surface3_AddRef(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); return hr; } @@ -1689,9 +1689,9 @@ static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *ifa { return hr; } - ddraw_surface2_AddRef(&attachment_impl->IDirectDrawSurface2_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); return hr; } @@ -1709,9 +1709,9 @@ static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *ifac { return hr; } - ddraw_surface1_AddRef(&attachment_impl->IDirectDrawSurface_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3542564..233d013 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -662,6 +662,7 @@ static void test_surface_interface_mismatch(void) IDirect3DMaterial *background = NULL; DDSURFACEDESC surface_desc; DWORD z_depth = 0; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -728,7 +729,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); + refcount = IDirectDrawSurface_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5fa6028..3a62f57 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -687,6 +687,7 @@ static void test_surface_interface_mismatch(void) IDirect3DMaterial2 *background = NULL; DDSURFACEDESC surface_desc; DWORD z_depth = 0; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -753,7 +754,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); + refcount = IDirectDrawSurface_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 34cab7f..b242f86 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -875,6 +875,7 @@ static void test_surface_interface_mismatch(void) IDirect3DViewport3 *viewport = NULL; DDSURFACEDESC2 surface_desc; DDPIXELFORMAT z_fmt; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -936,7 +937,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface4_Release(ds); + refcount = IDirectDrawSurface4_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8eb7098..0460a3f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -841,6 +841,7 @@ static void test_surface_interface_mismatch(void) IDirect3DDevice7 *device = NULL; DDSURFACEDESC2 surface_desc; DDPIXELFORMAT z_fmt; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -900,7 +901,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface7_Release(ds); + refcount = IDirectDrawSurface7_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup;

1 0

Henri Verbeet : wrc: Avoid an unused function warning when HAVE_LIBGETTEXTPO is not defined.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 187065e1c34811f5876afca41e76d97e2a64116f URL: http://source.winehq.org/git/wine.git/?a=commit;h=187065e1c34811f5876afca41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 21:19:49 2012 +0100 wrc: Avoid an unused function warning when HAVE_LIBGETTEXTPO is not defined. --- tools/wrc/po.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 1d679ba..b4497c9 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -124,16 +124,6 @@ static char *get_message_context( char **msgid ) return context; } -static int string_has_context( const string_t *str ) -{ - char *id, *id_buffer, *context; - - id_buffer = id = convert_msgid_ascii( str, 1 ); - context = get_message_context( &id ); - free( id_buffer ); - return context != NULL; -} - static int control_has_title( const control_t *ctrl ) { if (!ctrl->title) return 0; @@ -819,6 +809,16 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } +static int string_has_context( const string_t *str ) +{ + char *id, *id_buffer, *context; + + id_buffer = id = convert_msgid_ascii( str, 1 ); + context = get_message_context( &id ); + free( id_buffer ); + return context != NULL; +} + static void add_pot_accel( po_file_t po, const resource_t *res ) { event_t *event = res->res.acc->events;

1 0

Austin English : wscript: Remove an unused variable (LLVM/Clang).
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: c02d0d85ea1ec16efa0190f169e158c580f52672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02d0d85ea1ec16efa0190f16… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 30 22:41:30 2012 -0600 wscript: Remove an unused variable (LLVM/Clang). --- programs/wscript/tests/run.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 315f51f..567bf45 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -341,7 +341,6 @@ static IClassFactory testobj_cf = { &ClassFactoryVtbl }; static void run_test(const char *file_name) { - SECURITY_ATTRIBUTES sa = {sizeof(sa), 0, TRUE}; char command[MAX_PATH]; STARTUPINFOA si = {sizeof(si)}; PROCESS_INFORMATION pi;

1 0

Austin English : crypt32: Remove a couple unused variables (LLVM/Clang).
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: fab9c719632a3432386edfb3d85a179c681c6b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab9c719632a3432386edfb3d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 30 22:43:36 2012 -0600 crypt32: Remove a couple unused variables (LLVM/Clang). --- dlls/crypt32/tests/msg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index d5d5309..b40302a 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -166,8 +166,6 @@ static void test_msg_get_param(void) BOOL ret; HCRYPTMSG msg; DWORD size, i, value; - CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; - CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; /* Crash ret = CryptMsgGetParam(NULL, 0, 0, NULL, NULL);

1 0

Austin English : dsound: Remove an unnecessary assignment (LLVM/Clang).
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: c6bda4dc172ccea50037464770513ef10edc7257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bda4dc172ccea5003746477… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 30 22:47:46 2012 -0600 dsound: Remove an unnecessary assignment (LLVM/Clang). --- dlls/dsound/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 23af6ce..7d0ea66 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -482,7 +482,7 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT len) static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD fraglen) { INT len = fraglen, ilen; - BYTE *ibuf = dsb->buffer->memory + dsb->buf_mixpos, *volbuf; + BYTE *ibuf, *volbuf; DWORD oldpos, mixbufpos; TRACE("buf_mixpos=%d/%d sec_mixpos=%d/%d\n", dsb->buf_mixpos, dsb->tmp_buffer_len, dsb->sec_mixpos, dsb->buflen);

1 0