May 2011 - Wine-commits - list.winehq.org

Huw Davies : shell32: Always clone the return pidl to avoid a double free if the selection is changed during teardown .
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: d6ce0b10c41b5c59f26c03891144af0338acf8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ce0b10c41b5c59f26c03891… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 12:07:02 2011 +0100 shell32: Always clone the return pidl to avoid a double free if the selection is changed during teardown. --- dlls/shell32/brsfolder.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3824c4e..b97a753 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -558,7 +558,8 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; - info->pidlRet = lptvid->lpifq; + ILFree(info->pidlRet); + info->pidlRet = ILClone(lptvid->lpifq); browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid ); @@ -676,8 +677,6 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) switch (id) { case IDOK: - /* The original pidl is owned by the treeview and will be free'd. */ - info->pidlRet = ILClone(info->pidlRet); if (info->pidlRet == NULL) /* A null pidl would mean a cancel */ info->pidlRet = _ILCreateDesktop(); pdump( info->pidlRet ); @@ -982,7 +981,10 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) if (SUCCEEDED(hr)) OleUninitialize(); if (!r) + { + ILFree(info.pidlRet); return NULL; + } return info.pidlRet; }

1 0

Alexandre Julliard : d3dx9_36: Specify arguments for stub entry points.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: f9c75812e49d4d9401950627496b864c733f26c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c75812e49d4d94019506274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:21:21 2011 +0200 d3dx9_36: Specify arguments for stub entry points. --- dlls/d3dx9_36/d3dx9_36.spec | 304 +++++++++++++++++++++--------------------- 1 files changed, 152 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c75812e49d4d9401950…

1 0

Alexandre Julliard : d3dx9: Synchronize entry point declarations across spec files.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 1ac7000a88358a5ae71145763e47ce0fc243b457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac7000a88358a5ae71145763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:22:43 2011 +0200 d3dx9: Synchronize entry point declarations across spec files. --- dlls/d3dx9_24/d3dx9_24.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_25/d3dx9_25.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_26/d3dx9_26.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_27/d3dx9_27.spec | 94 ++++++++++++++++++++-------------------- dlls/d3dx9_28/d3dx9_28.spec | 102 +++++++++++++++++++++--------------------- dlls/d3dx9_29/d3dx9_29.spec | 102 +++++++++++++++++++++--------------------- dlls/d3dx9_30/d3dx9_30.spec | 102 +++++++++++++++++++++--------------------- dlls/d3dx9_31/d3dx9_31.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_32/d3dx9_32.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_33/d3dx9_33.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_34/d3dx9_34.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_35/d3dx9_35.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_37/d3dx9_37.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_38/d3dx9_38.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_39/d3dx9_39.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_40/d3dx9_40.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_41/d3dx9_41.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_42/d3dx9_42.spec | 100 +++++++++++++++++++++--------------------- dlls/d3dx9_43/d3dx9_43.spec | 100 +++++++++++++++++++++--------------------- tools/make_specfiles | 22 +++++++++ 20 files changed, 963 insertions(+), 941 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ac7000a88358a5ae7114…

1 0

Alexandre Julliard : d3dx10: Specify arguments for stub entry points.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 2565019d4a0370e559f8a164ab8859348541e50c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2565019d4a0370e559f8a164a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:23:00 2011 +0200 d3dx10: Specify arguments for stub entry points. --- dlls/d3dx10_37/d3dx10_37.spec | 2 +- dlls/d3dx10_39/d3dx10_39.spec | 6 +- dlls/d3dx10_43/d3dx10_43.spec | 134 ++++++++++++++++++++-------------------- 3 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2565019d4a0370e559f8a…

1 0

Alexandre Julliard : d3dcompiler: Specify arguments for stub entry points that are used in forwards.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: cd2beae51b1db29e0d7659ac68f0c81cddd49c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2beae51b1db29e0d7659ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:23:45 2011 +0200 d3dcompiler: Specify arguments for stub entry points that are used in forwards. --- dlls/d3dcompiler_43/d3dcompiler_43.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index d7e0305..6cbee43 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -4,8 +4,8 @@ @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders -@ stub D3DDisassemble10Effect -@ stub D3DDisassemble +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stub D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DGetBlobPart(ptr long long long ptr) @ stdcall D3DGetDebugInfo(ptr long ptr) @ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr)

1 0

Alexandre Julliard : tools: Add more spec files to synchronize automatically.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 6744fec6c7e444600bf7fc665df95500c34a56f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6744fec6c7e444600bf7fc665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 11:13:08 2011 +0200 tools: Add more spec files to synchronize automatically. --- tools/make_specfiles | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 2ead737..73dd2bf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -70,6 +70,38 @@ my @dll_groups = "d3dx9_25", "d3dx9_24", ], + [ + "d3dx10_43", + "d3dx10_42", + "d3dx10_41", + "d3dx10_40", + "d3dx10_39", + "d3dx10_38", + "d3dx10_37", + "d3dx10_36", + "d3dx10_35", + "d3dx10_34", + "d3dx10_33", + ], + [ + "d3dcompiler_43", + "d3dcompiler_42", + "d3dcompiler_41", + "d3dcompiler_40", + "d3dcompiler_39", + "d3dcompiler_38", + "d3dcompiler_37", + "d3dcompiler_36", + "d3dcompiler_35", + "d3dcompiler_34", + "d3dcompiler_33", + ], + [ + "xinput1_3", + "xinput1_2", + "xinput1_1", + "xinput9_1_0", + ], ); my $update_flags = 0;

1 0

Huw Davies : gdi32/tests: Allow broken behaviour for nt4 sp1 and sp2.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 3a91df11e10d1b6b7fe8167ccbeece56430d3d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a91df11e10d1b6b7fe8167cc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 12:14:32 2011 +0100 gdi32/tests: Allow broken behaviour for nt4 sp1 and sp2. --- dlls/gdi32/tests/dib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 7bc48f3..57a2969 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -388,7 +388,9 @@ static void test_simple_graphics(void) ok(ds.dsBitfields[0] == 0, "got %08x\n", ds.dsBitfields[0]); ok(ds.dsBitfields[1] == 0, "got %08x\n", ds.dsBitfields[1]); ok(ds.dsBitfields[2] == 0, "got %08x\n", ds.dsBitfields[2]); - ok(ds.dsBmih.biCompression == BI_RGB, "got %x\n", ds.dsBmih.biCompression); + ok(ds.dsBmih.biCompression == BI_RGB || + broken(ds.dsBmih.biCompression == BI_BITFIELDS), /* nt4 sp1 and 2 */ + "got %x\n", ds.dsBmih.biCompression); orig_bm = SelectObject(mem_dc, dib);

1 0

André Hentschel : winedbg: Implement printing the Program Status Register.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: a2d10bc2e5a9fc9ba4f3f86140a0ed15f82467a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d10bc2e5a9fc9ba4f3f8614… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 2 22:40:00 2011 +0200 winedbg: Implement printing the Program Status Register. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index f34ecc7..f71514c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -57,9 +57,35 @@ static void be_arm_single_step(CONTEXT* ctx, unsigned enable) static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { + static const char condflags[] = "NZCV"; + int i; + char buf[8]; + + switch (ctx->Cpsr & 0x1F) + { + case 0: strcpy(buf, "User26"); break; + case 1: strcpy(buf, "FIQ26"); break; + case 2: strcpy(buf, "IRQ26"); break; + case 3: strcpy(buf, "SVC26"); break; + case 16: strcpy(buf, "User"); break; + case 17: strcpy(buf, "FIQ"); break; + case 18: strcpy(buf, "IRQ"); break; + case 19: strcpy(buf, "SVC"); break; + case 23: strcpy(buf, "ABT"); break; + case 27: strcpy(buf, "UND"); break; + default: strcpy(buf, "UNKNWN"); break; + } + dbg_printf("Register dump:\n"); - dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x\n", - ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr); + dbg_printf("%s %s Mode\n", (ctx->Cpsr & 0x20) ? "Thumb" : "ARM", buf); + + strcpy(buf, condflags); + for (i = 0; buf[i]; i++) + if (!((ctx->Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) + buf[i] = '-'; + + dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x(%s)\n", + ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); dbg_printf(" r0:%04x r1:%04x r2:%04x r3:%04x\n", ctx->R0, ctx->R1, ctx->R2, ctx->R3); dbg_printf(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x\n",

1 0

Henri Verbeet : wined3d: Cleanup surfaces only once.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 0116af370330941a5cb9b6da92cedcb2f64a9f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0116af370330941a5cb9b6da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:35 2011 +0200 wined3d: Cleanup surfaces only once. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67d3f16..f5245cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2667,7 +2667,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) if (!refcount) { - surface_cleanup(surface); surface->surface_ops->surface_cleanup(surface); surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent);

1 0

Henri Verbeet : d3d9/tests: Destroy the window after we' re done with it in test_reset().
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 02f0d82d24646c209a74befc5f3a7c92276d9fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f0d82d24646c209a74befc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:36 2011 +0200 d3d9/tests: Destroy the window after we're done with it in test_reset(). --- dlls/d3d9/tests/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b377bee..55b6982 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1229,6 +1229,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D9_Release(pD3d); + if (hwnd) DestroyWindow(hwnd); } /* Test adapter display modes */

1 0