January 2009 - Wine-Commits

Henri Verbeet : wined3d: Use GL_ALIASED_POINT_SIZE_RANGE to retrieve the max point size.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: e028e3f7bd6d63c5f5739120de6d615677846ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e028e3f7bd6d63c5f5739120d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 9 10:23:42 2009 +0100 wined3d: Use GL_ALIASED_POINT_SIZE_RANGE to retrieve the max point size. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 456aa07..7c0fa14 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -744,7 +744,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->max_texture_size = gl_max; TRACE_(d3d_caps)("Maximum texture size support - max texture size=%d\n", gl_max); - glGetFloatv(GL_POINT_SIZE_RANGE, gl_floatv); + glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, gl_floatv); gl_info->max_pointsizemin = gl_floatv[0]; gl_info->max_pointsize = gl_floatv[1]; TRACE_(d3d_caps)("Maximum point size support - max point size=%f\n", gl_floatv[1]);

1 0

Francois Gouget : xinput1_3/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 5da42336d9c0fd0ce6de5d5ce2042fab59b8db01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da42336d9c0fd0ce6de5d5ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 19:23:16 2009 +0100 xinput1_3/tests: Add a trailing '\n' to an ok() call. --- dlls/xinput1_3/tests/xinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 29f075f..2a07f2d 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -184,7 +184,7 @@ static void test_get_batteryinformation(void) if (ERROR_DEVICE_NOT_CONNECTED == result) { - ok(batteryInfo.BatteryLevel == BATTERY_TYPE_DISCONNECTED, "Failed to report device as being disconnected."); + ok(batteryInfo.BatteryLevel == BATTERY_TYPE_DISCONNECTED, "Failed to report device as being disconnected.\n"); skip("Controller %d is not connected\n", controllerNum); } }

1 0

Francois Gouget : setupapi: Fix the StringTableLookUpStringEx() prototype.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 916d6a44500735b3fecf0e7c485c2aa7e8025644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916d6a44500735b3fecf0e7c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 19:23:08 2009 +0100 setupapi: Fix the StringTableLookUpStringEx() prototype. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stringtable.c | 14 +++++++------- dlls/setupapi/tests/stringtable.c | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 03435bc..6c86043 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -533,7 +533,7 @@ @ stdcall StringTableInitialize() @ stdcall StringTableInitializeEx(long long) @ stdcall StringTableLookUpString(ptr wstr long) -@ stdcall StringTableLookUpStringEx(ptr wstr long ptr ptr) +@ stdcall StringTableLookUpStringEx(ptr wstr long ptr long) @ stdcall StringTableSetExtraData(ptr long ptr long) @ stdcall StringTableStringFromId(ptr long) @ stdcall StringTableStringFromIdEx(ptr long ptr ptr) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index fe319b8..0dbe6e8 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -457,7 +457,7 @@ StringTableGetExtraData(HSTRING_TABLE hStringTable, * dwFlags [I] Flags * 1: case sensitive compare * lpExtraData [O] Pointer to the buffer that receives the extra data - * lpReserved [I/O] Unused + * dwReserved [I/O] Unused * * RETURNS * Success: String ID @@ -468,13 +468,13 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable, LPWSTR lpString, DWORD dwFlags, LPVOID lpExtraData, - LPDWORD lpReserved) + DWORD dwReserved) { PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %x %p, %p\n", hStringTable, debugstr_w(lpString), dwFlags, - lpExtraData, lpReserved); + TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags, + lpExtraData, dwReserved); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -493,7 +493,7 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable, if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - memcpy(lpExtraData, pStringTable->pSlots[i].pData, (DWORD)lpReserved); + memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved); return i + 1; } } @@ -502,7 +502,7 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable, if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - memcpy(lpExtraData, pStringTable->pSlots[i].pData, (DWORD)lpReserved); + memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved); return i + 1; } } @@ -532,7 +532,7 @@ StringTableLookUpString(HSTRING_TABLE hStringTable, LPWSTR lpString, DWORD dwFlags) { - return StringTableLookUpStringEx(hStringTable, lpString, dwFlags, NULL, NULL); + return StringTableLookUpStringEx(hStringTable, lpString, dwFlags, NULL, 0); } diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index a209f23..40e4a54 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -46,7 +46,7 @@ static HSTRING_TABLE (WINAPI *pStringTableDuplicate)(HSTRING_TABLE hStringTable) static HSTRING_TABLE (WINAPI *pStringTableInitialize)(VOID); static HSTRING_TABLE (WINAPI *pStringTableInitializeEx)(DWORD, DWORD); static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); -static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); +static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); #if 0 static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); @@ -247,33 +247,33 @@ static void test_StringTableLookUpStringEx(void) ok(table2 != NULL, "Failed to duplicate String Table\n"); /* case insensitive */ - retval = pStringTableLookUpStringEx(table, string, 0, NULL, NULL); + retval = pStringTableLookUpStringEx(table, string, 0, NULL, 0); ok(retval != ~0u, "Failed find string in String Table 1\n"); ok(retval == hstring, "Lookup for string (%x) does not match previous handle (%x) in String Table 1\n", retval, hstring); - retval = pStringTableLookUpStringEx(table2, string, 0, NULL, NULL); + retval = pStringTableLookUpStringEx(table2, string, 0, NULL, 0); ok(retval != ~0u, "Failed find string in String Table 2\n"); - retval = pStringTableLookUpStringEx(table, String, 0, NULL, NULL); + retval = pStringTableLookUpStringEx(table, String, 0, NULL, 0); ok(retval != ~0u, "Failed find String in String Table 1\n"); - retval = pStringTableLookUpStringEx(table2, String, 0, NULL, NULL); + retval = pStringTableLookUpStringEx(table2, String, 0, NULL, 0); ok(retval != ~0u, "Failed find String in String Table 2\n"); - retval=pStringTableLookUpStringEx(table, foo, 0, NULL, NULL); + retval=pStringTableLookUpStringEx(table, foo, 0, NULL, 0); ok(retval != ~0u, "Failed find foo in String Table 1\n"); ok(retval == hfoo, "Lookup for foo (%x) does not match previous handle (%x) in String Table 1\n", retval, hfoo); - retval = pStringTableLookUpStringEx(table2, foo, 0, NULL, NULL); + retval = pStringTableLookUpStringEx(table2, foo, 0, NULL, 0); ok(retval != ~0u, "Failed find foo in String Table 2\n"); /* case sensitive */ - retval = pStringTableLookUpStringEx(table, string,ST_CASE_SENSITIVE_COMPARE, NULL, NULL); - retval2 = pStringTableLookUpStringEx(table, String, ST_CASE_SENSITIVE_COMPARE, NULL, NULL); + retval = pStringTableLookUpStringEx(table, string,ST_CASE_SENSITIVE_COMPARE, NULL, 0); + retval2 = pStringTableLookUpStringEx(table, String, ST_CASE_SENSITIVE_COMPARE, NULL, 0); ok(retval != retval2, "Lookup of string equals String in Table 1\n"); ok(retval == hString, "Lookup for String (%x) does not match previous handle (%x) in String Table 1\n", @@ -289,17 +289,17 @@ static void test_StringTableLookUpStringEx(void) ok(retval != ~0u, "failed to add 'UILEVEL' to string table\n"); memset(buffer, 0x55, sizeof(buffer)); - retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, (LPDWORD)0); + retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, 0); ok(retval != ~0u, "failed find 'UILEVEL' in string table\n"); ok(memcmp(buffer, &data, 4), "unexpected data\n"); memset(buffer, 0x55, sizeof(buffer)); - retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, (LPDWORD)2); + retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, 2); ok(retval != ~0u, "failed find 'UILEVEL' in string table\n"); ok(!memcmp(buffer, &data, 2), "unexpected data\n"); memset(buffer, 0x55, sizeof(buffer)); - retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, (LPDWORD)sizeof(buffer)); + retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, sizeof(buffer)); ok(retval != ~0u, "failed find 'UILEVEL' in string table\n"); ok(!memcmp(buffer, &data, 4), "unexpected data\n");

1 0

Francois Gouget : kernel32: Fix the sysctl() usage and the CPU detection on NetBSD.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: b881cfc5414989d61680cdea1765a897bfdb5ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b881cfc5414989d61680cdea1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 9 09:34:55 2009 +0100 kernel32: Fix the sysctl() usage and the CPU detection on NetBSD. --- dlls/kernel32/cpu.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index bd3d74a..95ac469 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -547,7 +547,8 @@ VOID WINAPI GetSystemInfo( #elif defined (__NetBSD__) { int mib[2]; - int value[2]; + int value; + size_t val_len; char model[256]; char *cpuclass; FILE *f = fopen ("/var/run/dmesg.boot", "r"); @@ -556,33 +557,33 @@ VOID WINAPI GetSystemInfo( mib[0] = CTL_MACHDEP; #ifdef CPU_FPU_PRESENT mib[1] = CPU_FPU_PRESENT; - value[1] = sizeof(int); - if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) + val_len = sizeof(value); + if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) if (value) PF[PF_FLOATING_POINT_EMULATED] = FALSE; else PF[PF_FLOATING_POINT_EMULATED] = TRUE; #endif #ifdef CPU_SSE mib[1] = CPU_SSE; /* this should imply MMX */ - value[1] = sizeof(int); - if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) + val_len = sizeof(value); + if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; #endif #ifdef CPU_SSE2 mib[1] = CPU_SSE2; /* this should imply MMX */ - value[1] = sizeof(int); - if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) + value[1] = sizeof(value); + if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; #endif mib[0] = CTL_HW; mib[1] = HW_NCPU; - value[1] = sizeof(int); - if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) - if (value[0] > cachedsi.dwNumberOfProcessors) + val_len = sizeof(value); + if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) + if (value > cachedsi.dwNumberOfProcessors) cachedsi.dwNumberOfProcessors = value[0]; mib[1] = HW_MODEL; - value[1] = 255; - if (sysctl(mib, 2, model, value+1, NULL, 0) >= 0) { - model[value[1]] = '\0'; /* just in case */ + val_len = sizeof(model)-1; + if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) { + model[val_len] = '\0'; /* just in case */ cpuclass = strstr(model, "-class"); if (cpuclass != NULL) { while(cpuclass > model && cpuclass[0] != '(') cpuclass--; @@ -636,7 +637,7 @@ VOID WINAPI GetSystemInfo( #elif defined(__FreeBSD__) { int ret, num; - unsigned len; + size_t len; get_cpuinfo( &cachedsi );

1 0

Dylan Smith : wordpad: Use unicode version of CBEM_GETITEM message.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 35680c83d114a4882c4d42d091439b9b962fe657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35680c83d114a4882c4d42d09… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 8 14:17:55 2009 -0500 wordpad: Use unicode version of CBEM_GETITEM message. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index fe78012..251b6b4 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1341,7 +1341,7 @@ static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT buff cbItem.iItem = idx; cbItem.pszText = wszBuffer; cbItem.cchTextMax = bufferLength-1; - result = SendMessageW(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); + result = SendMessageW(hComboEx, CBEM_GETITEMW, 0, (LPARAM)&cbItem); return result != 0; }

1 0

Dylan Smith : wordpad: Use winelib's sprintfW for floating point formatting .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 02c7d192b0c27ed6f2007bcbaf85b19a0f0ea5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c7d192b0c27ed6f2007bcba… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 8 13:15:33 2009 -0500 wordpad: Use winelib's sprintfW for floating point formatting. This fixes a regression introduced by commit ef23ef93357689335749310957f68a3ad9179d4a. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index dd334ae..fe78012 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1314,7 +1314,7 @@ static void number_with_units(LPWSTR buffer, int number) static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'}; float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH / 1000.0; - wsprintfW(buffer, fmt, converted, units_cmW); + sprintfW(buffer, fmt, converted, units_cmW); } static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength)

1 0

Nikolay Sivov : ole32: Some tests for IMoniker::IsRunning with NULL args.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 37d43496367b3308f2cd2c628211de7413b339e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d43496367b3308f2cd2c628… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 8 19:39:04 2009 +0300 ole32: Some tests for IMoniker::IsRunning with NULL args. --- dlls/ole32/tests/moniker.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b959e74..3416985 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1332,6 +1332,9 @@ static void test_class_moniker(void) ok_ole_success(hr, CreateBindCtx); /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); + ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08x\n", hr); @@ -1461,6 +1464,10 @@ static void test_item_moniker(void) ok_ole_success(hr, CreateBindCtx); /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); @@ -1593,6 +1600,10 @@ static void test_generic_composite_moniker(void) ok_ole_success(hr, CreateBindCtx); /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); todo_wine ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr);

1 0

Nikolay Sivov : ole32: Fix some comment typos.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: df0ecdfd301c8cd46828b3aa751454cffb5df3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0ecdfd301c8cd46828b3aa7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 8 18:14:55 2009 +0300 ole32: Fix some comment typos. --- dlls/ole32/moniker.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index c5b5c2f..68a4cc6 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1344,7 +1344,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) return ref; } /*********************************************************************** - * EnmumMoniker_Next + * EnumMoniker_Next */ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IMoniker** rgelt, ULONG * pceltFetched) { @@ -1379,7 +1379,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IM } /*********************************************************************** - * EnmumMoniker_Skip + * EnumMoniker_Skip */ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt) { @@ -1396,7 +1396,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt) } /*********************************************************************** - * EnmumMoniker_Reset + * EnumMoniker_Reset */ static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) { @@ -1410,7 +1410,7 @@ static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) } /*********************************************************************** - * EnmumMoniker_Clone + * EnumMoniker_Clone */ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ** ppenum) {

1 0

Dylan Smith : richedit: Missing condition for inserting newline before table.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 1f6b8c7fd9f599513e2d34c1fd716b61e4e4e1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6b8c7fd9f599513e2d34c1f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 8 09:14:10 2009 -0500 richedit: Missing condition for inserting newline before table. This case occurs when the cursor is at the start of the table, the table is at the start of the text, and there is no selection. --- dlls/riched20/editor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5bfc0aa..563e12e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2319,7 +2319,8 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, else if (para == ME_GetParagraph(editor->pCursors[1].pRun) && cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) + !para->member.para.prev_para->member.para.nCharOfs && + wstr == '\r') { /* Insert a newline before the table. */ WCHAR endl = '\r';

1 0

Francois Gouget : winhlp32: Reorder some functions to avoid forward declarations in macro.c.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: ef35bfd444a4acced024a3a41999161cbb9dda07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef35bfd444a4acced024a3a41… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 14:16:40 2009 +0100 winhlp32: Reorder some functions to avoid forward declarations in macro.c. --- programs/winhlp32/macro.c | 418 +++++++++++++++++++++++---------------------- 1 files changed, 212 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef35bfd444a4acced024a…

1 0