December 2013 - Wine-commits

Stefan Dösinger : d3d9/tests: Extend the sysmem texture mipmap test.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 799c2fb866908df43b7cd477a24da106efb287ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=799c2fb866908df43b7cd477a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 4 14:01:31 2013 +0100 d3d9/tests: Extend the sysmem texture mipmap test. --- dlls/d3d9/tests/d3d9ex.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index c22a1f0..5825c35 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -556,6 +556,13 @@ static void test_texture_sysmem_create(void) hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 1, 1, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);

1 0

Huw Davies : kernel32: Give the non-wildcard case a chance of succeeding first time around.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 67545ed54c94e3541ae28f8c0e6dcf91dc87f4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=67545ed54c94e3541ae28f8c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 4 14:28:55 2013 +0000 kernel32: Give the non-wildcard case a chance of succeeding first time around. --- dlls/kernel32/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 92c776d..bdae8f4 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1974,7 +1974,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, IO_STATUS_BLOCK io; BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; - info->data_size = has_wildcard ? 8192 : max_entry_size; + info->data_size = has_wildcard ? 8192 : max_entry_size * 2; while (info->data_size) {

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 3af42ea7ff3fcdb6d314c6563c9dedd9e40bfbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af42ea7ff3fcdb6d314c6563… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 3 23:13:12 2013 +0100 po: Update French translation. --- po/fr.po | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index c347792..98ba167 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: 2013-11-05 21:13+0100\n" +"PO-Revision-Date: 2013-12-03 23:12+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -12875,10 +12875,8 @@ msgid "Select Drive Letter" msgstr "Sélectionnez la lettre du lecteur" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Configuration de Wine" +msgstr "Configuration des lecteurs" #: winecfg.rc:227 msgid "" @@ -13158,10 +13156,8 @@ msgid "Letter" msgstr "Lettre" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Nouveau dossier" +msgstr "Dossier cible" #: winecfg.rc:79 msgid ""

1 0

Frédéric Delanoy : winedump: Make usage message more consistent.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: ee681d5a48603b74ec2870a72326dc8f013b603d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee681d5a48603b74ec2870a72… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 3 23:36:08 2013 +0100 winedump: Make usage message more consistent. Using infinitives, <arg> for option arguments. --- tools/winedump/main.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index dbc2d67..37e8ebe 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -207,30 +207,30 @@ struct my_option }; static const struct my_option option_table[] = { - {"--help",NONE, 0, do_usage, "--help Display this help message"}, - {"-h", NONE, 0, do_usage, "-h Synonym for --help"}, - {"-?", NONE, 0, do_usage, "-? Synonym for --help"}, - {"sym", DMGL, 0, do_demangle, "sym <sym> Demangle C++ symbol <sym> and exit"}, - {"spec", SPEC, 0, do_spec, "spec <dll> Use dll for input file and generate implementation code"}, - {"-I", SPEC, 1, do_include, "-I dir Look for prototypes in 'dir' (implies -c)"}, - {"-c", SPEC, 0, do_code, "-c Generate skeleton code (requires -I)"}, - {"-t", SPEC, 0, do_trace, "-t TRACE arguments (implies -c)"}, - {"-f", SPEC, 1, do_forward, "-f dll Forward calls to 'dll' (implies -t)"}, - {"-D", SPEC, 0, do_document, "-D Generate documentation"}, - {"-o", SPEC, 1, do_name, "-o name Set the output dll name (default: dll). note: strips .dll extensions"}, - {"-C", SPEC, 0, do_cdecl, "-C Assume __cdecl calls (default: __stdcall)"}, - {"-s", SPEC, 1, do_start, "-s num Start prototype search after symbol 'num'"}, - {"-e", SPEC, 1, do_end, "-e num End prototype search after symbol 'num'"}, - {"-S", SPEC, 1, do_symfile, "-S symfile Search only prototype names found in 'symfile'"}, - {"-q", SPEC, 0, do_quiet, "-q Don't show progress (quiet)."}, - {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, - {"dump", DUMP, 0, do_dump, "dump <file> Dumps the contents of a file (dll, exe, lib...)"}, - {"-C", DUMP, 0, do_symdmngl, "-C Turns on symbol demangling"}, - {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, - {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr, reloc, except)"}, - {"-t", DUMP, 0, do_symtable, "-t Dumps symbol table"}, - {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, + {"--help",NONE, 0, do_usage, "--help Display this help message"}, + {"-h", NONE, 0, do_usage, "-h Synonym for --help"}, + {"-?", NONE, 0, do_usage, "-? Synonym for --help"}, + {"sym", DMGL, 0, do_demangle, "sym <sym> Demangle C++ symbol <sym> and exit"}, + {"spec", SPEC, 0, do_spec, "spec <dll> Use 'dll' for input file and generate implementation code"}, + {"-I", SPEC, 1, do_include, "-I <dir> Look for prototypes in 'dir' (implies -c)"}, + {"-c", SPEC, 0, do_code, "-c Generate skeleton code (requires -I)"}, + {"-t", SPEC, 0, do_trace, "-t TRACE arguments (implies -c)"}, + {"-f", SPEC, 1, do_forward, "-f <dll> Forward calls to 'dll' (implies -t)"}, + {"-D", SPEC, 0, do_document, "-D Generate documentation"}, + {"-o", SPEC, 1, do_name, "-o <name> Set the output dll name (default: dll). Note: strips .dll extensions"}, + {"-C", SPEC, 0, do_cdecl, "-C Assume __cdecl calls (default: __stdcall)"}, + {"-s", SPEC, 1, do_start, "-s <num> Start prototype search after symbol 'num'"}, + {"-e", SPEC, 1, do_end, "-e <num> End prototype search after symbol 'num'"}, + {"-S", SPEC, 1, do_symfile, "-S <symfile> Search only prototype names found in 'symfile'"}, + {"-q", SPEC, 0, do_quiet, "-q Don't show progress (quiet)."}, + {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, + {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, + {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, + {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, + {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, + {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, clr, reloc, except)"}, + {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, + {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {NULL, NONE, 0, NULL, NULL} };

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: cd99b5a773f4c01726fcde630e92d9e21cc2cba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd99b5a773f4c01726fcde630… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 3 23:36:09 2013 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/debug.c | 20 +++++++------- tools/winedump/main.c | 58 ++++++++++++++++++++++---------------------- tools/winedump/msc.c | 8 +++--- tools/winedump/output.c | 6 ++-- tools/winedump/symbol.c | 4 +- tools/winedump/winedump.h | 28 +++++++++++----------- 6 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd99b5a773f4c01726fcd…

1 0

Michael Stefaniuc : comctl32/tests: Avoid non-AW aware TreeView_*() macros.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 133c691f1fea775dd6a34199cac8fb8960041b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133c691f1fea775dd6a34199c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 4 00:42:07 2013 +0100 comctl32/tests: Avoid non-AW aware TreeView_*() macros. --- dlls/comctl32/tests/treeview.c | 68 +++++++++++++++++++++++----------------- 1 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 24206d5..b1672c5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -383,7 +383,7 @@ static void test_callback(void) hTree = create_treeview_control(0); - ret = TreeView_DeleteAllItems(hTree); + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); expect(TRUE, ret); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; @@ -514,23 +514,23 @@ static void test_select(void) /* root-none select tests */ flush_sequences(sequences, NUM_MSG_SEQUENCES); - r = TreeView_SelectItem(hTree, NULL); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0); expect(TRUE, r); Clear(); AddItem('1'); - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); AddItem('2'); - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); AddItem('3'); - r = TreeView_SelectItem(hTree, NULL); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0); expect(TRUE, r); AddItem('4'); - r = TreeView_SelectItem(hTree, NULL); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0); expect(TRUE, r); AddItem('5'); - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n"); @@ -539,24 +539,24 @@ static void test_select(void) /* root-child select tests */ flush_sequences(sequences, NUM_MSG_SEQUENCES); - r = TreeView_SelectItem(hTree, NULL); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0); expect(TRUE, r); Clear(); AddItem('1'); - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); AddItem('2'); - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); AddItem('3'); - r = TreeView_SelectItem(hTree, hChild); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); expect(TRUE, r); AddItem('4'); - r = TreeView_SelectItem(hTree, hChild); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); expect(TRUE, r); AddItem('5'); - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); @@ -637,7 +637,7 @@ static void test_focus(void) ShowWindow(hMainWnd,SW_SHOW); SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); - hEdit = TreeView_EditLabel(hTree, hChild); + hEdit = (HWND)SendMessageA(hTree, TVM_EDITLABEL, 0, (LPARAM)hChild); ScrollWindowEx(hTree, -10, 0, NULL, NULL, NULL, NULL, SW_SCROLLCHILDREN); ok(GetFocus() == hEdit, "Edit control should have focus\n"); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, focus_seq, "focus test", TRUE); @@ -1120,11 +1120,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, } if (g_get_rect_in_expand) { - visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, NULL, TVGN_FIRSTVISIBLE); + visibleItem = (HTREEITEM)SendMessageA(pHdr->hwndFrom, TVM_GETNEXTITEM, + TVGN_FIRSTVISIBLE, 0); ok(pTreeView->itemNew.hItem == visibleItem, "expanded item == first visible item\n"); *(HTREEITEM*)&rect = visibleItem; ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for first visible item.\n"); - visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, visibleItem, TVGN_NEXTVISIBLE); + visibleItem = (HTREEITEM)SendMessageA(pHdr->hwndFrom, TVM_GETNEXTITEM, + TVGN_NEXTVISIBLE, (LPARAM)visibleItem); *(HTREEITEM*)&rect = visibleItem; ok(visibleItem != NULL, "There must be a visible item after the first visisble item.\n"); ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); @@ -1184,7 +1186,7 @@ static void test_expandinvisible(void) * */ - ret = TreeView_DeleteAllItems(hTree); + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); ok(ret == TRUE, "ret\n"); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; @@ -1214,24 +1216,32 @@ static void test_expandinvisible(void) assert(node[3]); - nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[1]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 1 should not be visible.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[2]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 2 should not be visible.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[3]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 3 should not be visible.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[4]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 4 should not be visible.\n"); - ok(TreeView_Expand(hTree, node[1], TVE_EXPAND), "Expand of node 1 failed.\n"); + ok(SendMessageA(hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)node[1]), "Expand of node 1 failed.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[1]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 1 should not be visible.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[2]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 2 should not be visible.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[3]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 3 should not be visible.\n"); - nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); + *(HTREEITEM *)&dummyRect = node[4]; + nodeVisible = SendMessageA(hTree, TVM_GETITEMRECT, FALSE, (LPARAM)&dummyRect); ok(!nodeVisible, "Node 4 should not be visible.\n"); DestroyWindow(hTree); @@ -1279,11 +1289,11 @@ static void test_itemedit(void) expect(0, r); /* remove selection after starting edit */ - r = TreeView_SelectItem(hTree, hRoot); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, r); edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); - r = TreeView_SelectItem(hTree, NULL); + r = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0); expect(TRUE, r); /* alter text */ strcpy(buffA, "x"); @@ -1451,7 +1461,7 @@ static void test_expandnotify(void) hTree = create_treeview_control(0); fill_tree(hTree); g_get_rect_in_expand = TRUE; - ret = TreeView_Select(hTree, hChild, TVGN_CARET); + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); expect(TRUE, ret); g_get_rect_in_expand = FALSE;

1 0

Michael Stefaniuc : comctl32/tests: Make treeview. c compile with -D__WINESRC__.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 4ecd867706efecf85721676c398fa61d39383545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecd867706efecf85721676c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 4 00:44:52 2013 +0100 comctl32/tests: Make treeview.c compile with -D__WINESRC__. --- dlls/comctl32/tests/treeview.c | 249 ++++++++++++++++++++-------------------- 1 files changed, 126 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ecd867706efecf857216…

1 0

Michael Stefaniuc : comctl32/tests: Finally compile with -D__WINESRC__.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 5092ecf6fef9de7223f6e779543f6a2aad3544e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5092ecf6fef9de7223f6e7795… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 4 00:49:00 2013 +0100 comctl32/tests: Finally compile with -D__WINESRC__. --- dlls/comctl32/tests/Makefile.in | 1 - dlls/comctl32/tests/comboex.c | 2 +- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/imagelist.c | 4 ++-- dlls/comctl32/tests/listview.c | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 55aea9c..670f52e 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = comctl32.dll IMPORTS = comctl32 ole32 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ comboex.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index b50db38..b0904d3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -496,7 +496,7 @@ static BOOL init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = ComboExTestClass; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 4ef4b5d..85437d0 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -459,7 +459,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Header test parent class"; @@ -1661,7 +1661,7 @@ static BOOL init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "HeaderTestClass"; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e11ee1d..caf7539 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -145,8 +145,8 @@ static HWND create_a_window(void) cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = 0; - cls.hIcon = LoadIconA (0, IDI_APPLICATION); - cls.hCursor = LoadCursorA (0, IDC_ARROW); + cls.hIcon = LoadIconA(0, (LPCSTR)IDI_APPLICATION); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject (WHITE_BRUSH); cls.lpszMenuName = 0; cls.lpszClassName = className; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3c6ceef..f5d0a01 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -524,7 +524,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode) clsW.cbWndExtra = 0; clsW.hInstance = GetModuleHandleW(NULL); clsW.hIcon = 0; - clsW.hCursor = LoadCursorA(0, IDC_ARROW); + clsW.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); clsW.hbrBackground = GetStockObject(WHITE_BRUSH); clsW.lpszMenuName = NULL; clsW.lpszClassName = testparentclassW; @@ -537,7 +537,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode) clsA.cbWndExtra = 0; clsA.hInstance = GetModuleHandleA(NULL); clsA.hIcon = 0; - clsA.hCursor = LoadCursorA(0, IDC_ARROW); + clsA.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); clsA.hbrBackground = GetStockObject(WHITE_BRUSH); clsA.lpszMenuName = NULL; clsA.lpszClassName = "Listview test parent class";

1 0

Nikolay Sivov : qmgr: Implement AddFile() with AddFileSet().
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: 5cbd28aa5128a1b35e21a94825b0659542b186f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbd28aa5128a1b35e21a9482… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 23:30:32 2013 +0400 qmgr: Implement AddFile() with AddFileSet(). --- dlls/qmgr/job.c | 46 ++++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index fdbf234..419ec09 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -95,18 +95,33 @@ static HRESULT WINAPI BackgroundCopyJob_AddFileSet( BG_FILE_INFO *pFileSet) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + HRESULT hr = S_OK; ULONG i; TRACE("(%p)->(%d %p)\n", This, cFileCount, pFileSet); + EnterCriticalSection(&This->cs); + for (i = 0; i < cFileCount; ++i) { - HRESULT hr = IBackgroundCopyJob2_AddFile(iface, pFileSet[i].RemoteName, - pFileSet[i].LocalName); - if (FAILED(hr)) - return hr; + BackgroundCopyFileImpl *file; + + /* We should return E_INVALIDARG in these cases. */ + FIXME("Check for valid filenames and supported protocols\n"); + + hr = BackgroundCopyFileConstructor(This, pFileSet[i].RemoteName, pFileSet[i].LocalName, &file); + if (hr != S_OK) break; + + /* Add a reference to the file to file list */ + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); + list_add_head(&This->files, &file->entryFromJob); + This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; + ++This->jobProgress.FilesTotal; } - return S_OK; + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI BackgroundCopyJob_AddFile( @@ -115,26 +130,13 @@ static HRESULT WINAPI BackgroundCopyJob_AddFile( LPCWSTR LocalName) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - BackgroundCopyFileImpl *file; - HRESULT res; + BG_FILE_INFO file; TRACE("(%p)->(%s %s)\n", This, debugstr_w(RemoteUrl), debugstr_w(LocalName)); - /* We should return E_INVALIDARG in these cases. */ - FIXME("Check for valid filenames and supported protocols\n"); - - res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, &file); - if (res != S_OK) - return res; - /* Add a reference to the file to file list */ - IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); - EnterCriticalSection(&This->cs); - list_add_head(&This->files, &file->entryFromJob); - This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; - ++This->jobProgress.FilesTotal; - LeaveCriticalSection(&This->cs); - - return S_OK; + file.RemoteName = (LPWSTR)RemoteUrl; + file.LocalName = (LPWSTR)LocalName; + return IBackgroundCopyJob2_AddFileSet(iface, 1, &file); } static HRESULT WINAPI BackgroundCopyJob_EnumFiles(

1 0

Nikolay Sivov : qmgr: Add file to a job with 1 refcount.
by Alexandre Julliard 04 Dec '13

04 Dec '13

Module: wine Branch: master Commit: f4a2163de7650cb372113de20c3bca0008db3a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a2163de7650cb372113de20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 23:32:15 2013 +0400 qmgr: Add file to a job with 1 refcount. --- dlls/qmgr/job.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 419ec09..f99d837 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -113,7 +113,6 @@ static HRESULT WINAPI BackgroundCopyJob_AddFileSet( if (hr != S_OK) break; /* Add a reference to the file to file list */ - IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); list_add_head(&This->files, &file->entryFromJob); This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; ++This->jobProgress.FilesTotal;

1 0