November 2011 - Wine-commits

Francois Gouget : openal32: Delete the static critical section when unloading the dll.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 7f3fa7c8588f0293538927aefaa1f4d9fd286d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3fa7c8588f0293538927aef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:53:26 2011 +0100 openal32: Delete the static critical section when unloading the dll. --- dlls/openal32/openal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index ec4149c..d3ff07d 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -106,6 +106,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) LOADFUNC(alcGetThreadContext); #undef LOADFUNC break; + case DLL_PROCESS_DETACH: + DeleteCriticalSection(&openal_cs); } return TRUE;

1 0

Francois Gouget : pdh: Delete the static critical section when unloading the dll.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: fcd8a8f447f9774faeb2e1b31cea3d09d8507025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd8a8f447f9774faeb2e1b31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:53:39 2011 +0100 pdh: Delete the static critical section when unloading the dll. --- dlls/pdh/pdh_main.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index bdf83a9..69f0d71 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -85,12 +85,16 @@ static inline WCHAR *pdh_strdup_aw( const char *src ) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) + switch (fdwReason) { - DisableThreadLibraryCalls( hinstDLL ); + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + DeleteCriticalSection(&pdh_handle_cs); + break; } return TRUE;

1 0

Francois Gouget : urlmon: Delete the static critical section when unloading the dll.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 7b1d68563454dc4fcd3de89137f4fcb496ee31c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1d68563454dc4fcd3de8913… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:54:13 2011 +0100 urlmon: Delete the static critical section when unloading the dll. --- dlls/urlmon/urlmon_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0911127..cfd0918 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -154,6 +154,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_DETACH: process_detach(); + DeleteCriticalSection(&tls_cs); break; case DLL_THREAD_DETACH:

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskEnableCapture().
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: c7feb3a533134a826b6be39fffc3fcc8eb79cb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7feb3a533134a826b6be39ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 16 20:08:03 2011 +0100 d3d10: Implement D3D10StateBlockMaskEnableCapture(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/tests/device.c | 58 +++++++++++++++++-------- include/d3d10effect.h | 2 + 4 files changed, 149 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7feb3a533134a826b6be…

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskGetSetting().
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 380f989c4a73dc652af5e43fbaef87c663fb4c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=380f989c4a73dc652af5e43fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 16 20:08:04 2011 +0100 d3d10: Implement D3D10StateBlockMaskGetSetting(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/tests/device.c | 22 ++++++++++++ include/d3d10effect.h | 2 + 4 files changed, 108 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index b507d6d..aab3822 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -24,6 +24,6 @@ @ stdcall D3D10StateBlockMaskDisableCapture(ptr long long long) @ stdcall D3D10StateBlockMaskEnableAll(ptr) @ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long) -@ stub D3D10StateBlockMaskGetSetting +@ stdcall D3D10StateBlockMaskGetSetting(ptr long long) @ stub D3D10StateBlockMaskIntersect @ stub D3D10StateBlockMaskUnion diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 0dae718..ebc5370 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -144,6 +144,14 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, return S_OK; } +static BOOL stateblock_mask_get_bit(BYTE *field, UINT field_size, UINT idx) +{ + if (idx >= field_size) + return FALSE; + + return field[idx >> 3] & (1 << (idx & 7)); +} + static HRESULT stateblock_mask_set_bits(BYTE *field, UINT field_size, UINT start_bit, UINT count) { UINT end_bit = start_bit + count; @@ -402,3 +410,78 @@ HRESULT WINAPI D3D10StateBlockMaskEnableCapture(D3D10_STATE_BLOCK_MASK *mask, return E_INVALIDARG; } } + +BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, + D3D10_DEVICE_STATE_TYPES state_type, UINT idx) +{ + TRACE("mask %p state_type %s, idx %u.\n", + mask, debug_d3d10_device_state_types(state_type), idx); + + if (!mask) + return FALSE; + + switch (state_type) + { + case D3D10_DST_SO_BUFFERS: + return stateblock_mask_get_bit(&mask->SOBuffers, 1, idx); + case D3D10_DST_OM_RENDER_TARGETS: + return stateblock_mask_get_bit(&mask->OMRenderTargets, 1, idx); + case D3D10_DST_DEPTH_STENCIL_STATE: + return stateblock_mask_get_bit(&mask->OMDepthStencilState, 1, idx); + case D3D10_DST_BLEND_STATE: + return stateblock_mask_get_bit(&mask->OMBlendState, 1, idx); + case D3D10_DST_VS: + return stateblock_mask_get_bit(&mask->VS, 1, idx); + case D3D10_DST_VS_SAMPLERS: + return stateblock_mask_get_bit(mask->VSSamplers, + D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT, idx); + case D3D10_DST_VS_SHADER_RESOURCES: + return stateblock_mask_get_bit(mask->VSShaderResources, + D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, idx); + case D3D10_DST_VS_CONSTANT_BUFFERS: + return stateblock_mask_get_bit(mask->VSConstantBuffers, + D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, idx); + case D3D10_DST_GS: + return stateblock_mask_get_bit(&mask->GS, 1, idx); + case D3D10_DST_GS_SAMPLERS: + return stateblock_mask_get_bit(mask->GSSamplers, + D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT, idx); + case D3D10_DST_GS_SHADER_RESOURCES: + return stateblock_mask_get_bit(mask->GSShaderResources, + D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, idx); + case D3D10_DST_GS_CONSTANT_BUFFERS: + return stateblock_mask_get_bit(mask->GSConstantBuffers, + D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, idx); + case D3D10_DST_PS: + return stateblock_mask_get_bit(&mask->PS, 1, idx); + case D3D10_DST_PS_SAMPLERS: + return stateblock_mask_get_bit(mask->PSSamplers, + D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT, idx); + case D3D10_DST_PS_SHADER_RESOURCES: + return stateblock_mask_get_bit(mask->PSShaderResources, + D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, idx); + case D3D10_DST_PS_CONSTANT_BUFFERS: + return stateblock_mask_get_bit(mask->PSConstantBuffers, + D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, idx); + case D3D10_DST_IA_VERTEX_BUFFERS: + return stateblock_mask_get_bit(mask->IAVertexBuffers, + D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT, idx); + case D3D10_DST_IA_INDEX_BUFFER: + return stateblock_mask_get_bit(&mask->IAIndexBuffer, 1, idx); + case D3D10_DST_IA_INPUT_LAYOUT: + return stateblock_mask_get_bit(&mask->IAInputLayout, 1, idx); + case D3D10_DST_IA_PRIMITIVE_TOPOLOGY: + return stateblock_mask_get_bit(&mask->IAPrimitiveTopology, 1, idx); + case D3D10_DST_RS_VIEWPORTS: + return stateblock_mask_get_bit(&mask->RSViewports, 1, idx); + case D3D10_DST_RS_SCISSOR_RECTS: + return stateblock_mask_get_bit(&mask->RSScissorRects, 1, idx); + case D3D10_DST_RS_RASTERIZER_STATE: + return stateblock_mask_get_bit(&mask->RSRasterizerState, 1, idx); + case D3D10_DST_PREDICATION: + return stateblock_mask_get_bit(&mask->Predication, 1, idx); + default: + FIXME("Unhandled state_type %#x.\n", state_type); + return FALSE; + } +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index fd7a6a2..a0958c5 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -94,6 +94,7 @@ static void test_stateblock_mask(void) }; D3D10_STATE_BLOCK_MASK mask_x, mask_y, result; HRESULT hr; + BOOL ret; UINT i; memset(&mask_x, 0, sizeof(mask_x)); @@ -176,6 +177,27 @@ static void test_stateblock_mask(void) result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i); } + + result.VS = 0xff; + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS, 0); + ok(ret == 1, "Got unexpected ret %#x.\n", ret); + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS, 1); + ok(!ret, "Got unexpected ret %#x.\n", ret); + result.VS = 0xfe; + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS, 0); + ok(!ret, "Got unexpected ret %#x.\n", ret); + result.VS = 0; + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS, 0); + ok(!ret, "Got unexpected ret %#x.\n", ret); + memset(&result, 0xff, sizeof(result)); + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS_SHADER_RESOURCES, 3); + ok(ret == 8, "Got unexpected ret %#x.\n", ret); + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS_SHADER_RESOURCES, + D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT); + ok(!ret, "Got unexpected ret %#x.\n", ret); + memset(&result, 0, sizeof(result)); + ret = D3D10StateBlockMaskGetSetting(&result, D3D10_DST_VS_SHADER_RESOURCES, 3); + ok(!ret, "Got unexpected ret %#x.\n", ret); } START_TEST(device) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index d9f2f5e..c39bbb2 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -840,6 +840,8 @@ HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, HRESULT WINAPI D3D10StateBlockMaskEnableAll(D3D10_STATE_BLOCK_MASK *mask); HRESULT WINAPI D3D10StateBlockMaskEnableCapture(D3D10_STATE_BLOCK_MASK *mask, D3D10_DEVICE_STATE_TYPES state_type, UINT start_idx, UINT count); +BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, + D3D10_DEVICE_STATE_TYPES state_type, UINT idx); #ifdef __cplusplus }

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskIntersect().
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 7cce4453d4bc4c58288c7fac275f175a3c8223e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cce4453d4bc4c58288c7fac2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 16 20:08:05 2011 +0100 d3d10: Implement D3D10StateBlockMaskIntersect(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 23 +++++++++++++++++++++++ dlls/d3d10/tests/device.c | 11 +++++++++++ include/d3d10effect.h | 2 ++ 4 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index aab3822..42996a8 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -25,5 +25,5 @@ @ stdcall D3D10StateBlockMaskEnableAll(ptr) @ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long) @ stdcall D3D10StateBlockMaskGetSetting(ptr long long) -@ stub D3D10StateBlockMaskIntersect +@ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr) @ stub D3D10StateBlockMaskUnion diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index ebc5370..67ccae7 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -485,3 +485,26 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, return FALSE; } } + +HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result) +{ + UINT count = sizeof(*result) / sizeof(DWORD); + UINT i; + + TRACE("mask_x %p, mask_y %p, result %p.\n", mask_x, mask_y, result); + + if (!mask_x || !mask_y || !result) + return E_INVALIDARG; + + for (i = 0; i < count; ++i) + { + ((DWORD *)result)[i] = ((DWORD *)mask_x)[i] & ((DWORD *)mask_y)[i]; + } + for (i = count * sizeof(DWORD); i < sizeof(*result); ++i) + { + ((BYTE *)result)[i] = ((BYTE *)mask_x)[i] & ((BYTE *)mask_y)[i]; + } + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index a0958c5..2ce0b2a 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -117,6 +117,17 @@ static void test_stateblock_mask(void) hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); + ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); + ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index c39bbb2..6db61d3 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -842,6 +842,8 @@ HRESULT WINAPI D3D10StateBlockMaskEnableCapture(D3D10_STATE_BLOCK_MASK *mask, D3D10_DEVICE_STATE_TYPES state_type, UINT start_idx, UINT count); BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, D3D10_DEVICE_STATE_TYPES state_type, UINT idx); +HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); #ifdef __cplusplus }

1 0

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

17 Nov '11

Module: wine Branch: master Commit: 18a7653c78fac8ee0bdabb4e67d98bd6c4440e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a7653c78fac8ee0bdabb4e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 16 20:08:06 2011 +0100 wined3d: Get rid of the WINED3DDISPLAYMODE typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 5 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 4 +- dlls/d3d9/swapchain.c | 2 +- dlls/ddraw/ddraw.c | 136 +++++++++++++++++++++++----------------------- dlls/ddraw/device.c | 10 ++-- dlls/dxgi/output.c | 8 ++-- dlls/wined3d/device.c | 66 +++++++++++----------- dlls/wined3d/directx.c | 36 ++++++------ dlls/wined3d/swapchain.c | 35 ++++++------ include/wine/wined3d.h | 22 ++++---- 12 files changed, 166 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18a7653c78fac8ee0bdab…

1 0

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

17 Nov '11

Module: wine Branch: master Commit: a7c9c793cf0a58b3b8c7ebdbb086d14fb8aba223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c9c793cf0a58b3b8c7ebdbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 16 20:08:07 2011 +0100 wined3d: Get rid of the WINED3DVECTOR typedef. --- include/wine/wined3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3cf3ec0..5e0423b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1525,12 +1525,12 @@ struct wined3d_color float a; }; -typedef struct _WINED3DVECTOR +struct wined3d_vec3 { float x; float y; float z; -} WINED3DVECTOR; +}; typedef struct _WINED3DMATRIX { @@ -1553,8 +1553,8 @@ typedef struct _WINED3DLIGHT struct wined3d_color Diffuse; struct wined3d_color Specular; struct wined3d_color Ambient; - WINED3DVECTOR Position; - WINED3DVECTOR Direction; + struct wined3d_vec3 Position; + struct wined3d_vec3 Direction; float Range; float Falloff; float Attenuation0;

1 0

Frédéric Delanoy : rsaenh: Remove unused file-static variables.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 936d5351f514a0f71b17bd5c8bfc143769b0aee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936d5351f514a0f71b17bd5c8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 17 00:29:14 2011 +0100 rsaenh: Remove unused file-static variables. --- dlls/rsaenh/rsaenh.c | 53 -------------------------------------------------- 1 files changed, 0 insertions(+), 53 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fe5ff3a..9d38793 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4509,59 +4509,6 @@ cleanup: return res; } -static const WCHAR szProviderKeys[6][116] = { - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ','B','a','s', - 'e',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d', - ' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ','S','t','r','o','n','g', - ' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'R','S','A',' ','S','C','h','a','n','n','e','l',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r', - ' ','(','P','r','o','t','o','t','y','p','e',')',0 } -}; -static const WCHAR szDefaultKeys[3][65] = { - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','0','1',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','1','2',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','2','4',0 } -}; - - /****************************************************************************** * DllRegisterServer (RSAENH.@) */

1 0

Frédéric Delanoy : atl: Avoid harcoding array lengths.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 9bdcfc5d3e3a8a7a912bd43d63c4fdb60605813c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdcfc5d3e3a8a7a912bd43d6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 17 00:37:13 2011 +0100 atl: Avoid harcoding array lengths. --- dlls/atl/atl_ax.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 9166aa0..c1b74f7 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1211,7 +1211,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) src += strlenW(src) + 1; /* title */ if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { - static const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0}; + static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR)); PUT_BLOCK(tmp, strlenW(tmp)+1); } else

1 0