wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Dmitry Timoshkov : server: Set error to STATUS_PROCESS_IS_TERMINATING if the process is terminating.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: bfe3b3bdb6759a4ea525aa4cba662954fd19efca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3b3bdb6759a4ea525aa4cb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:33:20 2013 +0900 server: Set error to STATUS_PROCESS_IS_TERMINATING if the process is terminating. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 9788339..ed72b7d 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -322,7 +322,7 @@ static struct thread *get_ptrace_thread( struct process *process ) { if (thread->unix_pid != -1) return thread; } - set_error( STATUS_ACCESS_DENIED ); /* process is dead */ + set_error( STATUS_PROCESS_IS_TERMINATING ); /* process is dead */ return NULL; }

1 0

Dmitry Timoshkov : kernel32: Add more remote process tests.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: c79a514fe5a9efbee620b531d3f1aa0ac75bfdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79a514fe5a9efbee620b531d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:32:38 2013 +0900 kernel32: Add more remote process tests. --- dlls/kernel32/tests/loader.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 17e6cd8..e44b5df 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1675,7 +1675,7 @@ static void test_ExitProcess(void) #include "poppack.h" static const char filler[0x1000]; DWORD dummy, file_align; - HANDLE file, thread, hmap; + HANDLE file, thread, process, hmap, hmap_dup; char temp_path[MAX_PATH], dll_name[MAX_PATH], cmdline[MAX_PATH * 2]; DWORD ret, target_offset, old_prot; char **argv, buf[256]; @@ -1683,6 +1683,7 @@ static void test_ExitProcess(void) STARTUPINFO si = { sizeof(si) }; CONTEXT ctx; struct PROCESS_BASIC_INFORMATION_PRIVATE pbi; + MEMORY_BASIC_INFORMATION mbi; DWORD_PTR affinity; void *addr; LARGE_INTEGER offset; @@ -1906,6 +1907,10 @@ static void test_ExitProcess(void) ok(ret, "VirtualProtectEx error %d\n", GetLastError()); ok(old_prot == PAGE_READWRITE, "expected PAGE_READWRITE, got %#x\n", old_prot); SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, NULL, &mbi, sizeof(mbi)); + ok(size == sizeof(mbi), "VirtualQueryEx error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = ReadProcessMemory(pi.hProcess, addr, buf, 4, &size); ok(ret, "ReadProcessMemory error %d\n", GetLastError()); ok(size == 4, "expected 4, got %lu\n", size); @@ -1914,6 +1919,11 @@ static void test_ExitProcess(void) hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), hmap, pi.hProcess, &hmap_dup, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + offset.u.LowPart = 0; offset.u.HighPart = 0; addr = NULL; @@ -1959,6 +1969,11 @@ static void test_ExitProcess(void) ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pi.dwProcessId); + ok(process != NULL, "OpenProcess error %d\n", GetLastError()); + CloseHandle(process); + memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(pi.hProcess, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#x\n", ret); @@ -2027,6 +2042,27 @@ static void test_ExitProcess(void) addr = VirtualAllocEx(pi.hProcess, NULL, 4096, MEM_COMMIT, PAGE_READWRITE); ok(!addr, "VirtualAllocEx should fail\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, NULL, &mbi, sizeof(mbi)); + ok(!size, "VirtualQueryEx should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + /* CloseHandle() call below leads to premature process termination + * under some Windows versions. + */ +if (0) +{ + SetLastError(0xdeadbeef); + ret = CloseHandle(hmap_dup); + ok(ret, "CloseHandle should not fail\n"); +} + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), hmap, pi.hProcess, &hmap_dup, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(!ret, "DuplicateHandle should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); offset.u.LowPart = 0; offset.u.HighPart = 0;

1 0

Austin English : wined3d: Add NVidia GeForce GT 630.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: c012b1a13c67ce6759725b00e3f3aa764e1b2867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c012b1a13c67ce6759725b00e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 7 12:17:06 2013 -0700 wined3d: Add NVidia GeForce GT 630. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f3cf3a..3ef5eeb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1154,6 +1154,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT610, "NVIDIA GeForce GT 610", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630, "NVIDIA GeForce GT 630", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1573,6 +1574,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ + {"GT 630", CARD_NVIDIA_GEFORCE_GT630}, /* Geforce 600 - lowend */ {"GT 610", CARD_NVIDIA_GEFORCE_GT610}, /* Geforce 600 - lowend */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f68cf9..abf44c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1447,6 +1447,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT610 = 0x104a, + CARD_NVIDIA_GEFORCE_GT630 = 0x0f00, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1,

1 0

Nikolay Sivov : user32: Implement GetListBoxInfo().
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 8f7779fc3b1ba7bf454a065181a783d32601278a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7779fc3b1ba7bf454a06518… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 21:18:43 2013 +0400 user32: Implement GetListBoxInfo(). --- dlls/user32/listbox.c | 11 ++++++--- dlls/user32/tests/listbox.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 64691e4..5a78dda 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -27,8 +27,6 @@ * If you discover missing features, or bugs, please note them below. * * TODO: - * - GetListBoxInfo() - * - LB_GETLISTBOXINFO * - LBS_NODATA */ @@ -2955,8 +2953,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return LB_OKAY; case LB_GETLISTBOXINFO: - FIXME("LB_GETLISTBOXINFO: stub!\n"); - return 0; + return descr->page_size; case WM_DESTROY: return LISTBOX_Destroy( descr ); @@ -3149,3 +3146,9 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : DefWindowProcA( hwnd, msg, wParam, lParam ); } + +DWORD WINAPI GetListBoxInfo(HWND hwnd) +{ + TRACE("%p\n", hwnd); + return SendMessageW(hwnd, LB_GETLISTBOXINFO, 0, 0); +} diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 5d96f5c..0a000cc 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1545,6 +1545,49 @@ static void test_set_count( void ) DestroyWindow( parent ); } +static DWORD (WINAPI *pGetListBoxInfo)(HWND); +static int lb_getlistboxinfo; + +static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == LB_GETLISTBOXINFO) + lb_getlistboxinfo++; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_GetListBoxInfo(void) +{ + HWND listbox, parent; + WNDPROC oldproc; + DWORD ret; + + pGetListBoxInfo = (void*)GetProcAddress(GetModuleHandle("user32"), "GetListBoxInfo"); + + if (!pGetListBoxInfo) + { + win_skip("GetListBoxInfo() not available\n"); + return; + } + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); + SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); + + lb_getlistboxinfo = 0; + ret = pGetListBoxInfo(listbox); + ok(ret > 0, "got %d\n", ret); +todo_wine + ok(lb_getlistboxinfo == 0, "got %d\n", lb_getlistboxinfo); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1624,4 +1667,5 @@ START_TEST(listbox) test_listbox_LB_DIR(); test_listbox_dlgdir(); test_set_count(); + test_GetListBoxInfo(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1ad59d9..4b1f4b5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -308,7 +308,7 @@ @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) @ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) -# @ stub GetListBoxInfo +@ stdcall GetListBoxInfo(long) @ stdcall GetMenu(long) @ stdcall GetMenuBarInfo(long long long ptr) @ stdcall GetMenuCheckMarkDimensions()

1 0

Alexandre Julliard : wine.inf: Remove no longer used control panel section.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: b49c565f95241a7c60603abf685abae94b535ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c565f95241a7c60603abf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 15:47:50 2013 +0200 wine.inf: Remove no longer used control panel section. --- tools/wine.inf.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 89c6a75..e48d824 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -35,7 +35,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -59,7 +58,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -85,7 +83,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\

1 0

Aric Stewart : user32: Implement IMR_QUERYCHARPOSITION handling in the edit control.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 652af4e294da3f99358d522c5f7320a7d63556fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=652af4e294da3f99358d522c5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 7 08:06:22 2013 -0500 user32: Implement IMR_QUERYCHARPOSITION handling in the edit control. --- dlls/user32/edit.c | 19 +++++++++++++++++++ include/imm.h | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 74e0ea4..1ce79db 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5169,6 +5169,25 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_IME_CONTROL: break; + case WM_IME_REQUEST: + switch (wParam) + { + case IMR_QUERYCHARPOSITION: + { + LRESULT pos; + IMECHARPOSITION *chpos = (IMECHARPOSITION *)lParam; + + pos = EDIT_EM_PosFromChar(es, es->selection_start + chpos->dwCharPos, FALSE); + chpos->pt.x = LOWORD(pos); + chpos->pt.y = HIWORD(pos); + chpos->cLineHeight = es->line_height; + chpos->rcDocument = es->format_rect; + result = 1; + break; + } + } + break; + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; diff --git a/include/imm.h b/include/imm.h index d035072..aa2fa1d 100644 --- a/include/imm.h +++ b/include/imm.h @@ -129,6 +129,15 @@ typedef struct _tagCOMPOSITIONFORM typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); +typedef struct _tagIMECHARPOSITION +{ + DWORD dwSize; + DWORD dwCharPos; + POINT pt; + UINT cLineHeight; + RECT rcDocument; +} IMECHARPOSITION, *LPIMECHARPOSITION; + /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008

1 0

Hans Leidekker : msi: Treat an empty install location as missing.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: b98ef8f087c0c4a75af6dcf6cb214f5e976594ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98ef8f087c0c4a75af6dcf6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 7 15:00:55 2013 +0200 msi: Treat an empty install location as missing. --- dlls/msi/action.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 827a0c8..cf03fa2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2305,9 +2305,12 @@ static WCHAR *get_install_location( MSIPACKAGE *package ) WCHAR *path; if (!package->ProductCode) return NULL; - if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) - return NULL; - path = msi_reg_get_val_str( hkey, szInstallLocation ); + if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) return NULL; + if ((path = msi_reg_get_val_str( hkey, szInstallLocation )) && !path[0]) + { + msi_free( path ); + path = NULL; + } RegCloseKey( hkey ); return path; }

1 0

Nikolay Sivov : msxml3: Explicitly use NULL_tid to terminate support error id arrays.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 6a7bf66b29752c15df342c21e6d5dfe698cfbe90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7bf66b29752c15df342c21e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:07:28 2013 +0400 msxml3: Explicitly use NULL_tid to terminate support error id arrays. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/msxml3/pi.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 9ab3035..70dee2a 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -53,7 +53,7 @@ typedef struct _domattr static const tid_t domattr_se_tids[] = { IXMLDOMNode_tid, IXMLDOMAttribute_tid, - 0 + NULL_tid }; static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 61c0ce2..2fcacff 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -52,7 +52,7 @@ typedef struct static const tid_t domcdata_se_tids[] = { IXMLDOMNode_tid, IXMLDOMCDATASection_tid, - 0 + NULL_tid }; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 879ca48..12a584d 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -52,7 +52,7 @@ typedef struct _domcomment static const tid_t domcomment_se_tids[] = { IXMLDOMNode_tid, IXMLDOMComment_tid, - 0 + NULL_tid }; static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index f066290..1b56885 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -52,7 +52,7 @@ typedef struct _domfrag static const tid_t domfrag_se_tids[] = { IXMLDOMNode_tid, IXMLDOMDocumentFragment_tid, - 0 + NULL_tid }; static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b607997..e98fa72 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -859,7 +859,7 @@ static const tid_t domdoc_se_tids[] = { IXMLDOMDocument_tid, IXMLDOMDocument2_tid, IXMLDOMDocument3_tid, - 0 + NULL_tid }; static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID riid, void** ppvObject ) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 20cd9b7..5e8822e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -58,7 +58,7 @@ static const struct nodemap_funcs domelem_attr_map; static const tid_t domelem_se_tids[] = { IXMLDOMNode_tid, IXMLDOMElement_tid, - 0 + NULL_tid }; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f2d46ab..1c0309a 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -52,7 +52,7 @@ typedef struct _entityref static const tid_t domentityref_se_tids[] = { IXMLDOMNode_tid, IXMLDOMEntityReference_tid, - 0 + NULL_tid }; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index be47a75..79de75c 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -150,7 +150,7 @@ static HRESULT WINAPI SupportErrorInfo_InterfaceSupportsErrorInfo(ISupportErrorI TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); tid = This->iids; - while (*tid) + while (*tid != NULL_tid) { if (IsEqualGUID(riid, get_riid_from_tid(*tid))) return S_OK; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4d1cab7..6b8fc12 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -54,7 +54,7 @@ static const struct nodemap_funcs dom_pi_attr_map; static const tid_t dompi_se_tids[] = { IXMLDOMNode_tid, IXMLDOMProcessingInstruction_tid, - 0 + NULL_tid }; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface )

1 0

Alexandre Julliard : server: Use strerror instead of perror.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: ea919d9de483223777948422e5c134bd73791ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea919d9de483223777948422e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 12:19:22 2013 +0200 server: Use strerror instead of perror. --- server/registry.c | 8 +++--- server/request.c | 76 ++++++++++++++++++++-------------------------------- server/request.h | 5 --- server/thread.c | 2 +- 4 files changed, 34 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea919d9de483223777948…

1 0

André Hentschel : d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 7f5a3a4d802a138c191dfd62e3a0ad02998df04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5a3a4d802a138c191dfd62e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 5 21:03:33 2013 +0200 d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error. --- dlls/d3drm/d3drm.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 9c3c21f..5d33402 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -317,22 +317,24 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRM return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char * filename, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char* filename, + LPDIRECT3DRMTEXTURE* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, ppTexture); + FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); } -static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, + LPDIRECT3DRMTEXTURE* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, ppTexture); + FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRMImpl_SetSearchPath(IDirect3DRM* iface, LPCSTR path) @@ -699,25 +701,25 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char * filename, - LPDIRECT3DRMTEXTURE2 * ppTexture) +static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char* filename, + LPDIRECT3DRMTEXTURE2* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, ppTexture); + FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2* iface, HMODULE hModule, LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE2 * ppTexture) + LPDIRECT3DRMTEXTURE2* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, ppTexture); + FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2* iface, LPCSTR path) @@ -1116,18 +1118,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_LoadTexture(IDirect3DRM3* iface, const ch FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_LoadTextureFromResource(IDirect3DRM3* iface, HMODULE mod, LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE3 * ppTexture) + LPDIRECT3DRMTEXTURE3* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, mod, strName, strType, ppTexture); + FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, mod, strName, strType, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_SetSearchPath(IDirect3DRM3* iface, LPCSTR path)

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013