October 2010 - Wine-Commits

Alexandre Julliard : kernel32: Use the NT name to open the device in GetVolumeInformationW.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 732534f9542adbc9d713af37ce00a1a86ce0e8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=732534f9542adbc9d713af37c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:23:00 2010 +0200 kernel32: Use the NT name to open the device in GetVolumeInformationW. --- dlls/kernel32/tests/volume.c | 2 +- dlls/kernel32/volume.c | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 534f0e3..c63dd72 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -458,7 +458,7 @@ static void test_GetVolumeInformationA(void) /* try again with unique volume name */ ret = pGetVolumeInformationA(volume, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", volume, GetLastError()); + ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", volume, GetLastError()); } /* Test to check that unique volume name from windows dir mount point */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 002a7e6..a198add 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -517,7 +517,10 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; + NTSTATUS status; UNICODE_STRING nt_name; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; WCHAR *p; enum fs_type type = FS_UNKNOWN; BOOL ret = FALSE; @@ -539,9 +542,19 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, /* try to open the device */ - handle = CreateFileW( device, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &nt_name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ + status = NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nt_name.Length += sizeof(WCHAR); + + if (status == STATUS_SUCCESS) { BYTE superblock[SUPERBLOCK_SIZE]; CDROM_TOC toc; @@ -553,7 +566,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, { if (!(toc.TrackData[0].Control & 0x04)) /* audio track */ { - TRACE( "%s: found audio CD\n", debugstr_w(device) ); + TRACE( "%s: found audio CD\n", debugstr_w(nt_name.Buffer) ); if (label) lstrcpynW( label, audiocdW, label_len ); if (serial) *serial = VOLUME_GetAudioCDSerial( &toc ); CloseHandle( handle ); @@ -568,14 +581,14 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, if (type == FS_UNKNOWN) type = VOLUME_ReadCDSuperblock( handle, superblock ); } CloseHandle( handle ); - TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); + TRACE( "%s: found fs type %d\n", debugstr_w(nt_name.Buffer), type ); if (type == FS_ERROR) goto done; if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); goto fill_fs_info; } - else TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() ); + else TRACE( "cannot open device %s: err %d\n", debugstr_w(nt_name.Buffer), GetLastError() ); /* we couldn't open the device, fallback to default strategy */

1 0

Alexandre Julliard : kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW .
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: ee0f0da69b3a99ce6b682b38fc6910a253ca23f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0f0da69b3a99ce6b682b38f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:17:35 2010 +0200 kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW. --- dlls/kernel32/tests/volume.c | 9 ++++----- dlls/kernel32/volume.c | 35 +++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f52c592..534f0e3 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -324,7 +324,6 @@ static void test_GetVolumeInformationA(void) ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA root failed, last error %u\n", GetLastError()); /* check for error on no trailing \ when current dir is subdir (windows) of queried drive */ @@ -392,7 +391,7 @@ static void test_GetVolumeInformationA(void) /* \ is current on root drive, call succeeds */ ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); /* again, SetCurrentDirectory on another drive does not matter */ ret = SetCurrentDirectory(Root_Slash); @@ -403,7 +402,7 @@ static void test_GetVolumeInformationA(void) /* \ is current on root drive, call succeeds */ ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); } /* try null root directory to return "root of the current directory" */ @@ -420,7 +419,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), + ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with device name space */ @@ -428,7 +427,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), + ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with a directory off the root - should generate error */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7596864..002a7e6 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -513,26 +513,29 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR fat32W[] = {'F','A','T','3','2',0}; static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; + static const WCHAR default_rootW[] = {'\\',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; + UNICODE_STRING nt_name; + WCHAR *p; enum fs_type type = FS_UNKNOWN; + BOOL ret = FALSE; - if (!root) + if (!root) root = default_rootW; + if (!RtlDosPathNameToNtPathName_U( root, &nt_name, NULL, NULL )) { - WCHAR path[MAX_PATH]; - GetCurrentDirectoryW( MAX_PATH, path ); - device[4] = path[0]; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } - else + /* there must be exactly one backslash in the name, at the end */ + p = memchrW( nt_name.Buffer + 4, '\\', (nt_name.Length - 4) / sizeof(WCHAR) ); + if (p != nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - 1) { - if (!root[0] || root[1] != ':' || root[lstrlenW(root)-1] != '\\' ) - { - SetLastError( ERROR_INVALID_NAME ); - return FALSE; - } - device[4] = root[0]; + SetLastError( ERROR_INVALID_NAME ); + goto done; } + device[4] = nt_name.Buffer[4]; /* try to open the device */ @@ -566,7 +569,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, } CloseHandle( handle ); TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); - if (type == FS_ERROR) return FALSE; + if (type == FS_ERROR) goto done; if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); @@ -581,7 +584,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, case DRIVE_UNKNOWN: case DRIVE_NO_ROOT_DIR: SetLastError( ERROR_NOT_READY ); - return FALSE; + goto done; case DRIVE_REMOVABLE: case DRIVE_FIXED: case DRIVE_REMOTE: @@ -618,7 +621,11 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_CASE_PRESERVED_NAMES; break; } - return TRUE; + ret = TRUE; + +done: + RtlFreeUnicodeString( &nt_name ); + return ret; }

1 0

Piotr Caban : jscript: Added invocation flag tests.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: ebb46f3fd09a9763702f9eeb897e1bd5591dd299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb46f3fd09a9763702f9eeb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 19 23:14:35 2010 +0200 jscript: Added invocation flag tests. --- dlls/jscript/object.c | 5 ++- dlls/jscript/tests/run.c | 130 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 126 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index eb1d435..4aa4ce8 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -210,7 +210,10 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(FAILED(hres)) return hres; - var_set_jsdisp(retv, obj); + if(retv) + var_set_jsdisp(retv, obj); + else + jsdisp_release(obj); break; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5c1a9f6..61e371c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -70,6 +70,7 @@ DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); +DEFINE_EXPECT(invoke_func); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -83,7 +84,9 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError); #define DISPID_GLOBAL_TESTTHIS 0x1009 #define DISPID_GLOBAL_TESTTHIS2 0x100a #define DISPID_GLOBAL_INVOKEVERSION 0x100b -#define DISPID_TEST_CREATEARRAY 0x100c +#define DISPID_GLOBAL_CREATEARRAY 0x100c +#define DISPID_GLOBAL_PROPGETFUNC 0x100d +#define DISPID_GLOBAL_OBJECT_FLAG 0x100e #define DISPID_TESTOBJ_PROP 0x2000 @@ -236,18 +239,29 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, { switch(id) { case DISPID_VALUE: - CHECK_EXPECT(testobj_value); - - ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); - ok(!pdp->rgvarg, "rgvarg != NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(pvarRes != NULL, "pvarRes == NULL\n"); ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); ok(pei != NULL, "pei == NULL\n"); + switch(wFlags) { + case INVOKE_PROPERTYGET: + CHECK_EXPECT(testobj_value); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + break; + case INVOKE_FUNC: + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + break; + case INVOKE_FUNC|INVOKE_PROPERTYGET: + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + break; + default: + ok(0, "invalid flag (%x)\n", wFlags); + } + V_VT(pvarRes) = VT_I4; V_I4(pvarRes) = 1; return S_OK; @@ -359,7 +373,17 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD } if(!strcmp_wa(bstrName, "createArray")) { test_grfdex(grfdex, fdexNameCaseSensitive); - *pid = DISPID_TEST_CREATEARRAY; + *pid = DISPID_GLOBAL_CREATEARRAY; + return S_OK; + } + if(!strcmp_wa(bstrName, "propGetFunc")) { + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PROPGETFUNC; + return S_OK; + } + if(!strcmp_wa(bstrName, "objectFlag")) { + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_OBJECT_FLAG; return S_OK; } @@ -579,7 +603,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; - case DISPID_TEST_CREATEARRAY: { + case DISPID_GLOBAL_CREATEARRAY: { SAFEARRAYBOUND bound[2]; VARIANT *data; int i,j; @@ -614,6 +638,78 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + + case DISPID_GLOBAL_PROPGETFUNC: + switch(wFlags) { + case INVOKE_FUNC: + CHECK_EXPECT(invoke_func); + break; + case INVOKE_FUNC|INVOKE_PROPERTYGET: + ok(pdp->cArgs != 0, "pdp->cArgs = %d\n", pdp->cArgs); + ok(pvarRes != NULL, "pdp->pvarRes == NULL\n"); + break; + default: + ok(0, "invalid flag (%x)\n", wFlags); + } + + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pei != NULL, "pei == NULL\n"); + + if(pvarRes) { + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = pdp->cArgs; + } + + return S_OK; + + case DISPID_GLOBAL_OBJECT_FLAG: { + IDispatchEx *dispex; + BSTR str; + HRESULT hres; + + hres = IDispatch_QueryInterface(script_disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "hres = %x\n", hres); + + str = a2bstr("Object"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); + SysFreeString(str); + ok(hres == S_OK, "hres = %x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_METHOD, pdp, NULL, pei, pspCaller); + ok(hres == S_OK, "hres = %x\n", hres); + + V_VT(pvarRes) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_METHOD, pdp, pvarRes, pei, pspCaller); + ok(hres == S_OK, "hres = %x\n", hres); + ok(V_VT(pvarRes) == VT_DISPATCH, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + VariantClear(pvarRes); + + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_METHOD|DISPATCH_PROPERTYGET, pdp, NULL, pei, pspCaller); + ok(hres == S_OK, "hres = %x\n", hres); + + V_VT(pvarRes) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_CONSTRUCT, pdp, pvarRes, pei, pspCaller); + ok(hres == S_OK, "hres = %x\n", hres); + ok(V_VT(pvarRes) == VT_DISPATCH, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + VariantClear(pvarRes); + + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_CONSTRUCT, pdp, NULL, pei, pspCaller); + ok(hres == S_OK, "hres = %x\n", hres); + + V_VT(pvarRes) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, id, lcid, DISPATCH_CONSTRUCT|DISPATCH_PROPERTYGET, pdp, pvarRes, pei, pspCaller); + ok(hres == E_INVALIDARG, "hres = %x\n", hres); + + V_VT(pvarRes) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + ok(hres == S_OK, "hres = %x\n", hres); + ok(V_VT(pvarRes) == VT_DISPATCH, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + IDispatchEx_Release(dispex); + return S_OK; + } } ok(0, "unexpected call %x\n", id); @@ -1270,6 +1366,24 @@ static void run_tests(void) parse_script_a("(function () { var testPropGet; })();"); parse_script_a("(function () { eval('var testPropGet;'); })();"); + SET_EXPECT(invoke_func); + parse_script_a("ok(propGetFunc() == 0, \"Incorrect propGetFunc value\");"); + CHECK_CALLED(invoke_func); + parse_script_a("ok(propGetFunc(1) == 1, \"Incorrect propGetFunc value\");"); + parse_script_a("ok(propGetFunc(1, 2) == 2, \"Incorrect propGetFunc value\");"); + SET_EXPECT(invoke_func); + parse_script_a("ok(propGetFunc().toString() == 0, \"Incorrect propGetFunc value\");"); + CHECK_CALLED(invoke_func); + parse_script_a("ok(propGetFunc(1).toString() == 1, \"Incorrect propGetFunc value\");"); + SET_EXPECT(invoke_func); + parse_script_a("propGetFunc(1);"); + CHECK_CALLED(invoke_func); + + parse_script_a("objectFlag(1).toString();"); + + parse_script_a("(function() { var tmp = (function () { return testObj; })()(1);})();"); + parse_script_a("(function() { var tmp = (function () { return testObj; })()();})();"); + parse_script_a("ok((testObj instanceof Object) === false, 'testObj is instance of Object');"); SET_EXPECT(testobj_prop_d);

1 0

Piotr Caban : jscript: Added DISPATCH_PROPERTYGET flag to some calls.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: cac0620fa5c249b4db2dc85dc45e5012437e5a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac0620fa5c249b4db2dc85dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 19 23:14:16 2010 +0200 jscript: Added DISPATCH_PROPERTYGET flag to some calls. --- dlls/jscript/dispex.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0e823d3..99fad56 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -263,7 +263,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t case PROP_BUILTIN: { vdisp_t vthis; - if(flags == DISPATCH_CONSTRUCT && (prop->flags & DISPATCH_METHOD)) { + if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; } @@ -576,6 +576,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc memset(&jsexcept, 0, sizeof(jsexcept)); switch(wFlags) { + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + wFlags = DISPATCH_METHOD; case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: hres = invoke_prop_func(This, This, prop, wFlags, pdp, pvarRes, &jsexcept, pspCaller); @@ -940,6 +942,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS } memset(ei, 0, sizeof(*ei)); + if(retv && arg_cnt(dp)) + flags |= DISPATCH_PROPERTYGET; if(retv) V_VT(retv) = VT_EMPTY;

1 0

Krzysztof Nowicki : windowscodecs/tests: Add test cases for *_CopyPixels calls with NULL rectangle.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 29a5d9b3f66a9c58ce2dbd22145f189e30acd4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a5d9b3f66a9c58ce2dbd221… Author: Krzysztof Nowicki <krissn(a)op.pl> Date: Tue Oct 19 18:57:47 2010 +0200 windowscodecs/tests: Add test cases for *_CopyPixels calls with NULL rectangle. --- dlls/windowscodecs/tests/bmpformat.c | 4 +++ dlls/windowscodecs/tests/converter.c | 37 ++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 0fcdc06..378c375 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -197,6 +197,10 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 6, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels(rect=NULL) failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + IWICBitmapFrameDecode_Release(framedecode); } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5c66636..408a6ca 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -110,9 +110,21 @@ static HRESULT WINAPI BitmapTestSrc_CopyPixels(IWICBitmapSource *iface, UINT bytesperrow; UINT srcstride; UINT row_offset; + WICRect rc; - if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->data->width || prc->Y+prc->Height > This->data->height) - return E_INVALIDARG; + if (!prc) + { + rc.X = 0; + rc.Y = 0; + rc.Width = This->data->width; + rc.Height = This->data->height; + prc = &rc; + } + else + { + if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->data->width || prc->Y+prc->Height > This->data->height) + return E_INVALIDARG; + } bytesperrow = ((This->data->bpp * prc->Width)+7)/8; srcstride = ((This->data->bpp * This->data->width)+7)/8; @@ -233,6 +245,27 @@ static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSour } else ok(memcmp(expect->bits, converted_bits, buffersize) == 0, "unexpected pixel data (%s)\n", name); + + /* Test with NULL rectangle - should copy the whole bitmap */ + hr = IWICBitmapSource_CopyPixels(source, NULL, stride, buffersize, converted_bits); + ok(SUCCEEDED(hr), "CopyPixels(%s,rc=NULL) failed, hr=%x\n", name, hr); + if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppBGR)) + { + /* ignore the padding byte when comparing data */ + UINT i; + BOOL equal=TRUE; + const DWORD *a=(const DWORD*)expect->bits, *b=(const DWORD*)converted_bits; + for (i=0; i<(buffersize/4); i++) + if ((a[i]&0xffffff) != (b[i]&0xffffff)) + { + equal = FALSE; + break; + } + ok(equal, "unexpected pixel data with rc=NULL (%s)\n", name); + } + else + ok(memcmp(expect->bits, converted_bits, buffersize) == 0, "unexpected pixel data with rc=NULL (%s)\n", name); + HeapFree(GetProcessHeap(), 0, converted_bits); }

1 0

Anders Jonsson : net: Add Swedish translation.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 1dc1ba1414cb090ce4c98975760fabd0feaa40c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc1ba1414cb090ce4c989757… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Oct 19 22:59:05 2010 +0200 net: Add Swedish translation. --- programs/net/Makefile.in | 1 + programs/net/Sv.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 6a2ec38..3eadd61 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -20,6 +20,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sv.rc \ Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/net/Sv.rc b/programs/net/Sv.rc new file mode 100644 index 0000000..ed6943d --- /dev/null +++ b/programs/net/Sv.rc @@ -0,0 +1,48 @@ +/* + * NET.EXE - Wine-compatible net program + * Swedish language support + * + * Copyright (C) 2010 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Syntax för detta kommando är:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Ange namn på tjänst att starta.\n" + STRING_STOP_USAGE, "Ange namn på tjänst att stoppa.\n" + STRING_STOP_DEP, "Stoppar beroende tjänst: %s\n" + STRING_CANT_STOP, "Kunde inte stoppa tjänst %s\n" + STRING_NO_SCM, "Kunde inte få en referens till tjänstekontrollhanteraren.\n" + STRING_NO_SVCHANDLE, "Kunde inte få en referens till tjänsten.\n" + STRING_START_SVC, "Tjänsten %s startar.\n" + STRING_START_SVC_SUCCESS, "Tjänsten %s startades utan problem.\n" + STRING_START_SVC_FAIL, "Tjänsten %s kunde inte starta.\n" + STRING_STOP_SVC, "Tjänsten %s stoppas.\n" + STRING_STOP_SVC_SUCCESS, "Tjänsten %s har stoppats.\n" + STRING_STOP_SVC_FAIL, "Tjänsten %s kunde inte stoppas.\n" + STRING_HELP_USAGE, "Syntax för detta kommando är:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n"\ + " Tillgängliga kommandon:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Det finns inga poster i listan.\n" + STRING_USE_HEADER, "\nStatus Lokal Fjärransluten\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Öppna resurser: %lu\n" +}

1 0

Anders Jonsson : jscript: Update Swedish translation.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 5164164ff8d47221b1281c8bb0e4fbf17908e513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5164164ff8d47221b1281c8bb… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Oct 19 22:58:05 2010 +0200 jscript: Update Swedish translation. --- dlls/jscript/jscript_Sv.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Sv.rc b/dlls/jscript/jscript_Sv.rc index 9b0e309..fbabaa0 100644 --- a/dlls/jscript/jscript_Sv.rc +++ b/dlls/jscript/jscript_Sv.rc @@ -26,6 +26,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Kunde inte konvertera objekt till primitiv typ" IDS_INVALID_CALL_ARG "Ogiltigt funktionsanrop eller argument" + IDS_SUBSCRIPT_OUT_OF_RANGE "Index utanför giltigt intervall" IDS_CREATE_OBJ_ERROR "Automationsservern kunde inte skapa objekt" IDS_NO_PROPERTY "Objektet stöder inte denna egenskap eller metod" IDS_UNSUPPORTED_ACTION "Objektet stöder inte denna handling" @@ -42,6 +43,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Ogiltig tilldelning" IDS_UNDEFINED "'|' är odefinierat" IDS_NOT_BOOL "Boolskt objekt förväntades" + IDS_NOT_VBARRAY "VBArray-objekt förväntades" IDS_JSCRIPT_EXPECTED "JScript-objekt förväntades" IDS_REGEXP_SYNTAX_ERROR "Syntaxfel i reguljärt uttryck" IDS_URI_INVALID_CHAR "Den URI som ska kodas innehåller ogiltiga tecken"

1 0

Krzysztof Nowicki : windowscodecs: Fix *_CopyPixels functions to properly handle a NULL rectangle.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 145bda5aa6a1811f5c31d287bb6026d148a07038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145bda5aa6a1811f5c31d287b… Author: Krzysztof Nowicki <krissn(a)op.pl> Date: Tue Oct 19 18:50:36 2010 +0200 windowscodecs: Fix *_CopyPixels functions to properly handle a NULL rectangle. --- dlls/windowscodecs/converter.c | 16 ++++++++++++++++ dlls/windowscodecs/fliprotate.c | 13 +++++++++++++ dlls/windowscodecs/gifformat.c | 16 ++++++++++++++-- dlls/windowscodecs/jpegformat.c | 16 ++++++++++++++++ dlls/windowscodecs/main.c | 16 ++++++++++++++-- dlls/windowscodecs/tiffformat.c | 18 +++++++++++++++--- 6 files changed, 88 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 86cdf55..a83f4a5 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -850,11 +850,27 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { FormatConverter *This = (FormatConverter*)iface; + WICRect rc; + HRESULT hr; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); if (This->source) + { + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(This->source, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + return This->dst_format->copy_function(This, prc, cbStride, cbBufferSize, pbBuffer, This->src_format->format); + } else return WINCODEC_ERR_NOTINITIALIZED; } diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 7dac252..dbbb957 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -140,6 +140,7 @@ static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, UINT y; UINT srcy, srcwidth, srcheight; WICRect rc; + WICRect rect; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); @@ -155,6 +156,18 @@ static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, hr = IWICBitmapSource_GetSize(This->source, &srcwidth, &srcheight); if (FAILED(hr)) return hr; + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(iface, &width, &height); + if (FAILED(hr)) return hr; + rect.X = 0; + rect.Y = 0; + rect.Width = width; + rect.Height = height; + prc = &rect; + } + for (y=prc->Y; y - prc->Y < prc->Height; y++) { if (This->flip_y) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 239d25d..5cbdc26 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -184,9 +184,21 @@ static HRESULT copy_interlaced_pixels(const BYTE *srcbuffer, const BYTE *src; BYTE *dst; UINT y; + WICRect rect; - if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) - return E_INVALIDARG; + if (!rc) + { + rect.X = 0; + rect.Y = 0; + rect.Width = srcwidth; + rect.Height = srcheight; + rc = &rect; + } + else + { + if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) + return E_INVALIDARG; + } if (dststride < rc->Width) return E_INVALIDARG; diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 5243d94..c3cd455 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -519,8 +519,24 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, UINT data_size; UINT max_row_needed; jmp_buf jmpbuf; + WICRect rect; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + if (!prc) + { + rect.X = 0; + rect.Y = 0; + rect.Width = This->cinfo.output_width; + rect.Height = This->cinfo.output_height; + prc = &rect; + } + else + { + if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->cinfo.output_width || + prc->Y+prc->Height > This->cinfo.output_height) + return E_INVALIDARG; + } + if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; else if (This->cinfo.out_color_space == JCS_CMYK) bpp = 32; else bpp = 24; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index ff543d5..906ea16 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -53,9 +53,21 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, { UINT bytesperrow; UINT row_offset; /* number of bits into the source rows where the data starts */ + WICRect rect; - if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) - return E_INVALIDARG; + if (!rc) + { + rect.X = 0; + rect.Y = 0; + rect.Width = srcwidth; + rect.Height = srcheight; + rc = &rect; + } + else + { + if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) + return E_INVALIDARG; + } bytesperrow = ((bpp * rc->Width)+7)/8; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 645cfb0..1256110 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -799,12 +799,24 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, HRESULT hr=S_OK; BYTE *dst_tilepos; UINT bytesperrow; + WICRect rect; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->decode_info.width || - prc->Y+prc->Height > This->decode_info.height) - return E_INVALIDARG; + if (!prc) + { + rect.X = 0; + rect.Y = 0; + rect.Width = This->decode_info.width; + rect.Height = This->decode_info.height; + prc = &rect; + } + else + { + if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->decode_info.width || + prc->Y+prc->Height > This->decode_info.height) + return E_INVALIDARG; + } bytesperrow = ((This->decode_info.bpp * prc->Width)+7)/8;

1 0

Matteo Bruni : d3dx9: Initialize a variable in ID3DXSpriteImpl_Flush.
by Alexandre Julliard Oct. 19, 2010

Oct. 19, 2010

Module: wine Branch: master Commit: d32a07a04beb4b222a48d69f0878a82112c0153d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32a07a04beb4b222a48d69f0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 19 15:34:22 2010 +0200 d3dx9: Initialize a variable in ID3DXSpriteImpl_Flush. --- dlls/d3dx9_36/sprite.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 341efc1..bff518a 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -338,7 +338,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(LPD3DXSPRITE iface) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; SPRITEVERTEX *vertices; - int i, count, start; + int i, count=0, start; TRACE("(%p)->(): relay\n", This); if(!This->ready) return D3DERR_INVALIDCALL;

1 0

Alexandre Julliard : server: Return an error in get_handle_unix_name for objects that don' t have a file name.
by Alexandre Julliard Oct. 19, 2010

Oct. 19, 2010

Module: wine Branch: master Commit: d771f4d17c3f2bb14cebc7d95b6993f92b48fedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d771f4d17c3f2bb14cebc7d95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 17:03:40 2010 +0200 server: Return an error in get_handle_unix_name for objects that don't have a file name. This way we fall back to retrieving the Win32 name. --- server/fd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index f9a769e..bc1d853 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2254,6 +2254,7 @@ DECL_HANDLER(get_handle_unix_name) if (name_len <= get_reply_max_size()) set_reply_data( fd->unix_name, name_len ); else set_error( STATUS_BUFFER_OVERFLOW ); } + else set_error( STATUS_OBJECT_TYPE_MISMATCH ); release_object( fd ); } }

1 0