June 2015 - Wine-Commits - list.winehq.org

Jacek Caban : msscript.ocx: Added IScriptControl stub implementation.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: 6b205e41cf0798fd6dff7c37e9b250fc885cf792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b205e41cf0798fd6dff7c37e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 30 14:09:03 2015 +0200 msscript.ocx: Added IScriptControl stub implementation. --- dlls/msscript.ocx/msscript.c | 311 ++++++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/msscript.idl | 2 +- 2 files changed, 309 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b205e41cf0798fd6dff7…

1 0

Michael Stefaniuc : dmstyle/tests: Add some basic DirectMusicTrack8 tests.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: b2ff03ed0350ba7e3892943cf5664099524b5a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ff03ed0350ba7e3892943cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:21:16 2015 +0200 dmstyle/tests: Add some basic DirectMusicTrack8 tests. --- dlls/dmstyle/tests/dmstyle.c | 60 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c229c..0c585fe 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -251,14 +251,15 @@ static void test_track(void) REFCLSID clsid; const char *name; BOOL has_save; + BOOL has_join; BOOL todo; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, TRUE }, - { X(DirectMusicChordTrack), TRUE, FALSE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, TRUE }, - { X(DirectMusicMuteTrack), TRUE, TRUE }, - { X(DirectMusicStyleTrack), FALSE, FALSE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, + { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, FALSE, TRUE }, + { X(DirectMusicMuteTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, }; #undef X unsigned int i; @@ -274,8 +275,55 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + if (class[i].clsid != &CLSID_DirectMusicChordTrack && + class[i].clsid != &CLSID_DirectMusicCommandTrack) { + /* Crashes on native */ + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + else + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + } else todo_wine { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + } + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + if (class[i].has_join) { + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } else { + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps);

1 0

Sebastian Lackner : windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: 863f432a7d73b8b480a742fcbaf01de33964cc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863f432a7d73b8b480a742fcb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 29 12:18:12 2015 +0200 windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder. --- dlls/windowscodecs/icnsformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 5ce44a2..54c7707 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) if (This->icns_image != NULL) HeapFree(GetProcessHeap(), 0, This->icns_image); - IUnknown_Release((IUnknown*)This->encoder); + IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -489,7 +489,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else { @@ -639,7 +639,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, frameEncode->committed = FALSE; *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; This->outstanding_commits++; - IUnknown_AddRef((IUnknown*)This); + IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); end: LeaveCriticalSection(&This->lock); @@ -725,8 +725,8 @@ HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

1 0

Michael Stefaniuc : explorer: Print the debug string and not the pointer to it.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: 51144d6a6d978a33a0b8c34a4d7fe309ba56e430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51144d6a6d978a33a0b8c34a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:30:05 2015 +0200 explorer: Print the debug string and not the pointer to it. --- programs/explorer/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d2a4932..2b8502b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1171,7 +1171,7 @@ static HRESULT WINAPI shellwindows_Revoke(IShellWindows *iface, LONG cookie) static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie, VARIANT *loc) { - FIXME("0x%x %p\n", cookie, debugstr_variant(loc)); + FIXME("0x%x %s\n", cookie, debugstr_variant(loc)); return E_NOTIMPL; } @@ -1184,7 +1184,7 @@ static HRESULT WINAPI shellwindows_OnActivated(IShellWindows *iface, LONG cookie static HRESULT WINAPI shellwindows_FindWindowSW(IShellWindows *iface, VARIANT *loc, VARIANT *root, int class, LONG *hwnd, int options, IDispatch **disp) { - TRACE("%s %p 0x%x %p 0x%x %p\n", debugstr_variant(loc), debugstr_variant(root), + TRACE("%s %s 0x%x %p 0x%x %p\n", debugstr_variant(loc), debugstr_variant(root), class, hwnd, options, disp); if (class != SWC_DESKTOP)

1 0

Michael Stefaniuc : kernel32/tests: The result of a comparison is already a BOOL.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: c50f6a304c93b1d17e762a412a259f1d0260b2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50f6a304c93b1d17e762a412… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:29:24 2015 +0200 kernel32/tests: The result of a comparison is already a BOOL. --- dlls/kernel32/tests/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b41f8ac..44794f1 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -793,9 +793,9 @@ static void test_GetVolumePathNameA(void) for (i=0; i<sizeof(test_paths)/sizeof(test_paths[0]); i++) { - BOOL broken_ret = test_paths[i].broken_error == NO_ERROR ? TRUE : FALSE; + BOOL broken_ret = test_paths[i].broken_error == NO_ERROR; char *output = (test_paths[i].path_name != NULL ? volume_path : NULL); - BOOL expected_ret = test_paths[i].error == NO_ERROR ? TRUE : FALSE; + BOOL expected_ret = test_paths[i].error == NO_ERROR; volume_path[0] = 0; if (test_paths[i].path_len < sizeof(volume_path))

1 0

Gerald Pfeifer : widl: Fix indentation in the EXPR_ADDRESSOF case in resolve_expression.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: 3a64eb2c4ad1e874229a2e6c0968754787a86a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a64eb2c4ad1e874229a2e6c0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jun 30 00:21:08 2015 +0200 widl: Fix indentation in the EXPR_ADDRESSOF case in resolve_expression. --- tools/widl/expr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 7012382..0ada012 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -571,7 +571,7 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc error_loc_info(&expr_loc->v->loc_info, "address-of operator applied to non-variable type in expression%s%s\n", expr_loc->attr ? " for attribute " : "", expr_loc->attr ? expr_loc->attr : ""); - result.is_variable = FALSE; + result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_pointer(RPC_FC_UP, result.type, NULL); break;

1 0

Thomas Faber : shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: c0cd954f98545ff21e68abdfd7b4fdaf17c17005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cd954f98545ff21e68abdfd… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jun 27 06:40:11 2015 -0400 shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface. --- dlls/shell32/shfldr_desktop.c | 2 ++ dlls/shell32/tests/shfldr_special.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 4aa1dcf..40cd752 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -106,6 +106,8 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + if (!ppvObj) return E_POINTER; + *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown) || diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 8f97347..6d61220 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -224,9 +224,24 @@ if (0) CoUninitialize(); } +static void test_desktop_folder(void) +{ + IShellFolder *psf; + HRESULT hr; + + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "Got %x\n", hr); + + hr = IShellFolder_QueryInterface(psf, &IID_IShellFolder, NULL); + ok(hr == E_POINTER, "Got %x\n", hr); + + IShellFolder_Release(psf); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); + test_desktop_folder(); }

1 0

Nikolay Sivov : gdi32: Clarify offsets and sizes in vdmx table lookup code.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: d5c9a8a57adcba58b3418156f267e64bc6ffbc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c9a8a57adcba58b3418156f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 21:32:07 2015 +0300 gdi32: Clarify offsets and sizes in vdmx table lookup code. --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 07d80a2..73824ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4463,6 +4463,12 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { + WORD version; + WORD numRecs; + WORD numRatios; +} VDMX_Header; + +typedef struct { BYTE bCharSet; BYTE xRatio; BYTE yStartRatio; @@ -4475,9 +4481,15 @@ typedef struct { BYTE endsz; } VDMX_group; +typedef struct { + WORD yPelHeight; + WORD yMax; + WORD yMin; +} VDMX_vTable; + static LONG load_VDMX(GdiFont *font, LONG height) { - WORD hdr[3]; + VDMX_Header hdr; VDMX_group group; BYTE devXRatio, devYRatio; USHORT numRecs, numRatios; @@ -4485,7 +4497,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = get_font_data(font, MS_VDMX_TAG, 0, hdr, sizeof(hdr)); + result = get_font_data(font, MS_VDMX_TAG, 0, &hdr, sizeof(hdr)); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -4494,14 +4506,14 @@ static LONG load_VDMX(GdiFont *font, LONG height) devXRatio = 1; devYRatio = 1; - numRecs = GET_BE_WORD(hdr[1]); - numRatios = GET_BE_WORD(hdr[2]); + numRecs = GET_BE_WORD(hdr.numRecs); + numRatios = GET_BE_WORD(hdr.numRatios); - TRACE("numRecs = %d numRatios = %d\n", numRecs, numRatios); + TRACE("version = %d numRecs = %d numRatios = %d\n", GET_BE_WORD(hdr.version), numRecs, numRatios); for(i = 0; i < numRatios; i++) { Ratios ratio; - offset = (3 * 2) + (i * sizeof(Ratios)); + offset = sizeof(hdr) + (i * sizeof(Ratios)); get_font_data(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); offset = -1; @@ -4516,11 +4528,11 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio >= ratio.yStartRatio && devYRatio <= ratio.yEndRatio)) { - WORD tmp; + WORD group_offset; - offset = (3 * 2) + (numRatios * 4) + (i * 2); - get_font_data(font, MS_VDMX_TAG, offset, &tmp, sizeof(tmp)); - offset = GET_BE_WORD(tmp); + offset = sizeof(hdr) + numRatios * sizeof(ratio) + i * sizeof(group_offset); + get_font_data(font, MS_VDMX_TAG, offset, &group_offset, sizeof(group_offset)); + offset = GET_BE_WORD(group_offset); break; } } @@ -4538,8 +4550,8 @@ static LONG load_VDMX(GdiFont *font, LONG height) TRACE("recs=%d startsz=%d endsz=%d\n", recs, startsz, endsz); - vTable = HeapAlloc(GetProcessHeap(), 0, recs * 6); - result = get_font_data(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); + vTable = HeapAlloc(GetProcessHeap(), 0, recs * sizeof(VDMX_vTable)); + result = get_font_data(font, MS_VDMX_TAG, offset + sizeof(group), vTable, recs * sizeof(VDMX_vTable)); if(result == GDI_ERROR) { FIXME("Failed to retrieve vTable\n"); goto end;

1 0

Hugh McMaster : wineconsole: Add HKCU registry entries for Insert Mode.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: ef0f0ad1d06bc7cdc05b92eb97d92d258247048e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0f0ad1d06bc7cdc05b92eb9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 30 20:05:35 2015 +1000 wineconsole: Add HKCU registry entries for Insert Mode. --- programs/wineconsole/registry.c | 13 +++++++++++-- programs/wineconsole/winecon_private.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 2805f2a..c1d04c1 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -40,6 +40,7 @@ static const WCHAR wszFontSize[] = {'F','o','n','t','S','i','z','e',0}; static const WCHAR wszFontWeight[] = {'F','o','n','t','W','e','i','g','h','t',0}; static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u','f','f','e','r','S','i','z','e',0}; static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0}; +static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0}; static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0}; static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0}; static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0}; @@ -48,10 +49,10 @@ static const WCHAR wszWindowSize[] = {'W','i','n','d','o','w','S','i','z' void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, - cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', + cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, wine_dbgstr_w(cfg->registry)); @@ -126,6 +127,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) cfg->history_nodup = val; count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszInsertMode, 0, &type, (LPBYTE)&val, &count)) + cfg->insert_mode = val; + + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszMenuMask, 0, &type, (LPBYTE)&val, &count)) cfg->menu_mask = val; @@ -175,6 +180,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->font_weight = 0; cfg->history_size = 50; cfg->history_nodup = 0; + cfg->insert_mode = 1; cfg->menu_mask = 0; cfg->quick_edit = 0; cfg->sb_height = 25; @@ -245,6 +251,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) val = cfg->history_nodup; RegSetValueExW(hConKey, wszHistoryNoDup, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->insert_mode; + RegSetValueExW(hConKey, wszInsertMode, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->menu_mask; RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index eec4171..2178dd0 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -36,6 +36,7 @@ struct config_data { DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ DWORD history_nodup; /* TRUE if commands are not stored twice in buffer */ + DWORD insert_mode; /* TRUE to insert text at the cursor location; FALSE to overwrite it */ DWORD menu_mask; /* MK_CONTROL MK_SHIFT mask to drive submenu opening */ DWORD quick_edit; /* whether mouse ops are sent to app (false) or used for content selection (true) */ unsigned sb_width; /* active screen buffer width */

1 0

Aaryaman Vasishta : d3drm/tests: Add test for IDirect3DRM*:: CreateDeviceFromClipper.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: c20e016eb23214f5d42132836927559824d2bd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20e016eb23214f5d42132836… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 29 20:34:06 2015 +0530 d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper. --- dlls/d3drm/tests/d3drm.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c20e016eb23214f5d4213…

1 0