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

Michael Stefaniuc : pdh/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 5d3ba908e4e4d87125d760adce3b75d160bd6193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d3ba908e4e4d87125d760ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jun 2 01:54:25 2018 +0200 pdh/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/tests/pdh.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 573bcc3..0a17906 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -700,21 +700,21 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(processor_time), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || ret == PDH_MORE_DATA, /* win2k3 */ "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(uptime), "PdhLookupPerfNameByIndexW failed %d\n", size); } static void test_PdhValidatePathA( void )

1 0

Michael Stefaniuc : mmdevapi/tests: Remove an ARRAY_SIZE()-like macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: e48f34906e4600ed95e6551cb33d6c67620358e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48f34906e4600ed95e6551c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 4 01:07:44 2018 +0200 mmdevapi/tests: Remove an ARRAY_SIZE()-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d3e861..a4e94b1 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = { {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; - for(i = 0; i < NB_WIN_FORMATS; i++) { + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr);

1 0

Michael Stefaniuc : mpr/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 56a232b44c057fff12a8a765f1fc683f0fda136d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a232b44c057fff12a8a765… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 4 01:07:45 2018 +0200 mpr/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 041afbf..fc067d9 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -60,7 +60,7 @@ static void test_WNetGetUniversalName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) @@ -132,7 +132,7 @@ static void test_WNetGetRemoteName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE)

1 0

Zhiyi Zhang : user32: Return 1 in DrawTextEx() when calculated offset is 0.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 5dfacee5cccebf8fbb7012c7d0212e61e96390f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dfacee5cccebf8fbb7012c7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 4 19:54:16 2018 +0800 user32: Return 1 in DrawTextEx() when calculated offset is 0. The return value 0 in DrawTextEx() indicates failure. Should the offset from the bottom of the drawn text to top of the rectangle happens to be 0, return 1 instead. So that it doesn't indicate failure incidentally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 15 +++++++++++++++ dlls/user32/text.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571..c5bcd50 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -277,6 +277,21 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); + /* When offset to top is zero, return 1 */ + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRect(&rect, 0, 100, 0, 100); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_TOP, NULL); + /* Set top to text height and bottom zero, so bottom of drawn text to top is zero when DT_VCENTER is used */ + SetRect(&rect, 0, textheight, 0, 0); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_VCENTER, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); /* invalid dtp size test */ dtp.cbSize = -1; /* Invalid */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 8a2c247..286c4f5 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1064,6 +1064,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) memcpy(str, retstr, size_retstr); ret = y - rect->top; + if (ret == 0) ret = 1; done: heap_free(retstr); return ret;

1 0

Michael Stefaniuc : propsys/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: fddb389641f228cb4cbfcb88f7512909ec62115e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fddb389641f228cb4cbfcb88… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jun 2 01:54:26 2018 +0200 propsys/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a6c7023..e899ff9 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -133,7 +133,7 @@ static void test_PSStringFromPropertyKey(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].psz) memcpy(testcases[i].psz, fillerW, PKEYSTR_MAX * sizeof(WCHAR)); @@ -413,7 +413,7 @@ static void test_PSPropertyKeyFromString(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].pkey) *testcases[i].pkey = out_init; @@ -480,7 +480,7 @@ static void test_InitPropVariantFromGUIDAsString(void) InitVariantFromGUIDAsString(&IID_NULL, NULL); } - for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + for(i=0; i < ARRAY_SIZE(testcases); i++) { memset(&propvar, 0, sizeof(PROPVARIANT)); hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres);

1 0

Michael Stefaniuc : mapi32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 864c80334192e849e1e83313e9955ca52c81d03a URL: https://source.winehq.org/git/wine.git/?a=commit;h=864c80334192e849e1e83313… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 4 01:07:43 2018 +0200 mapi32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/tests/prop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 4e09931..4d7fd7b 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -135,7 +135,7 @@ static void test_PropCopyMore(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { lpSrc->ulPropTag = ptTypes[i]; @@ -453,11 +453,11 @@ static void test_FPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(FPCProp_Results)/sizeof(FPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(FPCProp_Results); j++) { SHORT lVal = FPCProp_Results[j].lVal; SHORT rVal = FPCProp_Results[j].rVal; @@ -583,11 +583,11 @@ static void test_LPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(LPCProp_Results)/sizeof(LPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(LPCProp_Results); j++) { SHORT lVal = LPCProp_Results[j].lVal; SHORT rVal = LPCProp_Results[j].rVal; @@ -684,7 +684,7 @@ static void test_PpropFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = ptTypes[i]; @@ -923,7 +923,7 @@ static void test_LpValFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u);

1 0

Michael Stefaniuc : oledlg/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: f10136a9e3dae50a31b6469b09359ce80c294821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10136a9e3dae50a31b6469b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jun 2 01:54:22 2018 +0200 oledlg/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 5d452f1..cef55eb 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -385,7 +385,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STATE|MIIM_ID|MIIM_STRING|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 3, TRUE, &info); ok(ret, "got %d\n", ret); ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); @@ -406,7 +406,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STRING|MIIM_STATE|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, @@ -462,7 +462,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); buffW[0] = 0; - GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + GetMenuStringW(hMenu, 0, buffW, ARRAY_SIZE(buffW), MF_BYPOSITION); ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); verbmenu = NULL; @@ -475,7 +475,7 @@ static void test_OleUIAddVerbMenu(void) info.fMask = MIIM_STRING|MIIM_STATE; buffW[0] = 0; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW));

1 0

Michael Stefaniuc : packager/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 41a1f7f750201d7c368c3d64741dfe723a68ae8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a1f7f750201d7c368c3d64… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jun 2 01:54:24 2018 +0200 packager/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1f81cb5..1ce54ed 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -457,7 +457,7 @@ static void test_packager(void) ok(hr == S_OK, "Load failed: %08x\n", hr); if(extended){ - len = GetTempPathW(sizeof(filename) / sizeof(*filename), filename); + len = GetTempPathW(ARRAY_SIZE(filename), filename); lstrcpyW(filename + len, filename3W); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING,

1 0

Michael Stefaniuc : msctf/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 5da1f82620d8e4d7fa93a94c97e5340ad7928a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da1f82620d8e4d7fa93a94c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 4 01:07:46 2018 +0200 msctf/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a02f95..4a52432 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -981,7 +981,8 @@ static void test_Register(void) ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); - hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); + hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, + &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2088,7 +2089,7 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + StringFromGUID2(&g,str,ARRAY_SIZE(str)); WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g))

1 0

Zhiyi Zhang : user32: Respect margins more in DrawTextExW().
by Alexandre Julliard June 4, 2018

June 4, 2018

Module: wine Branch: master Commit: 11e3cf091d8ec70a9d6004ac6a51d5c827d9ddff URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e3cf091d8ec70a9d6004ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 4 19:58:07 2018 +0800 user32: Respect margins more in DrawTextExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 286c4f5..118dbeb 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -943,6 +943,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, { lmargin = dtp->iLeftMargin; rmargin = dtp->iRightMargin; + width -= lmargin + rmargin; if (!(flags & (DT_CENTER | DT_RIGHT))) x += lmargin; dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */ @@ -978,9 +979,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, retstr, tabwidth, &prefix_offset, &ellip); - if (flags & DT_CENTER) x = (rect->left + rect->right - - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; + if (flags & DT_CENTER) + x = (rect->left + lmargin + rect->right - rmargin - size.cx) / 2; + else if (flags & DT_RIGHT) + x = rect->right - size.cx - rmargin; if (flags & DT_SINGLELINE) {

1 0