May 2016 - Wine-commits - list.winehq.org

Andrey Gusev : gdi32/tests: Fix a typo in trace() message.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 6fae520e1ce8ff2d20bee4dd707f4f7a328b13ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fae520e1ce8ff2d20bee4dd7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 2 00:42:49 2016 +0300 gdi32/tests: Fix a typo in trace() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eb6669b..373d2a1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1032,7 +1032,7 @@ static void test_bitmap_font_metrics(void) ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX); - trace("expected %s, height %d scaled_hight %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi); + trace("expected %s, height %d scaled_height %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi); if(fd[i].dpi == tm.tmDigitizedAspectX) {

1 0

Francois Gouget : d3dx9_36/tests: Spelling fixes for mesh and xfile ok() messages.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: fcf0829b60e33ccd57b8b9975eebc701e88ff201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf0829b60e33ccd57b8b9975… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:44:26 2016 +0200 d3dx9_36/tests: Spelling fixes for mesh and xfile ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 24 ++++++++++++------------ dlls/d3dx9_36/tests/xfile.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4a75e47..f2a0751 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4848,7 +4848,7 @@ static void test_update_semantics(void) } hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); - ok(hr == D3D_OK, "Test UpdateSematics, got %#x expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "Test UpdateSemantics, got %#x expected %#x\n", hr, D3D_OK); /* Check that declaration was written by getting it again */ memset(declaration, 0, sizeof(declaration)); @@ -4863,7 +4863,7 @@ static void test_update_semantics(void) { if (decl_ptr->Usage == D3DDECLUSAGE_POSITION) { - ok(decl_ptr->Offset == offset, "Test UpdateSematics, got offset %d expected %d\n", + ok(decl_ptr->Offset == offset, "Test UpdateSemantics, got offset %d expected %d\n", decl_ptr->Offset, offset); } } @@ -4874,7 +4874,7 @@ static void test_update_semantics(void) memset(declaration, filler_a, sizeof(declaration)); memcpy(declaration, declaration0, sizeof(declaration0)); hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); - ok(hr == D3D_OK, "Test UpdateSematics, " + ok(hr == D3D_OK, "Test UpdateSemantics, " "got %#x expected D3D_OK\n", hr); memset(declaration, filler_b, sizeof(declaration)); hr = mesh->lpVtbl->GetDeclaration(mesh, declaration); @@ -4907,12 +4907,12 @@ static void test_update_semantics(void) } hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); - ok(hr == D3D_OK, "Test UpdateSematics for overlapping fields, " + ok(hr == D3D_OK, "Test UpdateSemantics for overlapping fields, " "got %#x expected D3D_OK\n", hr); /* Set the position type to color instead of float3 */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_pos_type_color); - ok(hr == D3D_OK, "Test UpdateSematics position type color, " + ok(hr == D3D_OK, "Test UpdateSemantics position type color, " "got %#x expected D3D_OK\n", hr); /* The following test cases show that NULL, smaller or larger declarations, @@ -4925,7 +4925,7 @@ static void test_update_semantics(void) /* Null declaration (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, NULL); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics null pointer declaration, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics null pointer declaration, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4939,7 +4939,7 @@ static void test_update_semantics(void) /* Smaller vertex declaration (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_smaller); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics for smaller vertex declaration, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics for smaller vertex declaration, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4953,7 +4953,7 @@ static void test_update_semantics(void) /* Larger vertex declaration (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_larger); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics for larger vertex declaration, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics for larger vertex declaration, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4967,7 +4967,7 @@ static void test_update_semantics(void) /* Use multiple streams and keep the same vertex size (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_multiple_streams); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics using multiple streams, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics using multiple streams, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4987,7 +4987,7 @@ static void test_update_semantics(void) /* Double usage (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_double_usage); - ok(hr == D3D_OK, "Test UpdateSematics double usage, " + ok(hr == D3D_OK, "Test UpdateSemantics double usage, " "got %#x expected D3D_OK\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -5001,7 +5001,7 @@ static void test_update_semantics(void) /* Set the position to an undefined type (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_undefined_type); - ok(hr == D3D_OK, "Test UpdateSematics undefined type, " + ok(hr == D3D_OK, "Test UpdateSemantics undefined type, " "got %#x expected D3D_OK\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -5015,7 +5015,7 @@ static void test_update_semantics(void) /* Use a not 4 byte aligned offset (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_not_4_byte_aligned_offset); - ok(hr == D3D_OK, "Test UpdateSematics not 4 byte aligned offset, " + ok(hr == D3D_OK, "Test UpdateSemantics not 4 byte aligned offset, " "got %#x expected D3D_OK\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 9c722b7..46b4ee2 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -188,7 +188,7 @@ static void test_getname(void) ret = data_object->lpVtbl->GetName(data_object, name, &length); ok(ret == S_OK, "GetName failed with %#x\n", ret); ok(length == 7, "Returned length should be 7 instead of %ld\n", length); - ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' instead of '%s'\n", name); length = 3; ret = data_object->lpVtbl->GetName(data_object, name, &length); ok(ret== D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE);

1 0

Alexandre Julliard : server: Add support for maintaining a client-side directory cache.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 80f3fda93484a11b0ee1803625278c8c15ca86d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f3fda93484a11b0ee180362… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 14:39:16 2016 +0900 server: Add support for maintaining a client-side directory cache. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 20 ++++++- server/change.c | 122 ++++++++++++++++++++++++++++++++++++++++- server/process.c | 2 + server/process.h | 1 + server/protocol.def | 9 +++ server/request.h | 6 ++ server/trace.c | 14 +++++ 7 files changed, 172 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80f3fda93484a11b0ee18…

1 0

Alexandre Julliard : ntdll: Store the directory identity and search mask in the directory cache.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 1c31ba252cd518695221ee31bb0dc3ae8c70c4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c31ba252cd518695221ee31b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 16:29:19 2016 +0900 ntdll: Store the directory identity and search mask in the directory cache. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 206 +++++++++++++++++++++++++++++++++---------- dlls/ntdll/tests/directory.c | 75 ++++++++++++++-- 2 files changed, 228 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c31ba252cd518695221e…

1 0

Pierre Schweitzer : comdlg32: Check for overflow before dereferencing.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: d288d8d333f6faea9d64a0af944f125663a449d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d288d8d333f6faea9d64a0af9… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun May 1 17:22:44 2016 +0200 comdlg32: Check for overflow before dereferencing. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 1453396..282582b 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -650,7 +650,7 @@ int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileLis if ( lpstrEdit[nStrCharCount]=='"' ) { nStrCharCount++; - while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) + while ((nStrCharCount <= nStrLen) && (lpstrEdit[nStrCharCount]!='"')) { (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount]; nStrCharCount++;

1 0

Pierre Schweitzer : user32: Check bounds before dereferencing.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: bfb7e167cb399dbba0a889b797bc11ece8b9e687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb7e167cb399dbba0a889b79… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun May 1 17:50:18 2016 +0200 user32: Check bounds before dereferencing. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ca40ed0..179d44a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -305,7 +305,7 @@ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT case WB_RIGHT: if (!count) break; - while (s[index] && index < count && !es->logAttr[index].fSoftBreak) + while (index < count && s[index] && !es->logAttr[index].fSoftBreak) index++; ret = index; break;

1 0

Nikolay Sivov : ctl3dv2: Claim success in Ctl3dRegister().
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 2680b594986f4c5011827e92c718c31e04f2964f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680b594986f4c5011827e92c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 08:59:51 2016 +0300 ctl3dv2: Claim success in Ctl3dRegister(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctl3dv2.dll16/ctl3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ctl3dv2.dll16/ctl3d.c b/dlls/ctl3dv2.dll16/ctl3d.c index d89b881..4232b02 100644 --- a/dlls/ctl3dv2.dll16/ctl3d.c +++ b/dlls/ctl3dv2.dll16/ctl3d.c @@ -102,7 +102,7 @@ BOOL16 WINAPI Ctl3dIsAutoSubclass16(void) */ BOOL16 WINAPI Ctl3dRegister16(HINSTANCE16 hInst) { - return FALSE; + return TRUE; } /***********************************************************************

1 0

Nikolay Sivov : comctl32/listview: Simplify setting redraw mode flag.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: f4542cf7d78de84d2003967aa3ae3dd2cf92bac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4542cf7d78de84d2003967aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 09:00:30 2016 +0300 comctl32/listview: Simplify setting redraw mode flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a4336e8..38c376c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -332,7 +332,7 @@ typedef struct tagLISTVIEW_INFO /* painting */ BOOL bIsDrawing; /* Drawing in progress */ INT nMeasureItemHeight; /* WM_MEASUREITEM result */ - BOOL bRedraw; /* WM_SETREDRAW switch */ + BOOL redraw; /* WM_SETREDRAW switch */ /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ @@ -1706,7 +1706,7 @@ static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) static inline BOOL is_redrawing(const LISTVIEW_INFO *infoPtr) { - return infoPtr->bRedraw; + return infoPtr->redraw; } static inline void LISTVIEW_InvalidateRect(const LISTVIEW_INFO *infoPtr, const RECT* rect) @@ -9465,7 +9465,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->nFocusedItem = -1; infoPtr->nSelectionMark = -1; infoPtr->nHotItem = -1; - infoPtr->bRedraw = TRUE; + infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; infoPtr->autoSpacing = TRUE; @@ -10948,22 +10948,21 @@ static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedra * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] bRedraw: state of redraw flag + * [I] redraw: state of redraw flag * * RETURN: - * DefWinProc return value + * Zero. */ -static LRESULT LISTVIEW_SetRedraw(LISTVIEW_INFO *infoPtr, BOOL bRedraw) +static LRESULT LISTVIEW_SetRedraw(LISTVIEW_INFO *infoPtr, BOOL redraw) { - TRACE("infoPtr->bRedraw=%d, bRedraw=%d\n", infoPtr->bRedraw, bRedraw); + TRACE("old=%d, new=%d\n", infoPtr->redraw, redraw); - /* we cannot use straight equality here because _any_ non-zero value is TRUE */ - if ((infoPtr->bRedraw && bRedraw) || (!infoPtr->bRedraw && !bRedraw)) return 0; + if (infoPtr->redraw == !!redraw) + return 0; - infoPtr->bRedraw = bRedraw; + if (!(infoPtr->redraw = !!redraw)) + return 0; - if(!bRedraw) return 0; - if (is_autoarrange(infoPtr)) LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); LISTVIEW_UpdateScroll(infoPtr);

1 0

Jacek Caban : user32/tests: Moved creating .ico file into a helper function.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 5aaa8e25ad39cffa8db01b6e587b4b6adc426485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aaa8e25ad39cffa8db01b6e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 29 21:00:26 2016 +0200 user32/tests: Moved creating .ico file into a helper function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 103 +++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 35 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 6648ede..90e0d84 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1130,14 +1130,76 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima DeleteFileA(filename); } +typedef struct { + unsigned width; + unsigned height; + BOOL invalid_offset; +} test_icon_entries_t; + +static void create_ico_file(const char *filename, const test_icon_entries_t *test_icon_entries, unsigned entry_cnt) +{ + CURSORICONFILEDIRENTRY *icon_entry; + BITMAPINFOHEADER *icon_header; + CURSORICONFILEDIR *dir; + BYTE *buf, *bitmap_ptr; + DWORD bytes_written; + size_t icon_size; + HANDLE file; + unsigned i; + BOOL ret; + + const unsigned icon_bpp = 32; + + icon_size = FIELD_OFFSET(CURSORICONFILEDIR, idEntries[entry_cnt]) + sizeof(BITMAPINFOHEADER)*entry_cnt; + for(i=0; i<entry_cnt; i++) + icon_size += icon_bpp * test_icon_entries[i].width * test_icon_entries[i].height / 8; + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, icon_size); + dir = (CURSORICONFILEDIR*)buf; + + dir->idReserved = 0; + dir->idType = 1; + dir->idCount = entry_cnt; + + bitmap_ptr = buf + FIELD_OFFSET(CURSORICONFILEDIR, idEntries[entry_cnt]); + for(i=0; i<entry_cnt; i++) { + icon_entry = dir->idEntries+i; + icon_entry->bWidth = test_icon_entries[i].width; + icon_entry->bHeight = test_icon_entries[i].height; + icon_entry->bColorCount = 0; + icon_entry->bReserved = 0; + icon_entry->xHotspot = 1; + icon_entry->yHotspot = 1; + icon_entry->dwDIBSize = sizeof(BITMAPINFOHEADER) + icon_entry->bWidth * icon_entry->bHeight * icon_bpp / 8; + icon_entry->dwDIBOffset = test_icon_entries[i].invalid_offset ? 0xffffffff : bitmap_ptr - buf; + + icon_header = (BITMAPINFOHEADER*)bitmap_ptr; + bitmap_ptr += icon_entry->dwDIBSize; + + icon_header->biSize = sizeof(BITMAPINFOHEADER); + icon_header->biWidth = icon_entry->bWidth; + icon_header->biHeight = icon_entry->bHeight; + icon_header->biPlanes = 1; + icon_header->biBitCount = icon_bpp; + icon_header->biSizeImage = 0; /* Uncompressed bitmap. */ + } + + memset(bitmap_ptr, 0xf0, buf+icon_size-bitmap_ptr); + + /* Create the icon. */ + file = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(file, buf, icon_size, &bytes_written, NULL); + ok(ret && bytes_written == icon_size, "icon.ico created improperly.\n"); + CloseHandle(file); +} + static void test_LoadImage(void) { HANDLE handle; BOOL ret; - DWORD error, bytes_written; - CURSORICONFILEDIR *icon_data; - CURSORICONFILEDIRENTRY *icon_entry; - BITMAPINFOHEADER *icon_header, *bitmap_header; + DWORD error; + BITMAPINFOHEADER *bitmap_header; ICONINFO icon_info; int i; @@ -1149,37 +1211,9 @@ static void test_LoadImage(void) (sizeof(CURSORICONFILEDIR) + sizeof(BITMAPINFOHEADER) \ + ICON_AND_SIZE + ICON_AND_SIZE*ICON_BPP) - /* Set icon data. */ - icon_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ICON_SIZE); - icon_data->idReserved = 0; - icon_data->idType = 1; - icon_data->idCount = 1; - - icon_entry = icon_data->idEntries; - icon_entry->bWidth = ICON_WIDTH; - icon_entry->bHeight = ICON_HEIGHT; - icon_entry->bColorCount = 0; - icon_entry->bReserved = 0; - icon_entry->xHotspot = 1; - icon_entry->yHotspot = 1; - icon_entry->dwDIBSize = ICON_SIZE - sizeof(CURSORICONFILEDIR); - icon_entry->dwDIBOffset = sizeof(CURSORICONFILEDIR); - - icon_header = (BITMAPINFOHEADER *) ((BYTE *) icon_data + icon_entry->dwDIBOffset); - icon_header->biSize = sizeof(BITMAPINFOHEADER); - icon_header->biWidth = ICON_WIDTH; - icon_header->biHeight = ICON_HEIGHT*2; - icon_header->biPlanes = 1; - icon_header->biBitCount = ICON_BPP; - icon_header->biSizeImage = 0; /* Uncompressed bitmap. */ + static const test_icon_entries_t icon_desc = {32, 32}; - /* Create the icon. */ - handle = CreateFileA("icon.ico", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, - FILE_ATTRIBUTE_NORMAL, NULL); - ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); - ret = WriteFile(handle, icon_data, ICON_SIZE, &bytes_written, NULL); - ok(ret && bytes_written == ICON_SIZE, "icon.ico created improperly.\n"); - CloseHandle(handle); + create_ico_file("icon.ico", &icon_desc, 1); /* Test loading an icon as a cursor. */ SetLastError(0xdeadbeef); @@ -1227,7 +1261,6 @@ static void test_LoadImage(void) error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); - HeapFree(GetProcessHeap(), 0, icon_data); DeleteFileA("icon.ico"); /* Test a system icon */

1 0

Jacek Caban : user32: Use proper types in ICO_GetIconDirectory.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 03b93eeeff304fadf1b11c622777cd75bb5e7f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b93eeeff304fadf1b11c622… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 29 21:00:34 2016 +0200 user32: Use proper types in ICO_GetIconDirectory. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 23 ----------------------- dlls/user32/exticon.c | 4 ++-- dlls/user32/user_private.h | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4de6b28..4f93195 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -48,29 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); WINE_DECLARE_DEBUG_CHANNEL(resource); -#include "pshpack1.h" - -typedef struct { - BYTE bWidth; - BYTE bHeight; - BYTE bColorCount; - BYTE bReserved; - WORD xHotspot; - WORD yHotspot; - DWORD dwDIBSize; - DWORD dwDIBOffset; -} CURSORICONFILEDIRENTRY; - -typedef struct -{ - WORD idReserved; - WORD idType; - WORD idCount; - CURSORICONFILEDIRENTRY idEntries[1]; -} CURSORICONFILEDIR; - -#include "poppack.h" - static HDC screen_dc; static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 0dbbef1..a428ae7 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -218,13 +218,13 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi */ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize ) { - CURSORICONDIR * lpcid; /* icon resource in resource-dir format */ + CURSORICONFILEDIR *lpcid; /* icon resource in resource-dir format */ CURSORICONDIR * lpID; /* icon resource in resource format */ int i; TRACE("%p %p\n", peimage, lplpiID); - lpcid = (CURSORICONDIR*)peimage; + lpcid = (CURSORICONFILEDIR*)peimage; if( lpcid->idReserved || (lpcid->idType != 1) || (!lpcid->idCount) ) return 0; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index ead7a53..e4a2ed1 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -318,6 +318,25 @@ typedef struct CURSORICONDIRENTRY idEntries[1]; } CURSORICONDIR; +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + #include "poppack.h" extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN;

1 0