October 2012 - Wine-Commits

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_texldl().
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 82a44af25998ef83b3883c1dc5484780043f16b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a44af25998ef83b3883c1dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:17 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_texldl(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6e3d8d..ff3c7e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3491,7 +3491,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4] - && shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { /* Plain GLSL only supports Lod sampling functions in vertex shaders. * However, the NVIDIA drivers allow them in fragment shaders as well,

1 0

Nikolay Sivov : dwrite: Implement GetMetrics() for IDWriteFont.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 6067df72911b958772a31bfc367e3429d373f0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6067df72911b958772a31bfc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 16 12:56:23 2012 -0400 dwrite: Implement GetMetrics() for IDWriteFont. --- dlls/dwrite/font.c | 69 +++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 100 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 153 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6067df72911b958772a31…

1 0

Daniel Jelinski : comctl32: Do not send TVN_ITEMEXPANDING when expanding item with no children.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 9933f5e44639c5a3ca05c6ebe84032d5884573d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9933f5e44639c5a3ca05c6ebe… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Sep 27 21:06:48 2012 +0200 comctl32: Do not send TVN_ITEMEXPANDING when expanding item with no children. --- dlls/comctl32/tests/treeview.c | 7 ++++++- dlls/comctl32/treeview.c | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index baf0e02..1021648 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1393,6 +1393,11 @@ static void test_expandnotify(void) ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, ret); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); + todo_wine expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "no collapse notifications", FALSE); + g_get_from_expand = TRUE; /* expand */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1481,7 +1486,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); expect(FALSE, ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", FALSE); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 032f49e..3f6b457 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3237,10 +3237,10 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TRACE("TVE_COLLAPSE %p %s\n", item, TREEVIEW_ItemName(item)); - if (!(item->state & TVIS_EXPANDED)) + if (!TREEVIEW_HasChildren(infoPtr, item)) return FALSE; - if (bUser || !(item->state & TVIS_EXPANDEDONCE)) + if (bUser) TREEVIEW_SendExpanding(infoPtr, item, action); if (item->firstChild == NULL) @@ -3248,7 +3248,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, item->state &= ~TVIS_EXPANDED; - if (bUser || !(item->state & TVIS_EXPANDEDONCE)) + if (bUser) TREEVIEW_SendExpanded(infoPtr, item, action); bSetSelection = (infoPtr->selectedItem != NULL @@ -3344,8 +3344,8 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TRACE("(%p, %p, partial=%d, %d\n", infoPtr, item, partial, user); - if (item->state & TVIS_EXPANDED) - return TRUE; + if (!TREEVIEW_HasChildren(infoPtr, item)) + return FALSE; tmpItem = item; nextItem = NULL; while (tmpItem)

1 0

Nikolay Sivov : ole32: Cleanup IClientSecurity interface of a proxy manager .
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 90407224d0752354ff3ad4f0ed43dff256721d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90407224d0752354ff3ad4f0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 23:30:40 2012 -0400 ole32: Cleanup IClientSecurity interface of a proxy manager. --- dlls/ole32/marshal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 9403789..a8df28c 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -57,7 +57,7 @@ struct proxy_manager { IMultiQI IMultiQI_iface; IMarshal IMarshal_iface; - const IClientSecurityVtbl *lpVtblCliSec; + IClientSecurity IClientSecurity_iface; struct apartment *parent; /* owning apartment (RO) */ struct list entry; /* entry in apartment (CS parent->cs) */ OXID oxid; /* object exported ID (RO) */ @@ -80,7 +80,7 @@ static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) { - return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblCliSec)); + return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface); } static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, @@ -756,7 +756,7 @@ static HRESULT proxy_manager_construct( This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl; - This->lpVtblCliSec = &ProxyCliSec_Vtbl; + This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl; list_init(&This->entry); list_init(&This->interfaces); @@ -881,8 +881,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, } if (IsEqualIID(riid, &IID_IClientSecurity)) { - *ppv = &This->lpVtblCliSec; - IUnknown_AddRef((IUnknown *)*ppv); + *ppv = &This->IClientSecurity_iface; + IClientSecurity_AddRef(&This->IClientSecurity_iface); return S_OK; }

1 0

Daniel Jelinski : comctl32/tests: Expanding/ collapsing a node always sends associated messages.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 50bdb257f9dd8184c86cbf9e196254ba1f5d3772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bdb257f9dd8184c86cbf9e1… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Oct 12 23:30:05 2012 +0200 comctl32/tests: Expanding/collapsing a node always sends associated messages. --- dlls/comctl32/tests/treeview.c | 45 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c60ed4d..2fe468b 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -212,6 +212,13 @@ static const struct message parent_expand_kb_seq[] = { { 0 } }; +static const struct message parent_collapse_2nd_kb_seq[] = { + { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static const struct message parent_expand_empty_kb_seq[] = { { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, @@ -1082,8 +1089,6 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(pTreeView->itemNew.mask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); - ok((pTreeView->itemNew.state & TVIS_EXPANDED) == 0, - "got wrong state %x\n", pTreeView->itemNew.state); ok(pTreeView->itemOld.mask == 0, "got wrong mask %x\n", pTreeView->itemOld.mask); @@ -1473,6 +1478,42 @@ static void test_expandnotify(void) ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, ret); + g_get_from_expand = TRUE; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "expand node", FALSE); + ok(g_item_expanding.state == TVIS_SELECTED, "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED), "got state on TVN_ITEMEXPANDED 0x%08x\n", + g_item_expanded.state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "expand node again", FALSE); + ok(g_item_expanding.state == (TVIS_SELECTED|TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDED 0x%08x\n", + g_item_expanded.state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_SUBTRACT, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "collapse node", FALSE); + ok(g_item_expanding.state == (TVIS_SELECTED|TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDED 0x%08x\n", + g_item_expanded.state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_SUBTRACT, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_collapse_2nd_kb_seq, "collapse node again", FALSE); + ok(g_item_expanding.state == (TVIS_SELECTED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + g_get_from_expand = FALSE; + flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); expect(FALSE, ret);

1 0

Detlef Riekenberg : dsound/tests: Handle broken E_FAIL of broken AC97 driver.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: b23450e38e83c8034104046be57de9149e5ad4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23450e38e83c8034104046be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 23:39:46 2012 +0200 dsound/tests: Handle broken E_FAIL of broken AC97 driver. --- dlls/dsound/tests/dsound.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 5b941a3..ad17d54 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1535,7 +1535,7 @@ static void test_hw_buffers(void) trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); - ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL), + ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), "CreateSoundBuffer(%u) failed: %08x\n", i, hr); if(hr != S_OK) break; @@ -1553,8 +1553,9 @@ static void test_hw_buffers(void) (caps.dwMaxHwMixingAllBuffers == 0 && hr == DSERR_INVALIDCALL) || /* no hw buffers at all */ hr == E_NOTIMPL || /* don't support hw buffers */ broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ + broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer gave wrong error: %08x\n", hr); + "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);

1 0

Daniel Jelinski : comctl32: Fix notifications and return value when collapsing already collapsed node.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 0b6cf6e46a02085ae97f943f9c2ce2db9a0a0caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6cf6e46a02085ae97f943f9… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Oct 12 22:50:23 2012 +0200 comctl32: Fix notifications and return value when collapsing already collapsed node. --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 1021648..c60ed4d 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1395,7 +1395,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); - todo_wine expect(FALSE, ret); + expect(FALSE, ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "no collapse notifications", FALSE); g_get_from_expand = TRUE; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3f6b457..3b2f747 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3234,6 +3234,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, RECT scrollRect; LONG scrollDist = 0; TREEVIEW_ITEM *nextItem = NULL, *tmpItem; + BOOL wasExpanded; TRACE("TVE_COLLAPSE %p %s\n", item, TREEVIEW_ItemName(item)); @@ -3246,9 +3247,10 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, if (item->firstChild == NULL) return FALSE; + wasExpanded = (item->state & TVIS_EXPANDED) != 0; item->state &= ~TVIS_EXPANDED; - if (bUser) + if (wasExpanded && bUser) TREEVIEW_SendExpanded(infoPtr, item, action); bSetSelection = (infoPtr->selectedItem != NULL @@ -3329,7 +3331,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, bSetFirstVisible ? item : infoPtr->firstVisible, TRUE); - return TRUE; + return wasExpanded; } static BOOL

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_mov().
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 347dda068f9a4fdb12607f6d337d0dffa5c6b01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=347dda068f9a4fdb12607f6d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:18 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_mov(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff3c7e4..388f438 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2314,7 +2314,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) /* In vs_1_1 WINED3DSIO_MOV can write to the address register. In later * shader versions WINED3DSIO_MOVA is used for this. */ if (ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX && ins->dst[0].reg.type == WINED3DSPR_ADDR) { /* This is a simple floor() */

1 0

Nikolay Sivov : ole32: Cleanup IMarshal interface of proxy manager.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 21a04f56216eef04a156b361cdce8b9af5d22f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a04f56216eef04a156b361c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 23:23:36 2012 -0400 ole32: Cleanup IMarshal interface of proxy manager. --- dlls/ole32/marshal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 8612b30..9403789 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -56,7 +56,7 @@ extern const CLSID CLSID_DfMarshal; struct proxy_manager { IMultiQI IMultiQI_iface; - const IMarshalVtbl *lpVtblMarshal; + IMarshal IMarshal_iface; const IClientSecurityVtbl *lpVtblCliSec; struct apartment *parent; /* owning apartment (RO) */ struct list entry; /* entry in apartment (CS parent->cs) */ @@ -75,7 +75,7 @@ struct proxy_manager static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) { - return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblMarshal)); + return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); } static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) @@ -755,7 +755,7 @@ static HRESULT proxy_manager_construct( } This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; - This->lpVtblMarshal = &ProxyMarshal_Vtbl; + This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl; This->lpVtblCliSec = &ProxyCliSec_Vtbl; list_init(&This->entry); @@ -875,8 +875,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, } if (IsEqualIID(riid, &IID_IMarshal)) { - *ppv = &This->lpVtblMarshal; - IUnknown_AddRef((IUnknown *)*ppv); + *ppv = &This->IMarshal_iface; + IMarshal_AddRef(&This->IMarshal_iface); return S_OK; } if (IsEqualIID(riid, &IID_IClientSecurity))

1 0

Vincent Povirk : mscoree: Update Wine Mono to 0.0.8.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: b3c0d3cd63e7603d6c576e3b89f3dd53da332f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c0d3cd63e7603d6c576e3b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 15 15:17:11 2012 -0500 mscoree: Update Wine Mono to 0.0.8. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3348cdb..60d2472 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -66,8 +66,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "0.0.4" -#define MONO_SHA "7d827f7d28a88ae0da95a136573783124ffce4b1" +#define MONO_VERSION "0.0.8" +#define MONO_SHA "dd349e72249ce5ff981be0e9dae33ac4a46a9f60" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c7a50c1..620fb9b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -652,7 +652,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "0.0.4"; + static const char* mono_version = "0.0.8"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0