October 2013 - Wine-commits

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_REGISTER_TYPE typedef.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b34755493726126d1ee2eac0420f3151837d089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34755493726126d1ee2eac04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:33 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_REGISTER_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a6ee6b5..284bf8f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -459,7 +459,8 @@ enum bwritershader_instruction_opcode_type BWRITERSIO_END, }; -typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { +enum bwritershader_param_register_type +{ BWRITERSPR_TEMP, BWRITERSPR_INPUT, BWRITERSPR_CONST, @@ -478,7 +479,7 @@ typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { BWRITERSPR_MISCTYPE, BWRITERSPR_LABEL, BWRITERSPR_PREDICATE -} BWRITERSHADER_PARAM_REGISTER_TYPE; +}; typedef enum _BWRITERVS_RASTOUT_OFFSETS {

1 0

Alistair Leslie-Hughes : oledb32: Implement IDataSourceLocator get/put hWnd .
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 05a807af49e027422afb8f9c8e39bb5e4c09494d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a807af49e027422afb8f9c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 14:05:01 2013 +1000 oledb32: Implement IDataSourceLocator get/put hWnd. --- dlls/oledb32/dslocator.c | 14 ++++++++--- dlls/oledb32/tests/database.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f8a98f5..4af4ab4 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -42,6 +42,7 @@ typedef struct DSLocatorImpl IDataSourceLocator IDataSourceLocator_iface; LONG ref; + HWND hwnd; } DSLocatorImpl; static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *iface ) @@ -139,18 +140,22 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_L { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%p)\n",This, phwndParent); + TRACE("(%p)->(%p)\n",This, phwndParent); - return E_NOTIMPL; + *phwndParent = (COMPATIBLE_LONG)This->hwnd; + + return S_OK; } static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%p)\n",This, (HWND)hwndParent); + TRACE("(%p)->(%p)\n",This, (HWND)hwndParent); - return E_NOTIMPL; + This->hwnd = (HWND)hwndParent; + + return S_OK; } static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **ppADOConnection) @@ -201,6 +206,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl; This->ref = 1; + This->hwnd = 0; *obj = &This->IDataSourceLocator_iface; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d0eb9ff..13637c1 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -547,6 +547,53 @@ static void test_rowpos_setrowposition(void) IRowPosition_Release(rowpos); } +static void test_dslocator(void) +{ + IDataSourceLocator *dslocator = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DataLinks, NULL, CLSCTX_INPROC_SERVER, &IID_IDataSourceLocator,(void**)&dslocator); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + COMPATIBLE_LONG hwnd = 0; + + /* Crashes under Window 7 + hr = IDataSourceLocator_get_hWnd(dslocator, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + */ + + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); + ok(hr == S_OK, "got %08x\n", hr); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0xDEADBEEF, "got %p\n", (HWND)hwnd); + + hwnd = 0; + hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); + ok(hr == S_OK, "got %08x\n", hr); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + IDataSourceLocator_Release(dslocator); + } +} + START_TEST(database) { OleInitialize(NULL); @@ -554,6 +601,7 @@ START_TEST(database) test_database(); test_errorinfo(); test_initializationstring(); + test_dslocator(); /* row position */ test_rowposition();

1 0

Piotr Caban : msvcr80: Don't forward some function to msvcrt.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 1a3546e54b00994462bf468874a3ece74b17bc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3546e54b00994462bf46887… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:24:11 2013 +0200 msvcr80: Don't forward some function to msvcrt. --- dlls/msvcr80/msvcr80.c | 152 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr80/msvcr80.spec | 38 ++++++------ 2 files changed, 171 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3546e54b00994462bf4…

1 0

Piotr Caban : msvcrt: Don't forward _itoa to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: d99090aff87b603b1d55b570629d7fc5bc56cff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99090aff87b603b1d55b5706… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:09 2013 +0200 msvcrt: Don't forward _itoa to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6089656..7cfc370 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -646,7 +646,7 @@ # stub _iswupper_l(long ptr) # stub _iswxdigit_l(long ptr) @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l -@ cdecl _itoa(long ptr long) ntdll._itoa +@ cdecl _itoa(long ptr long) @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _itow_s(long ptr long long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5678a89..a6b328b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1139,6 +1139,14 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa (MSVCRT.@) + */ +char* CDECL _itoa(int value, char *str, int radix) +{ + return _itoa_s(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; +} + +/********************************************************************* * _itow_s (MSVCRT.@) */ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)

1 0

Frédéric Delanoy : rpcrt4: Use BOOL type where appropriate.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: c91f39055ec9a6cbf22e35e2d2de62a86b6da7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91f39055ec9a6cbf22e35e2d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 27 14:21:39 2013 +0200 rpcrt4: Use BOOL type where appropriate. --- dlls/rpcrt4/rpc_message.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 1c4ffd6..57781ce 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -76,20 +76,20 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) return ret; } -static int packet_has_body(const RpcPktHdr *Header) +static BOOL packet_has_body(const RpcPktHdr *Header) { return (Header->common.ptype == PKT_FAULT) || (Header->common.ptype == PKT_REQUEST) || (Header->common.ptype == PKT_RESPONSE); } -static int packet_has_auth_verifier(const RpcPktHdr *Header) +static BOOL packet_has_auth_verifier(const RpcPktHdr *Header) { return !(Header->common.ptype == PKT_BIND_NACK) && !(Header->common.ptype == PKT_SHUTDOWN); } -static int packet_does_auth_negotiation(const RpcPktHdr *Header) +static BOOL packet_does_auth_negotiation(const RpcPktHdr *Header) { switch (Header->common.ptype) {

1 0

Frédéric Delanoy : msxml3: Use BOOL type where appropriate.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 30aec559ac76cd59746d3a04ebe620712ca004c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30aec559ac76cd59746d3a04e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 00:06:49 2013 +0200 msxml3: Use BOOL type where appropriate. --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2f632ef..61534ac 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -343,7 +343,7 @@ static inline saxlocator *impl_from_ISAXAttributes( ISAXAttributes *iface ) return CONTAINING_RECORD(iface, saxlocator, ISAXAttributes_iface); } -static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandler_type type) +static inline BOOL saxreader_has_handler(const saxlocator *locator, enum saxhandler_type type) { struct saxanyhandler_iface *iface = &locator->saxreader->saxhandlers[type].u.anyhandler; return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler);

1 0

Frédéric Delanoy : shell32: Use BOOL type where appropriate.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: ba2f448db9f4db360d6009837819e947eaf5f57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2f448db9f4db360d6009837… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 00:06:50 2013 +0200 shell32: Use BOOL type where appropriate. --- dlls/shell32/shfldr_unixfs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 22a376c..362d4e6 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -392,7 +392,8 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { */ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { - char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath, has_failed = 0, mb_path[FILENAME_MAX]; + char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath, mb_path[FILENAME_MAX]; + BOOL has_failed = FALSE; WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[MAX_PATH], *dospath_end; int cDriveSymlinkLen; void *redir; @@ -423,7 +424,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) *dospath_end = '/'; --dospath_end; }else - has_failed = 1; + has_failed = TRUE; while(*dospath_end != '\\' && *dospath_end != '/'){ --dospath_end; if(dospath_end < dospath)

1 0