wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Henri Verbeet : ddraw: Implement D3DOP_STATERENDER on top of IDirect3DDevice3_SetRenderState().
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 86f209ed80d7f596b878156f33e32998213c8586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f209ed80d7f596b878156f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 13:31:54 2014 +0200 ddraw: Implement D3DOP_STATERENDER on top of IDirect3DDevice3_SetRenderState(). --- dlls/ddraw/executebuffer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index eb44a1f..b675286 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -214,20 +214,18 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DOP_STATERENDER: - { - IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; - TRACE("STATERENDER (%d)\n", count); - + TRACE("STATERENDER (%d)\n", count); for (i = 0; i < count; ++i) { D3DSTATE *ci = (D3DSTATE *)instr; - IDirect3DDevice2_SetRenderState(d3d_device2, ci->u1.drstRenderStateType, ci->u2.dwArg[0]); + if (FAILED(IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, + ci->u1.drstRenderStateType, ci->u2.dwArg[0]))) + WARN("Failed to set render state.\n"); - instr += size; + instr += size; } break; - } case D3DOP_PROCESSVERTICES: {

1 0

Henri Verbeet : ddraw: Implement D3DOP_STATELIGHT on top of IDirect3DDevice3_SetLightState().
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 789fcf0daa3b9a90d149ebd2d6e630d7c73416d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789fcf0daa3b9a90d149ebd2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 10:41:02 2014 +0200 ddraw: Implement D3DOP_STATELIGHT on top of IDirect3DDevice3_SetLightState(). --- dlls/ddraw/executebuffer.c | 125 ++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 93 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 04ea257..eb44a1f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -56,6 +56,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD vs = buffer->data.dwVertexOffset; DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; + unsigned int i; if (viewport->active_device != device) { @@ -92,8 +93,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += count * size; } break; - case D3DOP_TRIANGLE: { - DWORD i; + case D3DOP_TRIANGLE: + { D3DTLVERTEX *tl_vx = buffer->vertex_data; TRACE("TRIANGLE (%d)\n", count); @@ -144,10 +145,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += count * size; break; - case D3DOP_MATRIXMULTIPLY: { - DWORD i; - TRACE("MATRIXMULTIPLY (%d)\n", count); - + case D3DOP_MATRIXMULTIPLY: + TRACE("MATRIXMULTIPLY (%d)\n", count); for (i = 0; i < count; ++i) { D3DMATRIXMULTIPLY *ci = (D3DMATRIXMULTIPLY *)instr; @@ -169,13 +168,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } instr += size; - } - } break; + } + break; - case D3DOP_STATETRANSFORM: { - DWORD i; - TRACE("STATETRANSFORM (%d)\n", count); - + case D3DOP_STATETRANSFORM: + TRACE("STATETRANSFORM (%d)\n", count); for (i = 0; i < count; ++i) { D3DSTATE *ci = (D3DSTATE *)instr; @@ -200,77 +197,24 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += size; } - } break; - - case D3DOP_STATELIGHT: { - DWORD i; - TRACE("STATELIGHT (%d)\n", count); + break; + case D3DOP_STATELIGHT: + TRACE("STATELIGHT (%d)\n", count); for (i = 0; i < count; ++i) { D3DSTATE *ci = (D3DSTATE *)instr; - TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); - - if (!ci->u1.dlstLightStateType || (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) - ERR("Unexpected Light State Type %d\n", ci->u1.dlstLightStateType); - else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) - { - struct d3d_material *m; - - m = ddraw_get_object(&device->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATERIAL); - if (!m) - ERR("Invalid material handle %#x.\n", ci->u2.dwArg[0]); - else - material_activate(m); - } - else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) - { - switch (ci->u2.dwArg[0]) { - case D3DCOLOR_MONO: - ERR("DDCOLOR_MONO should not happen!\n"); - break; - case D3DCOLOR_RGB: - /* We are already in this mode */ - break; - default: - ERR("Unknown color model!\n"); - } - } else { - D3DRENDERSTATETYPE rs = 0; - switch (ci->u1.dlstLightStateType) { - - case D3DLIGHTSTATE_AMBIENT: /* 2 */ - rs = D3DRENDERSTATE_AMBIENT; - break; - case D3DLIGHTSTATE_FOGMODE: /* 4 */ - rs = D3DRENDERSTATE_FOGVERTEXMODE; - break; - case D3DLIGHTSTATE_FOGSTART: /* 5 */ - rs = D3DRENDERSTATE_FOGSTART; - break; - case D3DLIGHTSTATE_FOGEND: /* 6 */ - rs = D3DRENDERSTATE_FOGEND; - break; - case D3DLIGHTSTATE_FOGDENSITY: /* 7 */ - rs = D3DRENDERSTATE_FOGDENSITY; - break; - case D3DLIGHTSTATE_COLORVERTEX: /* 8 */ - rs = D3DRENDERSTATE_COLORVERTEX; - break; - default: - break; - } - - IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, rs, ci->u2.dwArg[0]); - } + if (FAILED(IDirect3DDevice3_SetLightState(&device->IDirect3DDevice3_iface, + ci->u1.dlstLightStateType, ci->u2.dwArg[0]))) + WARN("Failed to set light state.\n"); - instr += size; - } - } break; + instr += size; + } + break; - case D3DOP_STATERENDER: { - DWORD i; + case D3DOP_STATERENDER: + { IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); @@ -281,15 +225,14 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, IDirect3DDevice2_SetRenderState(d3d_device2, ci->u1.drstRenderStateType, ci->u2.dwArg[0]); instr += size; - } - } break; + } + break; + } case D3DOP_PROCESSVERTICES: { - /* TODO: Share code with IDirect3DVertexBuffer::ProcessVertices and / or - * IWineD3DDevice::ProcessVertices - */ - DWORD i; + /* TODO: Share code with d3d_vertex_buffer7_ProcessVertices() + * and / or wined3d_device_process_vertices(). */ D3DMATRIX view_mat, world_mat, proj_mat; TRACE("PROCESSVERTICES (%d)\n", count); @@ -468,10 +411,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, goto end_of_buffer; } break; - case D3DOP_BRANCHFORWARD: { - DWORD i; - TRACE("BRANCHFORWARD (%d)\n", count); - + case D3DOP_BRANCHFORWARD: + TRACE("BRANCHFORWARD (%d)\n", count); for (i = 0; i < count; ++i) { D3DBRANCH *ci = (D3DBRANCH *)instr; @@ -497,8 +438,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } instr += size; - } - } break; + } + break; case D3DOP_SPAN: { WARN("SPAN-s (%d)\n", count); @@ -506,16 +447,14 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += count * size; } break; - case D3DOP_SETSTATUS: { - DWORD i; - TRACE("SETSTATUS (%d)\n", count); - + case D3DOP_SETSTATUS: + TRACE("SETSTATUS (%d)\n", count); for (i = 0; i < count; ++i) { buffer->data.dsStatus = *(D3DSTATUS *)instr; instr += size; } - } break; + break; default: ERR("Unhandled OpCode %d !!!\n",current->bOpcode);

1 0

Jacek Caban : jscript: Fixed uninitialized variable access in interp_end_finally.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 2d752d1a93235b15a902a0133d4b88d86cd19298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d752d1a93235b15a902a0133… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 29 10:17:38 2014 +0200 jscript: Fixed uninitialized variable access in interp_end_finally. --- dlls/jscript/engine.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a84faec..942d10c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -795,18 +795,17 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) TRACE("\n"); - assert(is_bool(stack_top(ctx))); - if(!get_bool(stack_top(ctx))) { - TRACE("passing exception\n"); + v = stack_pop(ctx); + assert(is_bool(v)); - jsval_release(v); - stack_popn(ctx, 1); + if(!get_bool(v)) { + TRACE("passing exception\n"); ctx->script->ei.val = stack_pop(ctx); return DISP_E_EXCEPTION; } - stack_popn(ctx, 2); + stack_pop(ctx); return S_OK; }

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

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/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/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

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; +@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

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

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

← Newer
1
2
3
4
5
6
7
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014