April 2014 - Wine-commits - list.winehq.org

André Hentschel : shell32: Use boolean return value in boolean function.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 5c73a4e629afbc7266a33abf68e937e34211ab69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c73a4e629afbc7266a33abf6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 28 20:01:45 2014 +0200 shell32: Use boolean return value in boolean function. --- dlls/shell32/shellstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 6b511d2..9eb8536 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -183,7 +183,7 @@ static BOOL StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr) if (lstrcpynW (lpWide, lpStrW, nWide)) { return lstrlenW (lpWide); } - return 0; + return FALSE; } BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr)

1 0

André Hentschel : dbghelp: Use boolean return value in boolean function.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 1986dabc3e159263422019fce60a2eaa006a4fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1986dabc3e159263422019fce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 28 20:04:41 2014 +0200 dbghelp: Use boolean return value in boolean function. --- dlls/dbghelp/type.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 012af5f..c0ffaa0 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -693,7 +693,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, symt_get_tag_str(type->tag)); /* fall through */ case SymTagFunctionType: - return 0; + return FALSE; } break;

1 0

André Hentschel : dbghelp: Make pdb_load_stream_name_table a void function.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 46594b8e6be21b5a802985ea805010dc94f56960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46594b8e6be21b5a802985ea8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 28 20:07:53 2014 +0200 dbghelp: Make pdb_load_stream_name_table a void function. --- dlls/dbghelp/msc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c2c9d89..d797a4a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2239,7 +2239,7 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); } -static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) { DWORD* pdw; DWORD* ok_bits; @@ -2252,7 +2252,7 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha count = *pdw++; pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); - if (!pdb_file->stream_dict) return FALSE; + if (!pdb_file->stream_dict) return; cpstr = (char*)(pdb_file->stream_dict + numok + 1); memcpy(cpstr, str, cb); @@ -2262,7 +2262,7 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha if (*pdw++ != 0) { FIXME("unexpected value\n"); - return -1; + return; } for (i = j = 0; i < count; i++) @@ -2278,7 +2278,6 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha /* add sentinel */ pdb_file->stream_dict[numok].name = NULL; pdb_file->fpoext_stream = -1; - return j == numok && i == count; } static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name)

1 0

André Hentschel : winemenubuilder: Return FALSE on error when processing links and URLs.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: aa831198c2664be0223e345e7c4be9307a3c3498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa831198c2664be0223e345e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 28 20:10:23 2014 +0200 winemenubuilder: Return FALSE on error when processing links and URLs. --- programs/winemenubuilder/winemenubuilder.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ca58a4a..4675369 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3216,14 +3216,14 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) if( !linkname[0] ) { WINE_ERR("link name missing\n"); - return TRUE; + return FALSE; } len=GetFullPathNameW( linkname, MAX_PATH, fullname, NULL ); if (len==0 || len>MAX_PATH) { WINE_ERR("couldn't get full path of link file\n"); - return TRUE; + return FALSE; } r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, @@ -3231,14 +3231,14 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) if( FAILED( r ) ) { WINE_ERR("No IID_IShellLink\n"); - return TRUE; + return FALSE; } r = IShellLinkW_QueryInterface( sl, &IID_IPersistFile, (LPVOID*) &pf ); if( FAILED( r ) ) { WINE_ERR("No IID_IPersistFile\n"); - return TRUE; + return FALSE; } r = IPersistFile_Load( pf, fullname, STGM_READ ); @@ -3277,14 +3277,14 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) if( !urlname[0] ) { WINE_ERR("URL name missing\n"); - return TRUE; + return FALSE; } len=GetFullPathNameW( urlname, MAX_PATH, fullname, NULL ); if (len==0 || len>MAX_PATH) { WINE_ERR("couldn't get full path of URL file\n"); - return TRUE; + return FALSE; } r = CoCreateInstance( &CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER, @@ -3292,14 +3292,14 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) if( FAILED( r ) ) { WINE_ERR("No IID_IUniformResourceLocatorW\n"); - return TRUE; + return FALSE; } r = url->lpVtbl->QueryInterface( url, &IID_IPersistFile, (LPVOID*) &pf ); if( FAILED( r ) ) { WINE_ERR("No IID_IPersistFile\n"); - return TRUE; + return FALSE; } r = IPersistFile_Load( pf, fullname, STGM_READ ); if( SUCCEEDED( r ) )

1 0

André Hentschel : wscript: Fix function types.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 979c4498df16ec8177a59b883a1ca8a3f412dae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979c4498df16ec8177a59b883… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 28 20:26:22 2014 +0200 wscript: Fix function types. --- programs/wscript/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index c7d3801..fe0a2ed 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -229,7 +229,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) return SUCCEEDED(hres); } -static HRESULT create_engine(CLSID *clsid, IActiveScript **script_ret, +static BOOL create_engine(CLSID *clsid, IActiveScript **script_ret, IActiveScriptParse **parser) { IActiveScript *script; @@ -256,7 +256,7 @@ static HRESULT create_engine(CLSID *clsid, IActiveScript **script_ret, return TRUE; } -static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) +static BOOL init_engine(IActiveScript *script, IActiveScriptParse *parser) { HRESULT hres;

1 0

Ken Thomases : winemac: Disable moving or resizing windows when cursor clipping is in effect.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: ef4677106adf0ac4c0c9ea7037513ef4e5911037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4677106adf0ac4c0c9ea703… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 28 15:09:28 2014 -0500 winemac: Disable moving or resizing windows when cursor clipping is in effect. Many games clip the cursor to the client area of the window. However, on OS X, the resizing controls extend into that client area. So, it's possible that while playing, the user might unintentionally click in the resizing area and drag, resizing the window. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 14 ++++++++++++++ dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 19 ++++++++++++++++--- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index cf168c1..0f8926d 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -97,6 +97,8 @@ enum { @property (readonly, copy, nonatomic) NSEvent* lastFlagsChanged; @property (readonly, nonatomic) BOOL areDisplaysCaptured; +(a)property (readonly) BOOL clippingCursor; + + (WineApplicationController*) sharedController; - (void) transformProcessToForeground; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index dff6977..ab045b2 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -100,6 +100,8 @@ int macdrv_err_on; @synthesize cursorFrames, cursorTimer, cursor; @synthesize mouseCaptureWindow; + @synthesize clippingCursor; + + (void) initialize { if (self == [WineApplicationController class]) @@ -1354,6 +1356,16 @@ int macdrv_err_on; [self deactivateCursorClipping]; } + - (void) updateWindowsForCursorClipping + { + WineWindow* window; + for (window in [NSApp windows]) + { + if ([window isKindOfClass:[WineWindow class]]) + [window updateForCursorClipping]; + } + } + - (BOOL) startClippingCursor:(CGRect)rect { CGError err; @@ -1372,6 +1384,7 @@ int macdrv_err_on; clippingCursor = TRUE; cursorClipRect = rect; [self updateCursorClippingState]; + [self updateWindowsForCursorClipping]; return TRUE; } @@ -1384,6 +1397,7 @@ int macdrv_err_on; clippingCursor = FALSE; [self updateCursorClippingState]; + [self updateWindowsForCursorClipping]; return TRUE; } diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 68905a5..88ef23d 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -88,4 +88,6 @@ - (WineWindow*) ancestorWineWindow; + - (void) updateForCursorClipping; + @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bb173e9..48d0651 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -628,7 +628,8 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (BOOL) preventResizing { - return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || maximized); + BOOL preventForClipping = cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]; + return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || maximized || preventForClipping); } - (void) adjustFeaturesForState @@ -659,8 +660,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setContentMinSize:savedContentMinSize]; } - if (allow_immovable_windows) - [self setMovable:!disabled && !maximized]; + if (allow_immovable_windows || cursor_clipping_locks_windows) + { + if (allow_immovable_windows && (disabled || maximized)) + [self setMovable:NO]; + else if (cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]) + [self setMovable:NO]; + else + [self setMovable:YES]; + } } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior @@ -1494,6 +1502,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif macdrv_release_event(event); } + - (void) updateForCursorClipping + { + [self adjustFeaturesForState]; + } + /* * ---------- NSWindow method overrides ---------- diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6dbaae1..d3d3ffc 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -147,6 +147,7 @@ extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; +extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 1aab785..300b1a7 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -55,6 +55,7 @@ int right_option_is_alt = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; +int cursor_clipping_locks_windows = TRUE; HMODULE macdrv_module = 0; @@ -175,6 +176,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowImmovableWindows", buffer, sizeof(buffer))) allow_immovable_windows = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "CursorClippingLocksWindows", buffer, sizeof(buffer))) + cursor_clipping_locks_windows = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Vincent Povirk : ole32/tests: Add tests for storage locking.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: b8c60aaeece0f75886f1ed69d731324ef6a55b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c60aaeece0f75886f1ed69d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 21 17:06:41 2014 -0500 ole32/tests: Add tests for storage locking. --- dlls/ole32/tests/storage32.c | 270 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8c60aaeece0f75886f1e…

1 0

Vincent Povirk : ole32/tests: Add tests for sharing storages in transacted mode.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: a00f43d7e0a10b0485a121c49b7355d6b3483d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00f43d7e0a10b0485a121c49… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 18 15:01:33 2014 -0500 ole32/tests: Add tests for sharing storages in transacted mode. --- dlls/ole32/tests/storage32.c | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 208088f..f20bcd3 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3411,6 +3411,125 @@ static void test_locking(void) } } +static void test_transacted_shared(void) +{ + IStorage *stg = NULL; + IStorage *stgrw = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + LARGE_INTEGER pos; + ULARGE_INTEGER upos; + char buffer[10]; + ULONG bytesread; + + DeleteFileA(filenameA); + + /* create a new transacted storage with a stream */ + r = StgCreateDocfile(filename, STGM_CREATE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed %x\n", r); + + r = WriteClassStg(stg, &test_stg_cls); + ok(r == S_OK, "WriteClassStg failed %x\n", r); + + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, 0, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "aaa", 3, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + r = IStorage_Commit(stg, STGC_ONLYIFCURRENT); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + /* open a second transacted read/write storage */ + r = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_TRANSACTED | STGM_SHARE_DENY_NONE, NULL, 0, &stgrw); + ok(r==S_OK, "StgOpenStorage failed %x\n", r); + + /* update stream on the first storage and commit */ + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, 0, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "ccc", 3, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + r = IStorage_Commit(stg, STGC_ONLYIFCURRENT); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + /* update again without committing */ + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, 0, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "ddd", 3, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + IStream_Release(stm); + + /* we can still read the old content from the second storage */ + r = IStorage_OpenStream(stgrw, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==S_OK, "IStorage->OpenStream failed %x\n", r); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, 0, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Read(stm, buffer, sizeof(buffer), &bytesread); + ok(r==S_OK, "IStream->Read failed %x\n", r); + ok(bytesread == 3, "read wrong number of bytes %i\n", bytesread); + ok(memcmp(buffer, "aaa", 3) == 0, "wrong data\n"); + + /* and overwrite the data */ + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, 0, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "bbb", 3, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + IStream_Release(stm); + + /* commit fails because we're out of date */ + r = IStorage_Commit(stgrw, STGC_ONLYIFCURRENT); + todo_wine ok(r==STG_E_NOTCURRENT, "IStorage->Commit failed %x\n", r); + + /* unless we force it */ + r = IStorage_Commit(stgrw, STGC_DEFAULT); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + /* reverting gets us back to the last commit from the same storage */ + r = IStorage_Revert(stg); + ok(r==S_OK, "IStorage->Revert failed %x\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, 0, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Read(stm, buffer, sizeof(buffer), &bytesread); + ok(r==S_OK, "IStream->Read failed %x\n", r); + ok(bytesread == 3, "read wrong number of bytes %i\n", bytesread); + ok(memcmp(buffer, "ccc", 3) == 0, "wrong data\n"); + + /* and committing fails forever */ + r = IStorage_Commit(stg, STGC_ONLYIFCURRENT); + todo_wine ok(r==STG_E_NOTCURRENT, "IStorage->Commit failed %x\n", r); + + IStream_Release(stm); + + IStorage_Release(stg); + IStorage_Release(stgrw); + + DeleteFileA(filenameA); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3457,4 +3576,5 @@ START_TEST(storage32) test_convert(); test_direct_swmr(); test_locking(); + test_transacted_shared(); }

1 0

Vincent Povirk : ole32: Reserve the range lock sector.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: e6c58c74ad24d27085cb86e3085cbb5acc64724a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c58c74ad24d27085cb86e30… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 13:18:10 2014 -0500 ole32: Reserve the range lock sector. --- dlls/ole32/storage32.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 864a5ec..7303392 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -111,7 +111,7 @@ static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, static HRESULT StorageImpl_LoadFileHeader(StorageImpl* This); static void StorageImpl_SaveFileHeader(StorageImpl* This); -static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex); +static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex, ULONG depotIndex); static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This); static ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex); static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex); @@ -3111,7 +3111,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * Add a block depot. */ - Storage32Impl_AddBlockDepot(This, depotBlockIndexPos); + Storage32Impl_AddBlockDepot(This, depotBlockIndexPos, depotIndex); This->bigBlockDepotCount++; This->bigBlockDepotStart[depotIndex] = depotBlockIndexPos; @@ -3154,7 +3154,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * Add a block depot and mark it in the extended block. */ - Storage32Impl_AddBlockDepot(This, depotBlockIndexPos); + Storage32Impl_AddBlockDepot(This, depotBlockIndexPos, depotIndex); This->bigBlockDepotCount++; Storage32Impl_SetExtDepotBlock(This, depotIndex, depotBlockIndexPos); @@ -3219,14 +3219,24 @@ static ULONG StorageImpl_GetNextFreeBigBlock( * This will create a depot block, essentially it is a block initialized * to BLOCK_UNUSEDs. */ -static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex) +static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex, ULONG depotIndex) { BYTE blockBuffer[MAX_BIG_BLOCK_SIZE]; + ULONG rangeLockIndex = 0x7fffff00 / This->bigBlockSize - 1; + ULONG blocksPerDepot = This->bigBlockSize / sizeof(ULONG); + ULONG rangeLockDepot = rangeLockIndex / blocksPerDepot; /* * Initialize blocks as free */ memset(blockBuffer, BLOCK_UNUSED, This->bigBlockSize); + + /* Reserve the range lock sector */ + if (depotIndex == rangeLockDepot) + { + ((ULONG*)blockBuffer)[rangeLockIndex % blocksPerDepot] = BLOCK_END_OF_CHAIN; + } + StorageImpl_WriteBigBlock(This, blockIndex, blockBuffer); } @@ -3523,6 +3533,13 @@ static void StorageImpl_SetNextBlockInChain( assert(depotBlockCount < This->bigBlockDepotCount); assert(blockIndex != nextBlock); + if (blockIndex == (0x7fffff00 / This->bigBlockSize) - 1) + /* This should never happen (storage file format spec forbids it), but + * older versions of Wine may have generated broken files. We don't want to + * assert and potentially lose data, but we do want to know if this ever + * happens in a newly-created file. */ + ERR("Using range lock page\n"); + if (depotBlockCount < COUNT_BBDEPOTINHEADER) { depotBlockIndexPos = This->bigBlockDepotStart[depotBlockCount];

1 0

Vincent Povirk : ole32: Initial storage file locking implementation.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 65887802c502c4eeeb3fc905990e3e2f4548a482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65887802c502c4eeeb3fc9059… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 18 16:37:56 2014 -0500 ole32: Initial storage file locking implementation. --- dlls/ole32/filelockbytes.c | 40 +++++++++- dlls/ole32/storage32.c | 167 ++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/storage32.h | 2 + dlls/ole32/tests/storage32.c | 4 +- 4 files changed, 207 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65887802c502c4eeeb3fc…

1 0