July 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : ole32: Use interface macros to call methods.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 88e6c8175b36ec4b2e06c003bf8e7da7e053b57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e6c8175b36ec4b2e06c003b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:15:25 2012 +0400 ole32: Use interface macros to call methods. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 6a39b94..1471162 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -657,7 +657,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( seek_pos.QuadPart = This->currentPosition.QuadPart; - hres=StgStreamImpl_Seek (*ppstm, seek_pos, STREAM_SEEK_SET, NULL); + hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); assert (SUCCEEDED(hres)); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a1c925f..30d380b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2152,7 +2152,7 @@ static HRESULT deleteStreamContents( size.u.HighPart = 0; size.u.LowPart = 0; - hr = StorageBaseImpl_OpenStream(&parentStorage->IStorage_iface, + hr = IStorage_OpenStream(&parentStorage->IStorage_iface, entryDataToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); if (hr!=S_OK) @@ -4798,14 +4798,10 @@ static void TransactedSnapshotImpl_Destroy( StorageBaseImpl *iface) { TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; - TransactedSnapshotImpl_Revert(&This->base.IStorage_iface); - + IStorage_Revert(&This->base.IStorage_iface); IStorage_Release(&This->transactedParent->IStorage_iface); - IStorage_Release(&This->scratch->IStorage_iface); - HeapFree(GetProcessHeap(), 0, This->entries); - HeapFree(GetProcessHeap(), 0, This); }

1 0

Nikolay Sivov : ole32: Make ole stream creation helper capable of handling flags data.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 52ce30d242154530a0a46bae4d5bc332f7906c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ce30d242154530a0a46bae4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:31:08 2012 +0400 ole32: Make ole stream creation helper capable of handling flags data. --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/storage32.c | 73 +++++++++++++++++++---------------------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b98404f..57b0c46 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -662,7 +662,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) ProgIDFromCLSID(&clsID, &strProgID); WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL ); - OLECONVERT_CreateOleStream(std.u.pstg); + STORAGE_CreateOleStream(std.u.pstg, 0); OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName); } } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 30d380b..f4f2d88 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8520,18 +8520,18 @@ static DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData) } /************************************************************************* - * OLECONVERT_CreateOleStream [Internal] + * STORAGE_CreateOleStream [Internal] * * Creates the "\001OLE" stream in the IStorage if necessary. * * PARAMS - * pStorage [I] Dest storage to create the stream in + * storage [I] Dest storage to create the stream in + * flags [I] flags to be set for newly created stream * * RETURNS - * Nothing + * HRESULT return value * * NOTES - * This function is used by OleConvertOLESTREAMToIStorage only. * * This stream is still unknown, MS Word seems to have extra data * but since the data is stored in the OLESTREAM there should be @@ -8539,28 +8539,32 @@ static DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData) * deleted it will create it with this default data. * */ -void OLECONVERT_CreateOleStream(LPSTORAGE pStorage) +HRESULT STORAGE_CreateOleStream(IStorage *storage, DWORD flags) { - HRESULT hRes; - IStream *pStream; - static const WCHAR wstrStreamName[] = {1,'O', 'l', 'e', 0}; - BYTE pOleStreamHeader [] = + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + static const DWORD version_magic = 0x02000001; + IStream *stream; + HRESULT hr; + + hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + if (hr == S_OK) { - 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 - }; + struct empty_1ole_stream { + DWORD version_magic; + DWORD flags; + BYTE padding[12]; + }; + struct empty_1ole_stream stream_data; - /* Create stream if not present */ - hRes = IStorage_CreateStream(pStorage, wstrStreamName, - STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream ); + stream_data.version_magic = version_magic; + stream_data.flags = flags; + memset(stream_data.padding, 0, sizeof(stream_data.padding)); - if(hRes == S_OK) - { - /* Write default Data */ - hRes = IStream_Write(pStream, pOleStreamHeader, sizeof(pOleStreamHeader), NULL); - IStream_Release(pStream); + hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); + IStream_Release(stream); } + + return hr; } /* write a string to a stream, preceded by its length */ @@ -9291,7 +9295,7 @@ HRESULT WINAPI OleConvertOLESTREAMToIStorage ( if(hRes == S_OK) { /*Create the Ole Stream if necessary */ - OLECONVERT_CreateOleStream(pstg); + STORAGE_CreateOleStream(pstg, 0); } } @@ -9418,33 +9422,16 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) */ HRESULT WINAPI SetConvertStg(IStorage *storage, BOOL convert) { - static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; - static const DWORD version_magic = 0x02000001; DWORD flags = convert ? OleStream_Convert : 0; - IStream *stream; HRESULT hr; TRACE("(%p, %d)\n", storage, convert); - hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); - if (hr == S_OK) - { - struct empty_1ole_stream { - DWORD version_magic; - DWORD flags; - BYTE padding[12]; - }; - struct empty_1ole_stream stream_data; - - stream_data.version_magic = version_magic; - stream_data.flags = flags; - memset(stream_data.padding, 0, sizeof(stream_data.padding)); - - hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); - IStream_Release(stream); - } - else if (hr == STG_E_FILEALREADYEXISTS) + hr = STORAGE_CreateOleStream(storage, flags); + if (hr == STG_E_FILEALREADYEXISTS) { + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + IStream *stream; DWORD header[2]; hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 80fe01b..f2061f3 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -160,7 +160,7 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN * Ole Convert support */ -void OLECONVERT_CreateOleStream(LPSTORAGE pStorage) DECLSPEC_HIDDEN; +HRESULT STORAGE_CreateOleStream(IStorage*, DWORD) DECLSPEC_HIDDEN; HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : ole32: COM cleanup of HGLOBAL ILockBytes implementation.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 897d4d4e4aa148e9f8a978d27e409d59f1af81f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897d4d4e4aa148e9f8a978d27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:53:14 2012 +0400 ole32: COM cleanup of HGLOBAL ILockBytes implementation. --- dlls/ole32/memlockbytes.c | 210 +++++++++++++-------------------------------- 1 files changed, 61 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=897d4d4e4aa148e9f8a97…

1 0

Matteo Bruni : d3dcompiler: Store location information in constants, variable dereferences and constructors.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: be350b0bb39ee1f2bc76237cbacf7ea8d788752e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be350b0bb39ee1f2bc76237cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:19 2012 +0200 d3dcompiler: Store location information in constants, variable dereferences and constructors. --- dlls/d3dcompiler_43/hlsl.y | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cf0c7b5..f7f62fe 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -799,6 +799,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; $$ = &c->node; @@ -812,6 +813,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("int", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; $$ = &c->node; @@ -825,6 +827,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("bool", HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; $$ = &c->node; @@ -832,7 +835,13 @@ primary_expr: C_FLOAT | variable { struct hlsl_ir_deref *deref = new_var_deref($1); - $$ = deref ? &deref->node : NULL; + if (deref) + { + $$ = &deref->node; + set_location(&$$->loc, &@1); + } + else + $$ = NULL; } | '(' expr ')' { @@ -888,6 +897,7 @@ postfix_expr: primary_expr constructor = d3dcompiler_alloc(sizeof(*constructor)); constructor->node.type = HLSL_IR_CONSTRUCTOR; + set_location(&constructor->node.loc, &@3); constructor->node.data_type = $2; constructor->arguments = $4;

1 0

Matteo Bruni : d3dcompiler: Pass the complete location to add_func_parameter().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 7ebab8c4f75cffb64e2d31d5a270da42666d4356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebab8c4f75cffb64e2d31d5a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:20 2012 +0200 d3dcompiler: Pass the complete location to add_func_parameter(). --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 ++- dlls/d3dcompiler_43/hlsl.y | 15 ++++++++++----- dlls/d3dcompiler_43/utils.c | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 194ed25..21ed57e 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -882,7 +882,8 @@ static inline struct hlsl_ir_constructor *constructor_from_node(const struct hls BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsigned int line) DECLSPEC_HIDDEN; +BOOL add_func_parameter(struct list *list, struct parse_parameter *param, + const struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f7f62fe..b421402 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -430,9 +430,12 @@ parameters: scope_start param_list: parameter { + struct source_location loc; + $$ = d3dcompiler_alloc(sizeof(*$$)); list_init($$); - if (!add_func_parameter($$, &$1, hlsl_ctx.line_no)) + set_location(&loc, &@1); + if (!add_func_parameter($$, &$1, &loc)) { ERR("Error adding function parameter %s.\n", $1.name); set_parse_status(&hlsl_ctx.status, PARSE_ERR); @@ -441,12 +444,14 @@ param_list: parameter } | param_list ',' parameter { + struct source_location loc; + $$ = $1; - if (!add_func_parameter($$, &$3, hlsl_ctx.line_no)) + set_location(&loc, &@3); + if (!add_func_parameter($$, &$3, &loc)) { - hlsl_message("Line %u: duplicate parameter %s.\n", - hlsl_ctx.line_no, $3.name); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "duplicate parameter %s", $3.name); return 1; } } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c4dd2e8..ce95bb5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -805,7 +805,7 @@ void free_declaration(struct hlsl_ir_var *decl) d3dcompiler_free(decl); } -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsigned int line) +BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) { struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); @@ -816,7 +816,7 @@ BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsign } decl->node.type = HLSL_IR_VAR; decl->node.data_type = param->type; - decl->node.loc.line = line; + decl->node.loc = *loc; decl->name = param->name; decl->semantic = param->semantic; decl->modifiers = param->modifiers;

1 0

Matteo Bruni : d3dcompiler: Variables and functions can' t have the same name.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 1252930bc0a2b12604bc8e5ae350e985b36e6514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1252930bc0a2b12604bc8e5ae… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:21 2012 +0200 d3dcompiler: Variables and functions can't have the same name. --- dlls/d3dcompiler_43/hlsl.y | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b421402..eedf357 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -132,8 +132,17 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) "modifier '%s' invalid for local variables", debug_modifiers(invalid)); } } + else + { + if (find_function(decl->name)) + { + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_ERROR, + "redefinition of '%s'", decl->name); + return FALSE; + } + } ret = add_declaration(hlsl_ctx.cur_scope, decl, local); - if (ret == FALSE) + if (!ret) { struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); @@ -381,6 +390,13 @@ func_declaration: func_prototype compound_statement func_prototype: var_modifiers type var_identifier '(' parameters ')' semantic { + if (get_variable(hlsl_ctx.globals, $3)) + { + hlsl_report_message(hlsl_ctx.source_file, @3.first_line, @3.first_column, + HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); + return 1; + } + $$ = new_func_decl($3, $2, $5); if (!$$) {

1 0

Matteo Bruni : d3dcompiler: Don't allow semantics on void functions.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 604a91eb579bd3249d366cb90018810e08f51717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604a91eb579bd3249d366cb90… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:22 2012 +0200 d3dcompiler: Don't allow semantics on void functions. --- dlls/d3dcompiler_43/hlsl.y | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index eedf357..33db86b 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -396,6 +396,11 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' s HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); return 1; } + if ($2->base_type == HLSL_TYPE_VOID && $7) + { + hlsl_report_message(hlsl_ctx.source_file, @7.first_line, @7.first_column, + HLSL_LEVEL_ERROR, "void function with a semantic"); + } $$ = new_func_decl($3, $2, $5); if (!$$)

1 0

Matteo Bruni : d3dcompiler: Implement basic expressions parsing.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 27880abb979f72297e9314f51683067281b8a2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=27880abb979f72297e9314f51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:23 2012 +0200 d3dcompiler: Implement basic expressions parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 88 ++++++ dlls/d3dcompiler_43/hlsl.y | 14 + dlls/d3dcompiler_43/utils.c | 417 +++++++++++++++++++++++++++++ 3 files changed, 519 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27880abb979f72297e931…

1 0

Alexandre Goujon : kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE ( DvdManufacturerDescriptor) test.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 5feea8ce1a90e651a12ce6a10bca538907deab97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5feea8ce1a90e651a12ce6a10… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Jul 16 20:06:25 2012 +0200 kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) test. --- dlls/kernel32/tests/volume.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/cdrom.c | 21 +++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 45bac31..8152ae1 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -34,6 +34,16 @@ struct COMPLETE_DVD_LAYER_DESCRIPTOR #include <poppack.h> C_ASSERT(sizeof(struct COMPLETE_DVD_LAYER_DESCRIPTOR) == 22); +#include <pshpack1.h> +struct COMPLETE_DVD_MANUFACTURER_DESCRIPTOR +{ + DVD_DESCRIPTOR_HEADER Header; + DVD_MANUFACTURER_DESCRIPTOR Descriptor; + UCHAR Padding; +}; +#include <poppack.h> +C_ASSERT(sizeof(struct COMPLETE_DVD_MANUFACTURER_DESCRIPTOR) == 2053); + static HINSTANCE hdll; static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD); @@ -750,6 +760,7 @@ static void test_dvd_read_structure(HANDLE handle) DVD_LAYER_DESCRIPTOR dvdLayerDescriptor; struct COMPLETE_DVD_LAYER_DESCRIPTOR completeDvdLayerDescriptor; DVD_COPYRIGHT_DESCRIPTOR dvdCopyrightDescriptor; + struct COMPLETE_DVD_MANUFACTURER_DESCRIPTOR completeDvdManufacturerDescriptor; dvdReadStructure.BlockByteOffset.QuadPart = 0; dvdReadStructure.SessionId = 0; @@ -839,6 +850,31 @@ static void test_dvd_read_structure(HANDLE handle) &dvdCopyrightDescriptor, i, &nbBytes, NULL); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); } + + + /* DvdManufacturerDescriptor */ + dvdReadStructure.Format = 4; + + SetLastError(0xdeadbeef); + + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + &completeDvdManufacturerDescriptor, sizeof(DVD_MANUFACTURER_DESCRIPTOR), &nbBytes, NULL); + ok(ret || broken(GetLastError() == ERROR_NOT_READY), + "IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) failed, last error = %u\n", GetLastError()); + if(!ret) + return; + + /* Confirm there is always a header before the actual data */ + ok( completeDvdManufacturerDescriptor.Header.Length == 0x0802, "Length is 0x%04x instead of 0x0802\n", completeDvdManufacturerDescriptor.Header.Length); + ok( completeDvdManufacturerDescriptor.Header.Reserved[0] == 0, "Reserved[0] is %x instead of 0\n", completeDvdManufacturerDescriptor.Header.Reserved[0]); + ok( completeDvdManufacturerDescriptor.Header.Reserved[1] == 0, "Reserved[1] is %x instead of 0\n", completeDvdManufacturerDescriptor.Header.Reserved[1]); + + SetLastError(0xdeadbeef); + + /* Basic parameter check */ + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + NULL, sizeof(DVD_MANUFACTURER_DESCRIPTOR), &nbBytes, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); } static void test_cdrom_ioctl(void) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 8374761..87e0695 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -231,6 +231,13 @@ typedef struct } internal_dvd_layer_descriptor; C_ASSERT(sizeof(internal_dvd_layer_descriptor) == 22); +typedef struct +{ + DVD_DESCRIPTOR_HEADER Header; + DVD_MANUFACTURER_DESCRIPTOR Descriptor; + UCHAR Padding; +} internal_dvd_manufacturer_descriptor; +C_ASSERT(sizeof(internal_dvd_manufacturer_descriptor) == 2053); static NTSTATUS CDROM_ReadTOC(int, int, CDROM_TOC*); static NTSTATUS CDROM_GetStatusCode(int); @@ -2595,9 +2602,12 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, case DvdManufacturerDescriptor: { - PDVD_MANUFACTURER_DESCRIPTOR p = (PDVD_MANUFACTURER_DESCRIPTOR) layer; + internal_dvd_manufacturer_descriptor *p = (internal_dvd_manufacturer_descriptor*) layer; - memcpy(p->ManufacturingInformation, s.manufact.value, 2048); + p->Header.Length = 0x0802; + p->Header.Reserved[0] = 0; + p->Header.Reserved[1] = 0; + memcpy(p->Descriptor.ManufacturingInformation, s.manufact.value, 2048); } break; @@ -2620,7 +2630,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, internal_dvd_layer_descriptor *xlayer; PDVD_COPYRIGHT_DESCRIPTOR copy; PDVD_DISK_KEY_DESCRIPTOR disk_key; - PDVD_MANUFACTURER_DESCRIPTOR manf; + internal_dvd_manufacturer_descriptor *manf; } nt_desc; nt_desc.layer = layer; @@ -2705,8 +2715,11 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, break; case DvdManufacturerDescriptor: + nt_desc.manf->Header.Length = 0x0802; + nt_desc.manf->Header.Reserved[0] = 0; + nt_desc.manf->Header.Reserved[1] = 0; memcpy( - nt_desc.manf->ManufacturingInformation, + nt_desc.manf->Descriptor.ManufacturingInformation, desc.manf.discManufacturingInfo, 2048); break;

1 0

Daniel Lehman : msvcp90: Handle npos as a len in basic_string<>::replace.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: e8314684011d269aebab4655a6da9a615e8aa5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8314684011d269aebab4655a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Dec 29 16:08:39 2011 -0800 msvcp90: Handle npos as a len in basic_string<>::replace. --- dlls/msvcp90/string.c | 8 +++--- dlls/msvcp90/tests/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index d8bc6f3..8a72291 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1949,7 +1949,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_char_npos-str_len <= this->size-len) @@ -2040,7 +2040,7 @@ basic_string_char* __thiscall basic_string_char_replace_ch(basic_string_char *th if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_char_npos-count <= this->size-len) @@ -3901,7 +3901,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_wchar_npos-str_len <= this->size-len) @@ -4000,7 +4000,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_ch(basic_string_wchar if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_wchar_npos-count <= this->size-len) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 8bc5f18..1e3ccec 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -76,6 +76,7 @@ static int (__thiscall *p_basic_string_char_compare_substr_substr)(basic_string_ static int (__thiscall *p_basic_string_char_compare_substr_cstr_len)(basic_string_char*, size_t, size_t, const char*, size_t); static size_t (__thiscall *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static size_t (__thiscall *p_basic_string_char_rfind_cstr_substr)(basic_string_char*, const char*, size_t, size_t); +static basic_string_char* (__thiscall *p_basic_string_char_replace_cstr)(basic_string_char*, size_t, size_t, const char*); static size_t *p_basic_string_char_npos; @@ -225,6 +226,8 @@ static BOOL init(void) "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); SET(p_basic_string_char_rfind_cstr_substr, "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); + SET(p_basic_string_char_replace_cstr, + "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB"); @@ -289,6 +292,8 @@ static BOOL init(void) "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); SET(p_basic_string_char_rfind_cstr_substr, "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); + SET(p_basic_string_char_replace_cstr, + "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IIPBD@Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB"); @@ -549,6 +554,54 @@ static void test_basic_string_char_rfind(void) { } } +static void test_basic_string_char_replace(void) { + struct replace_char_test { + const char *str; + size_t off; + size_t len; + const char *replace; + const char *ret; + }; + + int i; + basic_string_char str; + basic_string_char *ret; + struct replace_char_test tests[] = { + { "", 0, 0, "", "" }, /* empty string */ + { "", 0, 10, "", "" }, /* empty string with invalid len */ + + { "ABCDEF", 0, 0, "", "ABCDEF" }, /* replace with empty string */ + { "ABCDEF", 0, 0, "-", "-ABCDEF"}, /* replace with 0 len */ + { "ABCDEF", 0, 1, "-", "-BCDEF" }, /* replace 1 at beginning */ + { "ABCDEF", 0, 3, "-", "-DEF" }, /* replace 3 at beginning */ + { "ABCDEF", 0, 42, "-", "-" }, /* replace whole string with invalid long len */ + { "ABCDEF", 0, *p_basic_string_char_npos, "-", "-" }, /* replace whole string with npos */ + + { "ABCDEF", 5, 0, "", "ABCDEF" }, /* replace at end with empty string */ + { "ABCDEF", 5, 0, "-", "ABCDE-F"}, /* replace at end with 0 len */ + { "ABCDEF", 5, 1, "-", "ABCDE-" }, /* replace 1 at end */ + { "ABCDEF", 5, 42, "-", "ABCDE-" }, /* replace end with invalid long len */ + { "ABCDEF", 5, *p_basic_string_char_npos, "-", "ABCDE-" }, /* replace end with npos */ + + { "ABCDEF", 6, 0, "", "ABCDEF" }, /* replace after end with empty string */ + { "ABCDEF", 6, 0, "-", "ABCDEF-"}, /* replace after end with 0 len */ + { "ABCDEF", 6, 1, "-", "ABCDEF-" }, /* replace 1 after end */ + { "ABCDEF", 6, 42, "-", "ABCDEF-" }, /* replace after end with invalid long len */ + { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + + ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); + ok(ret == &str, "str = %p ret = %p\n", ret, &str); + ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + + call_func1(p_basic_string_char_dtor, &str); + } +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -661,6 +714,7 @@ START_TEST(string) test_basic_string_char_concatenate(); test_basic_string_char_find(); test_basic_string_char_rfind(); + test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0