January 2012 - Wine-commits

Alexandre Julliard : comctl32: Fix management of imagelist growth amount.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: ff71cc2ca45d8da974777dafc11a317d8cf62c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff71cc2ca45d8da974777dafc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 12:32:14 2012 +0100 comctl32: Fix management of imagelist growth amount. --- dlls/comctl32/imagelist.c | 21 ++++++++------- dlls/comctl32/tests/imagelist.c | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c1edbdf..41c1017 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -771,7 +771,14 @@ ImageList_Create (INT cx, INT cy, UINT flags, if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) return NULL; - cGrow = (cGrow < 4) ? 4 : (cGrow + 3) & ~3; + cGrow = (WORD)((max( cGrow, 1 ) + 3) & ~3); + + if (cGrow > 256) + { + /* Windows doesn't limit the size here, but X11 doesn't let use allocate such huge bitmaps */ + WARN( "grow %d too large, limiting to 256\n", cGrow ); + cGrow = 256; + } himl->cx = cx; himl->cy = cy; @@ -2352,7 +2359,7 @@ ImageList_Remove (HIMAGELIST himl, INT i) return TRUE; } - himl->cMaxImage = himl->cInitial + himl->cGrow - 1; + himl->cMaxImage = himl->cGrow; himl->cCurImage = 0; for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; @@ -2563,7 +2570,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) return -1; if (nIndex == -1) { - if (himl->cCurImage + 1 > himl->cMaxImage) + if (himl->cCurImage + 1 >= himl->cMaxImage) IMAGELIST_InternalExpandBitmaps(himl, 1); nIndex = himl->cCurImage; @@ -2848,14 +2855,8 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) if (!is_valid(himl)) return FALSE; - if (himl->cMaxImage > iImageCount) - { - himl->cCurImage = iImageCount; - /* TODO: shrink the bitmap when cMaxImage-cCurImage>cGrow ? */ - return TRUE; - } - nNewCount = iImageCount + himl->cGrow; + nNewCount = iImageCount + 1; nCopyCount = min(himl->cCurImage, iImageCount); hdcBitmap = CreateCompatibleDC (0); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 588a5b3..b920b9a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1089,6 +1089,59 @@ static void test_imagelist_storage(void) ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); iml_clear_stream_data(); + + himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 99); + ok(himl != 0, "ImageList_Create failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, + "init 2 grow 99"); + icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok( ImageList_AddIcon(himl, icon) == 0,"failed to add icon\n"); + ok( ImageList_AddIcon(himl, icon) == 1,"failed to add icon\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 3, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, + "init 2 grow 99 2 icons"); + ok( ImageList_AddIcon(himl, icon) == 2,"failed to add icon\n"); + DestroyIcon( icon ); + check_iml_data(himl, BMP_CX, BMP_CX, 3, 104, 100, BMP_CX * 4, BMP_CX * 104/4, ILC_COLOR4|ILC_MASK, + "init 2 grow 99 3 icons"); + ok( ImageList_Remove(himl, -1) == TRUE,"failed to remove icon\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 100, 100, BMP_CX * 4, BMP_CX * 100/4, ILC_COLOR4|ILC_MASK, + "init 2 grow 99 empty"); + ok( ImageList_SetImageCount(himl, 22) == TRUE,"failed to set image count\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 22, 23, 100, BMP_CX * 4, BMP_CX * 24/4, ILC_COLOR4|ILC_MASK, + "init 2 grow 99 set count 22"); + ok( ImageList_SetImageCount(himl, 0) == TRUE,"failed to set image count\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, + "init 2 grow 99 set count 0"); + ok( ImageList_SetImageCount(himl, 42) == TRUE,"failed to set image count\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 42, 43, 100, BMP_CX * 4, BMP_CX * 44/4, ILC_COLOR4|ILC_MASK, + "init 2 grow 99 set count 42"); + ret = ImageList_Destroy(himl); + ok(ret, "ImageList_Destroy failed\n"); + iml_clear_stream_data(); + + himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65536+12); + ok(himl != 0, "ImageList_Create failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 12, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, + "init 2 grow 65536+12"); + ret = ImageList_Destroy(himl); + ok(ret, "ImageList_Destroy failed\n"); + iml_clear_stream_data(); + + himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65535); + ok(himl != 0, "ImageList_Create failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 0, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, + "init 2 grow 65535"); + ret = ImageList_Destroy(himl); + ok(ret, "ImageList_Destroy failed\n"); + iml_clear_stream_data(); + + himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, -20); + ok(himl != 0, "ImageList_Create failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, + "init 2 grow -20"); + ret = ImageList_Destroy(himl); + ok(ret, "ImageList_Destroy failed\n"); + iml_clear_stream_data(); } static void test_shell_imagelist(void)

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 5cc66bc8d4228547dc6add81b6705ffac9a32a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc66bc8d4228547dc6add81b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Jan 10 17:09:44 2012 +0100 po: Update Italian translation. --- po/it.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/it.po b/po/it.po index 061cef0..25d510c 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-03 21:32+0100\n" +"PO-Revision-Date: 2012-01-10 17:08+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -8406,7 +8406,7 @@ msgstr "L'handle del dispositivo specificato non è valido." #: winmm.rc:34 msgid "There is no driver installed on your system!" -msgstr "Non è presente nessun driver installato nel sistema!" +msgstr "Nessun driver è presente nel sistema!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -13114,9 +13114,8 @@ msgid "&Color" msgstr "C&olore" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Configurazione " +msgstr "Configurazione" #: wineconsole.rc:100 msgid "Buffer zone"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 6febe65678c2c6ef0f7aae02dffadd349a8d508e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6febe65678c2c6ef0f7aae02d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 10 23:30:24 2012 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 35cf918..27b4eba 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-30 10:22+0100\n" +"PO-Revision-Date: 2012-01-10 23:29+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8424,9 +8424,8 @@ msgid "The specified device handle is invalid." msgstr "Le descripteur de périphérique spécifié est invalide." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "Aucun pilote n'est installé sur votre système !\n" +msgstr "Aucun pilote n'est installé sur votre système !" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -13184,9 +13183,8 @@ msgid "&Color" msgstr "&Couleur" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Configuration " +msgstr "Configuration" #: wineconsole.rc:100 msgid "Buffer zone"

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 90071951ea3be1e9a12b207d747c4536f2333ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=90071951ea3be1e9a12b207d7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 23:44:58 2012 +0100 po: Update German translation. --- po/de.po | 125 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 57 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90071951ea3be1e9a12b2…

1 0

Daniel Lehman : msvcp90: Add num_get<char> stubs.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 4f9bc837d8d5b78fbdb6af73680d6c0588713b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9bc837d8d5b78fbdb6af736… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jan 4 11:21:46 2012 -0800 msvcp90: Add num_get<char> stubs. --- dlls/msvcp90/locale.c | 343 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 132 +++++++++--------- 2 files changed, 409 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f9bc837d8d5b78fbdb6a…

1 0

Kusanagi Kouichi : winex11.drv: Assign struct.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: f56e1fcf7c87ef05daf741259eaf35d49171cb0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56e1fcf7c87ef05daf741259… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Jan 11 21:58:11 2012 +0900 winex11.drv: Assign struct. --- dlls/winex11.drv/window.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0411ddf..e6affcb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2272,10 +2272,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.dc_rect.top = win_rect->top - top_rect->top; escape.dc_rect.right = win_rect->right - top_rect->left; escape.dc_rect.bottom = win_rect->bottom - top_rect->top; - escape.drawable_rect.left = top_rect->left; - escape.drawable_rect.top = top_rect->top; - escape.drawable_rect.right = top_rect->right; - escape.drawable_rect.bottom = top_rect->bottom; + escape.drawable_rect = *top_rect; if (top == hwnd) {

1 0

Kusanagi Kouichi : winex11.drv: Fix IME status handling.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: dc02e4d1a7c35b4205f6109ad71deee5fdddd750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc02e4d1a7c35b4205f6109ad… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Mon Jan 9 16:36:10 2012 +0900 winex11.drv: Fix IME status handling. --- dlls/winex11.drv/ime.c | 60 ++++++++++++++++++-------------------------- dlls/winex11.drv/x11drv.h | 5 ++- dlls/winex11.drv/xim.c | 45 ++++++++++----------------------- 3 files changed, 42 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index a2b1121..b343a64 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -719,32 +719,21 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) case IMC_SETOPENSTATUS: TRACE("IMC_SETOPENSTATUS\n"); - /* Indirectly called from XIM callbacks */ - if (ImmGetIMCCLockCount(lpIMC->hPrivate) > 0) + bRet = TRUE; + X11DRV_SetPreeditState(lpIMC->hWnd, lpIMC->fOpen); + if (!lpIMC->fOpen) { - bRet = TRUE; - break; - } + LPIMEPRIVATE myPrivate; - bRet = X11DRV_SetPreeditState(lpIMC->hWnd, lpIMC->fOpen); - if (bRet) - { - if (!lpIMC->fOpen) + myPrivate = ImmLockIMCC(lpIMC->hPrivate); + if (myPrivate->bInComposition) { - LPIMEPRIVATE myPrivate; - - myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (myPrivate->bInComposition) - { - X11DRV_ForceXIMReset(lpIMC->hWnd); - GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate->bInComposition = FALSE; - } - ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; } + ImmUnlockIMCC(lpIMC->hPrivate); } - else - lpIMC->fOpen = !lpIMC->fOpen; break; default: FIXME("Unknown\n"); break; @@ -957,7 +946,15 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, /* Interfaces to XIM and other parts of winex11drv */ -void IME_SetOpenStatus(BOOL fOpen, BOOL force) +void IME_SetOpenStatus(BOOL fOpen) +{ + HIMC imc; + + imc = RealIMC(FROM_X11); + ImmSetOpenStatus(imc, fOpen); +} + +void IME_SetCompositionStatus(BOOL fOpen) { HIMC imc; LPINPUTCONTEXT lpIMC; @@ -970,20 +967,18 @@ void IME_SetOpenStatus(BOOL fOpen, BOOL force) myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (!fOpen && myPrivate->bInComposition) + if (fOpen && !myPrivate->bInComposition) + { + GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); + } + else if (!fOpen && myPrivate->bInComposition) { ShowWindow(myPrivate->hwndDefault, SW_HIDE); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = ImeCreateBlankCompStr(); - myPrivate->bInComposition = FALSE; GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); } - - if (lpIMC->fOpen && fOpen) - ImmSetOpenStatus(imc, FALSE); - - if (fOpen || force) - ImmSetOpenStatus(imc, fOpen); + myPrivate->bInComposition = fOpen; ImmUnlockIMCC(lpIMC->hPrivate); ImmUnlockIMC(imc); @@ -1059,7 +1054,6 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) LPINPUTCONTEXT lpIMC; HIMCC newCompStr; LPIMEPRIVATE myPrivate; - BOOL fOpen; imc = RealIMC(FROM_X11); lpIMC = ImmLockIMC(imc); @@ -1071,15 +1065,11 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) lpIMC->hCompStr = newCompStr; myPrivate = ImmLockIMCC(lpIMC->hPrivate); - fOpen = lpIMC->fOpen; - ImmSetOpenStatus(imc, TRUE); if (!myPrivate->bInComposition) GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); if (!myPrivate->bInComposition) GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); - if (!fOpen) - ImmSetOpenStatus(imc, FALSE); ImmUnlockIMCC(lpIMC->hPrivate); ImmUnlockIMC(imc); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f3ffe6b..0f155ee 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -289,7 +289,8 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN; /* IME support */ extern void IME_UnregisterClasses(void) DECLSPEC_HIDDEN; -extern void IME_SetOpenStatus(BOOL fOpen, BOOL force) DECLSPEC_HIDDEN; +extern void IME_SetOpenStatus(BOOL fOpen) DECLSPEC_HIDDEN; +extern void IME_SetCompositionStatus(BOOL fOpen) DECLSPEC_HIDDEN; extern INT IME_GetCursorPos(void) DECLSPEC_HIDDEN; extern void IME_SetCursorPos(DWORD pos) DECLSPEC_HIDDEN; extern void IME_UpdateAssociation(HWND focus) DECLSPEC_HIDDEN; @@ -716,7 +717,7 @@ extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDE extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; -extern BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; +extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; #define XEMBED_MAPPED (1 << 0) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 95032d4..786578e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -129,10 +129,10 @@ static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) switch (state) { case XIMPreeditEnable: - IME_SetOpenStatus(TRUE, TRUE); + IME_SetOpenStatus(TRUE); break; case XIMPreeditDisable: - IME_SetOpenStatus(FALSE, TRUE); + IME_SetOpenStatus(FALSE); break; default: break; @@ -143,7 +143,7 @@ static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) { TRACE("PreEditStartCallback %p\n",ic); - IME_SetOpenStatus(TRUE, FALSE); + IME_SetCompositionStatus(TRUE); ximInComposeMode = TRUE; return -1; } @@ -157,7 +157,7 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d dwCompStringSize = 0; dwCompStringLength = 0; CompositionString = NULL; - IME_SetOpenStatus(FALSE, FALSE); + IME_SetCompositionStatus(FALSE); } static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, @@ -264,48 +264,31 @@ void X11DRV_ForceXIMReset(HWND hwnd) } } -BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) +void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) { XIC ic; XIMPreeditState state; - XVaNestedList attr_set, attr_get; - BOOL ret; + XVaNestedList attr; ic = X11DRV_get_ic(hwnd); if (!ic) - return FALSE; + return; if (fOpen) state = XIMPreeditEnable; else state = XIMPreeditDisable; - ret = FALSE; wine_tsx11_lock(); - attr_set = XVaCreateNestedList(0, XNPreeditState, state, NULL); - if (attr_set == NULL) - goto error1; - - attr_get = XVaCreateNestedList(0, XNPreeditState, &state, NULL); - if (attr_get == NULL) - goto error2; - - if (XSetICValues(ic, XNPreeditAttributes, attr_set, NULL) != NULL) - goto error3; - - /* SCIM claims it supports XNPreeditState, but seems to ignore */ - state = XIMPreeditUnKnown; - ret = XGetICValues(ic, XNPreeditAttributes, attr_get, NULL) == NULL && - ((fOpen && state == XIMPreeditEnable) || - (!fOpen && state == XIMPreeditDisable)); -error3: - XFree(attr_get); -error2: - XFree(attr_set); -error1: + attr = XVaCreateNestedList(0, XNPreeditState, state, NULL); + if (attr != NULL) + { + XSetICValues(ic, XNPreeditAttributes, attr, NULL); + XFree(attr); + } + wine_tsx11_unlock(); - return ret; }

1 0

Diego Nieto Cid : wined3d: Convert rtInternal and glGammaInternal.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 759bad0202463f5588f6e534eca0c95a48d72b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=759bad0202463f5588f6e534e… Author: Diego Nieto Cid <dnietoc(a)gmail.com> Date: Sat Jan 7 12:23:47 2012 -0300 wined3d: Convert rtInternal and glGammaInternal. --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2a09dc..bf379f1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4531,6 +4531,12 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c break; } + if (*convert != NO_CONVERSION) + { + format->rtInternal = format->glInternal; + format->glGammaInternal = format->glInternal; + } + return WINED3D_OK; }

1 0

Jacek Caban : mshtml: Reimplement nsIURL:: GetDirectory using new helper functions.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 5458e5f6def93ff302814458fb779f7c4fe35d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5458e5f6def93ff302814458f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:02 2012 +0100 mshtml: Reimplement nsIURL::GetDirectory using new helper functions. --- dlls/mshtml/nsio.c | 77 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4e31534..1c69a64 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -151,6 +151,31 @@ static const char *debugstr_nsacstr(const nsACString *nsstr) return debugstr_a(data); } +static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int len) +{ + char *stra; + int lena; + + TRACE("returning %s\n", debugstr_wn(str, len)); + + if(!*str) { + nsACString_SetData(ret_str, ""); + return NS_OK; + } + + lena = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); + stra = heap_alloc(lena+1); + if(!stra) + return NS_ERROR_OUT_OF_MEMORY; + + WideCharToMultiByte(CP_ACP, 0, str, len, stra, lena, NULL, NULL); + stra[lena] = 0; + + nsACString_SetData(ret_str, stra); + heap_free(stra); + return NS_OK; +} + HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) { const WCHAR *ptr = nsuri; @@ -2543,41 +2568,51 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) return NS_OK; } -static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) +static nsresult get_uri_path(nsWineURI *This, BSTR *path, const WCHAR **file, const WCHAR **ext) { - nsWineURI *This = impl_from_nsIURL(iface); - char *dir = NULL; - WCHAR *ptr; - BSTR path; + const WCHAR *ptr; HRESULT hres; - TRACE("(%p)->(%p)\n", This, aDirectory); - if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - hres = IUri_GetPath(This->uri, &path); + hres = IUri_GetPath(This->uri, path); if(FAILED(hres)) return NS_ERROR_FAILURE; - ptr = strrchrW(path, '/'); - if(ptr) { - if(ptr[1]) - *ptr = 0; - dir = heap_strdupWtoA(path); - if(!dir) { - SysFreeString(path); - return NS_ERROR_OUT_OF_MEMORY; - } + for(ptr = *path + SysStringLen(*path)-1; ptr > *path && *ptr != '/' && *ptr != '\\'; ptr--); + if(*ptr == '/' || *ptr == '\\') + ptr++; + *file = ptr; + + if(ext) { + ptr = strrchrW(ptr, '.'); + if(!ptr) + ptr = *path + SysStringLen(*path); + *ext = ptr; } - SysFreeString(path); - TRACE("ret %s\n", debugstr_a(dir)); - nsACString_SetData(aDirectory, dir ? dir : ""); - heap_free(dir); return NS_OK; } +static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) +{ + nsWineURI *This = impl_from_nsIURL(iface); + const WCHAR *file; + BSTR path; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, aDirectory); + + nsres = get_uri_path(This, &path, &file, NULL); + if(NS_FAILED(nsres)) + return nsres; + + nsres = return_wstr_nsacstr(aDirectory, path, file-path); + SysFreeString(path); + return nsres; +} + static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirectory) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Jacek Caban : mshtml: Reimplement nsIURL::GetFileName on top of IUri.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: b24b06a7cb1b89f82897a73f95105571b938342f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24b06a7cb1b89f82897a73f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:18 2012 +0100 mshtml: Reimplement nsIURL::GetFileName on top of IUri. --- dlls/mshtml/nsio.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1c69a64..09ee17b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2626,14 +2626,19 @@ static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirec static nsresult NSAPI nsURL_GetFileName(nsIURL *iface, nsACString *aFileName) { nsWineURI *This = impl_from_nsIURL(iface); + const WCHAR *file; + BSTR path; + nsresult nsres; TRACE("(%p)->(%p)\n", This, aFileName); - if(This->nsurl) - return nsIURL_GetFileName(This->nsurl, aFileName); + nsres = get_uri_path(This, &path, &file, NULL); + if(NS_FAILED(nsres)) + return nsres; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsres = return_wstr_nsacstr(aFileName, file, -1); + SysFreeString(path); + return nsres; } static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileName)

1 0