September 2012 - Wine-Commits

Rico Schüller : d3dx9: Use float function in D3DXFresnelTerm().
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: aa344fc88d2fa3c39647e68be113dcb6c0ac43dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa344fc88d2fa3c39647e68be… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 28 08:43:14 2012 +0200 d3dx9: Use float function in D3DXFresnelTerm(). --- dlls/d3dx9_36/math.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 24303d2..a3aa07e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -81,13 +81,14 @@ FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex) { FLOAT a, d, g, result; - TRACE("(%f, %f)\n", costheta, refractionindex); + TRACE("costheta %f, refractionindex %f)\n", costheta, refractionindex); - g = sqrt(refractionindex * refractionindex + costheta * costheta - 1.0f); + g = sqrtf(refractionindex * refractionindex + costheta * costheta - 1.0f); a = g + costheta; d = g - costheta; - result = ( costheta * a - 1.0f ) * ( costheta * a - 1.0f ) / ( ( costheta * d + 1.0f ) * ( costheta * d + 1.0f ) ) + 1.0f; - result = result * 0.5f * d * d / ( a * a ); + result = (costheta * a - 1.0f) * (costheta * a - 1.0f) / ((costheta * d + 1.0f) * (costheta * d + 1.0f)) + 1.0f; + result *= 0.5f * d * d / (a * a); + return result; }

1 0

Henri Verbeet : winex11: Use the first active CRTC as primary if no primary is explicitly set.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 3ac14606aec47daaec0d838d861d560b4de026ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac14606aec47daaec0d838d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:54 2012 +0200 winex11: Use the first active CRTC as primary if no primary is explicitly set. --- dlls/winex11.drv/xrandr.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 968ff76..1093541 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -57,6 +57,7 @@ MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; +static int primary_crtc; #endif #undef MAKE_FUNCPTR @@ -273,14 +274,15 @@ static int xrandr12_get_current_mode(void) return 0; } - if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) + if (resources->ncrtc <= primary_crtc || + !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[primary_crtc] ))) { pXRRFreeScreenResources( resources ); ERR("Failed to get CRTC info.\n"); return 0; } - TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, + TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); for (i = 0; i < xrandr_mode_count; ++i) @@ -318,18 +320,20 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_FAILED; } - if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) + if (resources->ncrtc <= primary_crtc || + !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[primary_crtc] ))) { pXRRFreeScreenResources( resources ); ERR("Failed to get CRTC info.\n"); return DISP_CHANGE_FAILED; } - TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, + TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); - status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[0], CurrentTime, crtc_info->x, - crtc_info->y, xrandr12_modes[mode], crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], + CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode], + crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); @@ -344,6 +348,27 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_SUCCESSFUL; } +static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resources, int *crtc_idx ) +{ + XRRCrtcInfo *crtc_info; + int i; + + for (i = 0; i < resources->ncrtc; ++i) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ); + if (!crtc_info || crtc_info->mode == None) + { + pXRRFreeCrtcInfo( crtc_info ); + continue; + } + + *crtc_idx = i; + return crtc_info; + } + + return NULL; +} + static int xrandr12_init_modes(void) { XRRScreenResources *resources; @@ -368,14 +393,14 @@ static int xrandr12_init_modes(void) } } - if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) + if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) { pXRRFreeScreenResources( resources ); - ERR("Failed to get CRTC info.\n"); + ERR("Failed to get primary CRTC info.\n"); return ret; } - TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, + TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); if (!crtc_info->noutput || !(output_info = pXRRGetOutputInfo( gdi_display, resources, crtc_info->outputs[0] )))

1 0

Henri Verbeet : winex11: Fullscreen windows are never maximized.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 47c54c4ae7f235780a55ddf670503db4afc11055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c54c4ae7f235780a55ddf67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:52 2012 +0200 winex11: Fullscreen windows are never maximized. Some window managers incorrectly set maximized state on fullscreen windows. --- dlls/winex11.drv/event.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 514f0d4..d9c932e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -998,6 +998,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) HWND parent; BOOL root_coords; int cx, cy, x = event->x, y = event->y; + DWORD style; if (!hwnd) return; if (!(data = get_win_data( hwnd ))) return; @@ -1061,9 +1062,10 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, cx, cy ); - if (is_net_wm_state_maximized( event->display, data )) + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data )) { - if (!IsZoomed( data->hwnd )) + if (!(style & WS_MAXIMIZE)) { TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); release_win_data( data ); @@ -1073,7 +1075,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } else { - if (IsZoomed( data->hwnd )) + if (style & WS_MAXIMIZE) { TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); release_win_data( data ); @@ -1198,7 +1200,7 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; - if (is_net_wm_state_maximized( event->display, data )) + if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data )) { if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) {

1 0

Christian Costa : ntoskrnl.exe: Add partial stub for IoFreeMdl.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 5087cb192c7c54bf74d600a8a1f279456a65eba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5087cb192c7c54bf74d600a8a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 27 23:12:36 2012 +0200 ntoskrnl.exe: Add partial stub for IoFreeMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index afcca48..842ade2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -409,6 +409,17 @@ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN Secondary /*********************************************************************** + * IoFreeMdl (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoFreeMdl(PMDL mdl) +{ + FIXME("partial stub: %p\n", mdl); + + HeapFree(GetProcessHeap(), 0, mdl); +} + + +/*********************************************************************** * IoAllocateWorkItem (NTOSKRNL.EXE.@) */ PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT DeviceObject ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 97a71fc..f452238 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -371,7 +371,7 @@ @ stub IoFreeController @ stub IoFreeErrorLogEntry @ stdcall IoFreeIrp(ptr) -@ stub IoFreeMdl +@ stdcall IoFreeMdl(ptr) @ stub IoFreeWorkItem @ stub IoGetAttachedDevice @ stub IoGetAttachedDeviceReference

1 0

Henri Verbeet : winex11: Handle a NULL cursor clipping rect the same as a fullscreen rect.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 73d68c5a31b972a24dab39b036a5d3197edb3565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d68c5a31b972a24dab39b03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:53 2012 +0200 winex11: Handle a NULL cursor clipping rect the same as a fullscreen rect. We want to avoid ungrabbing the clipping window if "fullscreen clipping" is enabled. --- dlls/winex11.drv/mouse.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index be822bf..818bdd5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1265,11 +1265,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) */ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { - if (!clip) - { - ungrab_clipping_window(); - return TRUE; - } + if (!clip) clip = &virtual_screen_rect; if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */

1 0

Qian Hong : iphlpapi: Set DhcpEnabled to TRUE for all interfaces.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: b3e7f710912388b4dca7de2d2e91a3cf8b225c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e7f710912388b4dca7de2d2… Author: Qian Hong <fracting(a)gmail.com> Date: Thu Sep 27 23:14:32 2012 +0800 iphlpapi: Set DhcpEnabled to TRUE for all interfaces. --- dlls/iphlpapi/iphlpapi_main.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f3568b8..dae779c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -598,6 +598,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) ptr->Next = &pAdapterInfo[ndx + 1]; else ptr->Next = NULL; + + ptr->DhcpEnabled = TRUE; } ret = NO_ERROR; } @@ -2008,9 +2010,7 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIP */ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { - TRACE("AdapterInfo %p\n", AdapterInfo); - /* not a stub, never going to support this (and I never mark an adapter as - DHCP enabled, see GetAdaptersInfo, so this should never get called) */ + FIXME("Stub AdapterInfo %p\n", AdapterInfo); return ERROR_NOT_SUPPORTED; } @@ -2036,9 +2036,7 @@ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) */ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { - TRACE("AdapterInfo %p\n", AdapterInfo); - /* not a stub, never going to support this (and I never mark an adapter as - DHCP enabled, see GetAdaptersInfo, so this should never get called) */ + FIXME("Stub AdapterInfo %p\n", AdapterInfo); return ERROR_NOT_SUPPORTED; }

1 0

Frédéric Delanoy : cmd: Reuse common string constants.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: c5a4878f5f9deee7ae3061a3d243fa0398e6c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a4878f5f9deee7ae3061a3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 28 11:13:16 2012 +0200 cmd: Reuse common string constants. --- programs/cmd/builtins.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8421194..57ac339 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2241,9 +2241,8 @@ static int WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; - static const WCHAR eqW[] = {'=','\0'}; r = CompareStringW( LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - *str_a, strcspnW(*str_a, eqW), *str_b, strcspnW(*str_b, eqW) ); + *str_a, strcspnW(*str_a, equalW), *str_b, strcspnW(*str_b, equalW) ); if( r == CSTR_LESS_THAN ) return -1; if( r == CSTR_GREATER_THAN ) return 1; return 0;

1 0

Jacek Caban : vbscript: Added StrReverse implementation.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 46fbe490692ff88ca3f39e1a8ce90856893d4bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fbe490692ff88ca3f39e1a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 11:49:48 2012 +0200 vbscript: Added StrReverse implementation. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9fb6a4d..3f88207 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1187,8 +1187,25 @@ static HRESULT Global_Replace(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_StrReverse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + WCHAR *ptr1, *ptr2, ch; + BSTR ret; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_string(arg, &ret); + if(FAILED(hres)) + return hres; + + ptr1 = ret; + ptr2 = ret + SysStringLen(ret)-1; + while(ptr1 < ptr2) { + ch = *ptr1; + *ptr1++ = *ptr2; + *ptr2-- = ch; + } + + return return_bstr(res, ret); } static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 97ca5e0..9e39a0f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -196,6 +196,15 @@ Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") +Sub TestStrReverse(str, ex) + Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) +End Sub + +TestStrReverse "test", "tset" +TestStrReverse "", "" +TestStrReverse 123, "321" +if isEnglishLang then TestStrReverse true, "eurT" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Frédéric Delanoy : cmd: Spelling fixes.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 8b3d4942476b288fa52c07cadd3c3c0367d0c8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3d4942476b288fa52c07cad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 28 11:13:15 2012 +0200 cmd: Spelling fixes. --- programs/cmd/batch.c | 4 ++-- programs/cmd/wcmdmain.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index d24b11e..4926b1f 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -117,7 +117,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * n [I] # of the parameter to return, counted from 0 * start [O] Optional. Pointer to the first char of param n in s * end [O] Optional. Pointer to the last char of param n in s - * raw [I] True to return the parameter in raw format (quotes maintainted) + * raw [I] True to return the parameter in raw format (quotes maintained) * False returns the parameter with quotes stripped * * RETURNS @@ -152,7 +152,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw) p++; if (*p == '\0') return param; - /* If we have reached the token number we want, remember the beginning of it if it */ + /* If we have reached the token number we want, remember the beginning of it */ if (start != NULL && curParamNb == n) *start = p; /* Return the whole word up to the next delimiter, handling quotes in the middle diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c0d4925..82ec153 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1852,7 +1852,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirsLen = 0; curCopyTo = curString; curLen = &curStringLen; - lastWasRedirect = FALSE; /* Required for eg spaces between > and filename */ + lastWasRedirect = FALSE; /* Required e.g. for spaces between > and filename */ /* Parse every character on the line being processed */ while (*curPos != 0x00) { @@ -1864,7 +1864,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE lastWasWhiteSpace, onlyWhiteSpace); */ - /* Prevent overflow caused by the caret escape char*/ + /* Prevent overflow caused by the caret escape char */ if (*curLen >= MAXSTRING) { WINE_ERR("Overflow detected in command\n"); return NULL; @@ -2202,7 +2202,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (!WCMD_fgets(extraData, MAXSTRING, readFrom)) break; - /* Edge case for carets - a completely blank line (ie was just + /* Edge case for carets - a completely blank line (i.e. was just CRLF) is oddly added as an LF but then more data is received (but only once more!) */ if (lastWasCaret) {

1 0

Nikolay Sivov : mlang: Use proper interface call instead of implementation function.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: d442f5fffaf3c3b77514b378eadcafbbc41a1a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d442f5fffaf3c3b77514b378e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 27 22:34:21 2012 +0400 mlang: Use proper interface call instead of implementation function. --- dlls/mlang/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index ba1feba..a361bc9 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1878,7 +1878,7 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( DWORD cp; HRESULT ret; - ret = fnIMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); + ret = IMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); if (ret != S_OK) return E_FAIL; if (!cps) cps = cp;

1 0