May 2010 - Wine-Commits - list.winehq.org

Andrey Turkin : server: Connect named pipe synchronously when overlapped param is NULL.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 85cc2c13f6f4309993b0daf5a51942228fbac0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cc2c13f6f4309993b0daf5a… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 22:00:59 2010 +0400 server: Connect named pipe synchronously when overlapped param is NULL. --- dlls/kernel32/tests/pipe.c | 48 +++++++++++++++++++++++++------------------ dlls/ntdll/file.c | 2 +- server/named_pipe.c | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b48ceec..5abfd85 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -547,28 +547,36 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) oOverlap.hEvent = hEvent; /* Wait for client to connect */ - trace("Server calling overlapped ConnectNamedPipe...\n"); - success = ConnectNamedPipe(hnp, &oOverlap); - err = GetLastError(); - ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe returned.\n"); - if (!success && (err == ERROR_IO_PENDING)) { - if (letWFSOEwait) - { - DWORD ret; - do { - ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); - } while (ret == WAIT_IO_COMPLETION); - ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); - } - success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); - if (!letGORwait && !letWFSOEwait && !success) { - ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); - success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + if (i == 0) { + trace("Server calling non-overlapped ConnectNamedPipe on overlapped pipe...\n"); + success = ConnectNamedPipe(hnp, NULL); + err = GetLastError(); + ok(success || (err == ERROR_PIPE_CONNECTED), "ConnectNamedPipe failed: %d\n", err); + trace("ConnectNamedPipe operation complete.\n"); + } else { + trace("Server calling overlapped ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, &oOverlap); + err = GetLastError(); + ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe returned.\n"); + if (!success && (err == ERROR_IO_PENDING)) { + if (letWFSOEwait) + { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); + } + success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); + success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + } } + ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe operation complete.\n"); } - ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe operation complete.\n"); /* Echo bytes once */ memset(buf, 0, sizeof(buf)); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 741395d..b5d1c14 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1227,7 +1227,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { req->code = code; - req->blocking = !apc && !event; + req->blocking = !apc && !event && !cvalue; req->async.handle = wine_server_obj_handle( handle ); req->async.callback = wine_server_client_ptr( ioctl_completion ); req->async.iosb = wine_server_client_ptr( io ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 54ce823..95f06b9 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -613,7 +613,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (blocking && !is_overlapped( get_fd_options(fd) )) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break;

1 0

Austin English : kernel32/tests: Use ret in load_blackbox().
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: e0c7fb66c412eb1b2437ee5414af827fe0ac2d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c7fb66c412eb1b2437ee541… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:38:05 2010 -0500 kernel32/tests: Use ret in load_blackbox(). --- dlls/kernel32/tests/debugger.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e116c9d..fa96767 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -143,7 +143,9 @@ static int load_blackbox(const char* logfile, void* blackbox, int size) ok(0, "unable to open '%s'\n", logfile); return 0; } + SetLastError(0xdeadbeef); ret=ReadFile(hFile, blackbox, size, &read, NULL); + ok(ret, "ReadFile failed: %d\n", GetLastError()); ok(read == size, "wrong size for '%s': read=%d\n", logfile, read); CloseHandle(hFile); return 1;

1 0

Henri Verbeet : wined3d: Set the volume.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 08c783a8ade5991a30357f4bb7a44b541ae71d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c783a8ade5991a30357f4bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 24 09:56:36 2010 +0200 wined3d: Set the volume.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/volume.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b53f4d3..693ddd1 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -25,7 +25,8 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); -#define GLINFO_LOCATION This->resource.device->adapter->gl_info + +#define GLINFO_LOCATION (*gl_info) /* Context activation is done by the caller. */ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { @@ -313,8 +314,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWi } /* Context activation is done by the caller. */ -static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; +static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) +{ + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; const struct wined3d_format_desc *glDesc = This->resource.format_desc; TRACE("(%p) : level %u, format %s (0x%08x)\n", This, gl_level, debug_d3dformat(glDesc->format), glDesc->format);

1 0

Henri Verbeet : wined3d: Set the drawprim.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 5178e475d63762224405001d02ae4e6174b08310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5178e475d63762224405001d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 24 09:56:34 2010 +0200 wined3d: Set the drawprim.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d845160..4978ee5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -28,7 +28,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); -#define GLINFO_LOCATION This->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) #include <stdio.h> #include <math.h>

1 0

Nikolay Sivov : comctl32/listview: Fix vertical position offset for subitem rectangle.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 61c8a30574d2d7a3b217141dbc1fcfb98c103e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c8a30574d2d7a3b217141db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 24 12:08:29 2010 +0400 comctl32/listview: Fix vertical position offset for subitem rectangle. --- dlls/comctl32/listview.c | 10 ++++--- dlls/comctl32/tests/listview.c | 53 ++++++++++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2c27aa9..e2bd9a7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6953,7 +6953,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT */ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc) { - POINT Position; + POINT Position, Origin; LVITEMW lvItem; INT nColumn; @@ -6986,7 +6986,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR } } - LISTVIEW_GetOrigin(infoPtr, &Position); + if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; + LISTVIEW_GetOrigin(infoPtr, &Origin); if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; @@ -6994,7 +6995,6 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR lvItem.iItem = nItem; lvItem.iSubItem = nColumn; - if (lvItem.mask && !LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; switch(lprc->left) { case LVIR_ICON: @@ -7011,7 +7011,9 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return FALSE; } - OffsetRect(lprc, Position.x, Position.y); + OffsetRect(lprc, Origin.x, Position.y); + TRACE("return rect %s\n", wine_dbgstr_rect(lprc)); + return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b116962..6ef82bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2089,7 +2089,7 @@ static void test_subitem_rect(void) HWND hwnd; DWORD r; LVCOLUMN col; - RECT rect; + RECT rect, rect2; INT arr[3]; /* test LVM_GETSUBITEMRECT for header */ @@ -2099,15 +2099,12 @@ static void test_subitem_rect(void) memset(&col, 0, sizeof(LVCOLUMN)); col.mask = LVCF_WIDTH; col.cx = 100; - r = -1; r = SendMessage(hwnd, LVM_INSERTCOLUMN, 0, (LPARAM)&col); expect(0, r); col.cx = 150; - r = -1; r = SendMessage(hwnd, LVM_INSERTCOLUMN, 1, (LPARAM)&col); expect(1, r); col.cx = 200; - r = -1; r = SendMessage(hwnd, LVM_INSERTCOLUMN, 2, (LPARAM)&col); expect(2, r); /* item = -1 means header, subitem index is 1 based */ @@ -2189,21 +2186,45 @@ todo_wine col.mask = LVCF_WIDTH; col.cx = 100; - r = -1; r = SendMessage(hwnd, LVM_INSERTCOLUMN, 0, (LPARAM)&col); expect(0, r); col.cx = 200; - r = -1; r = SendMessage(hwnd, LVM_INSERTCOLUMN, 1, (LPARAM)&col); expect(1, r); col.cx = 300; - r = -1; r = SendMessage(hwnd, LVM_INSERTCOLUMN, 2, (LPARAM)&col); expect(2, r); insert_item(hwnd, 0); + insert_item(hwnd, 1); + + /* wrong item is refused for main item */ + rect.left = LVIR_BOUNDS; + rect.top = 0; + rect.right = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 2, (LPARAM)&rect); + ok(r == FALSE, "got %d\n", r); + + /* for subitems rectangle is calculated even if there's no item added */ + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 1, (LPARAM)&rect); + ok(r == TRUE, "got %d\n", r); + + rect2.left = LVIR_BOUNDS; + rect2.top = 1; + rect2.right = rect2.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 2, (LPARAM)&rect2); +todo_wine { + ok(r == TRUE, "got %d\n", r); + expect(rect.right, rect2.right); + expect(rect.left, rect2.left); + expect(rect.bottom, rect2.top); + ok(rect2.bottom > rect2.top, "expected not zero height\n"); +} arr[0] = 1; arr[1] = 0; arr[2] = 2; r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 3, (LPARAM)arr); @@ -2213,7 +2234,7 @@ todo_wine rect.top = 0; rect.right = rect.bottom = -1; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); - ok(r != 0, "Expected not-null LRESULT\n"); + ok(r == TRUE, "got %d\n", r); expect(0, rect.left); expect(600, rect.right); @@ -2221,15 +2242,27 @@ todo_wine rect.top = 1; rect.right = rect.bottom = -1; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); - ok(r != 0, "Expected not-null LRESULT\n"); + ok(r == TRUE, "got %d\n", r); expect(0, rect.left); expect(200, rect.right); + rect2.left = LVIR_BOUNDS; + rect2.top = 1; + rect2.right = rect2.bottom = -1; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 1, (LPARAM)&rect2); + ok(r == TRUE, "got %d\n", r); + expect(0, rect2.left); + expect(200, rect2.right); + /* items are of the same height */ + ok(rect2.top > 0, "expected positive item height\n"); + expect(rect.bottom, rect2.top); + expect(rect.bottom * 2 - rect.top, rect2.bottom); + rect.left = LVIR_BOUNDS; rect.top = 2; rect.right = rect.bottom = -1; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); - ok(r != 0, "Expected not-null LRESULT\n"); + ok(r == TRUE, "got %d\n", r); expect(300, rect.left); expect(600, rect.right);

1 0

Dylan Smith : richedit: Simplify redundant code in WM_IME_COMPOSITION.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 3f1d3e0ea14e53ebf8b4996260a9e56ca3d94b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1d3e0ea14e53ebf8b499626… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 01:05:03 2010 -0400 richedit: Simplify redundant code in WM_IME_COMPOSITION. --- dlls/riched20/editor.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e93db65..5bed094 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4257,32 +4257,24 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); ME_SaveTempStyle(editor); - if (lParam & GCS_RESULTSTR) + if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { LPWSTR lpCompStr = NULL; DWORD dwBufLen; + DWORD dwIndex = lParam & GCS_RESULTSTR; + if (!dwIndex) + dwIndex = GCS_COMPSTR; - dwBufLen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); + dwBufLen = ImmGetCompositionStringW(hIMC, dwIndex, NULL, 0); lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); - ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpCompStr, dwBufLen); + ImmGetCompositionStringW(hIMC, dwIndex, lpCompStr, dwBufLen); lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); HeapFree(GetProcessHeap(), 0, lpCompStr); - } - else if (lParam & GCS_COMPSTR) - { - LPWSTR lpCompStr = NULL; - DWORD dwBufLen; - dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); - ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); - lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; - - ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); - HeapFree(GetProcessHeap(), 0, lpCompStr); - ME_SetSelection(editor,editor->imeStartIndex, - editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); + if (dwIndex == GCS_COMPSTR) + ME_SetSelection(editor,editor->imeStartIndex, + editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); } ME_ReleaseStyle(style); ME_CommitUndo(editor);

1 0

Piotr Caban : msvcrt: Fix wcstombs_l implementation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 6f358ef8675ff7b9c3101653e4dbc97532ada593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f358ef8675ff7b9c3101653e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 24 10:03:55 2010 +0200 msvcrt: Fix wcstombs_l implementation. --- dlls/msvcrt/wcs.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 79be91a..c26809c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -240,26 +240,34 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_l(char *mbstr, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { char default_char = '\0'; - MSVCRT_size_t tmp; + MSVCRT_size_t tmp = 0; BOOL used_default; if(!locale) locale = get_locale(); - /* FIXME: Use wcslen here */ - tmp = strlenW(wcstr); - if(tmp>count && mbstr) - tmp = count; + if(!mbstr) + return WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, -1, NULL, 0, &default_char, &used_default)-1; - tmp = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - wcstr, tmp, mbstr, count, &default_char, &used_default); + while(*wcstr) { + char buf[3]; + MSVCRT_size_t i, size; - if(used_default) - return -1; + size = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, 1, buf, 3, &default_char, &used_default); + if(used_default) + return -1; + if(tmp+size > count) + return tmp; - if(tmp<count && mbstr) - mbstr[tmp] = '\0'; + for(i=0; i<size; i++) + mbstr[tmp++] = buf[i]; + wcstr++; + } + if(tmp < count) + mbstr[tmp] = '\0'; return tmp; }

1 0

Alexander Scott-Johns : clock: Remove "License..." and "NO WARRANTY..." items from "Info" menu.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 6d49edef371a47d9e60c6af01ad73dc7aa907618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d49edef371a47d9e60c6af01… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Apr 20 14:11:52 2010 +0100 clock: Remove "License..." and "NO WARRANTY..." items from "Info" menu. --- programs/clock/Cs.rc | 2 -- programs/clock/Da.rc | 2 -- programs/clock/De.rc | 29 ----------------------------- programs/clock/En.rc | 26 -------------------------- programs/clock/Eo.rc | 2 -- programs/clock/Es.rc | 26 -------------------------- programs/clock/Fi.rc | 2 -- programs/clock/Fr.rc | 27 --------------------------- programs/clock/Hu.rc | 2 -- programs/clock/It.rc | 26 -------------------------- programs/clock/Ja.rc | 26 -------------------------- programs/clock/Ko.rc | 26 -------------------------- programs/clock/Lt.rc | 28 ---------------------------- programs/clock/Nl.rc | 27 --------------------------- programs/clock/No.rc | 26 -------------------------- programs/clock/Pl.rc | 27 --------------------------- programs/clock/Pt.rc | 28 ---------------------------- programs/clock/Ro.rc | 26 -------------------------- programs/clock/Ru.rc | 2 -- programs/clock/Si.rc | 26 -------------------------- programs/clock/Sk.rc | 2 -- programs/clock/Sv.rc | 26 -------------------------- programs/clock/Th.rc | 2 -- programs/clock/Tr.rc | 26 -------------------------- programs/clock/Wa.rc | 2 -- programs/clock/Zh.rc | 4 ---- programs/clock/clock_res.h | 9 +-------- programs/clock/main.c | 26 -------------------------- 28 files changed, 1 insertions(+), 482 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d49edef371a47d9e60c6…

1 0

Dylan Smith : richedit: Missing HeapFree in WM_IME_COMPOSITION. (Smatch).
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: fb7d6b783e8f8c48943772da3fd909e968887137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7d6b783e8f8c48943772da3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 01:04:42 2010 -0400 richedit: Missing HeapFree in WM_IME_COMPOSITION. (Smatch). ME_InsertTextFromCursor copies the string passed into it rather than making taking ownership of it. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85e8f14..7764614 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4268,6 +4268,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpCompStr, dwBufLen); lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + HeapFree(GetProcessHeap(), 0, lpCompStr); } else if (lParam & GCS_COMPSTR) { @@ -4280,6 +4281,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + HeapFree(GetProcessHeap(), 0, lpCompStr); ME_SetSelection(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); }

1 0

Damjan Jovanovic : windowscodecs: Fix ICO palette size calculation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: b34f04f9c4204fa777412c8d636c5501438b44c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34f04f9c4204fa777412c8d6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 22 07:57:54 2010 +0200 windowscodecs: Fix ICO palette size calculation. --- dlls/windowscodecs/icoformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 180dbb3..8012b4e 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -192,7 +192,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) if (bih.biBitCount <= 8) { /* read the palette */ - colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256; + colorcount = bih.biClrUsed ? bih.biClrUsed : 1 << bih.biBitCount; hr = IStream_Read(This->parent->stream, colors, sizeof(RGBQUAD)*colorcount, &bytesread); if (FAILED(hr) || bytesread != sizeof(RGBQUAD)*colorcount) goto fail;

1 0