January 2009 - Wine-commits

Anders Jonsson : oleview: Fix typo in English, Russian resources.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: b01c8da0f47f458df3563706b241489f9a212d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01c8da0f47f458df3563706b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Jan 24 18:08:10 2009 +0100 oleview: Fix typo in English, Russian resources. --- programs/oleview/En.rc | 2 +- programs/oleview/Ru.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 003ba5c..700e1d7 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -104,7 +104,7 @@ STRINGTABLE IDM_REGEDIT, "Run the Wine registry editor" IDM_EXIT, "Quit the application. Prompts to save changes" IDM_CREATEINST, "Create an instance of the selected object" - IDM_CREATEINSTON, "Create an instance of the selected object on a specyfic machine" + IDM_CREATEINSTON, "Create an instance of the selected object on a specific machine" IDM_RELEASEINST, "Release the currently selected object instance" IDM_COPYCLSID, "Copy the GUID of the currently selected item to the clipboard" IDM_VIEW, "Display the viewer for the selected item" diff --git a/programs/oleview/Ru.rc b/programs/oleview/Ru.rc index 62a877d..cf63d75 100644 --- a/programs/oleview/Ru.rc +++ b/programs/oleview/Ru.rc @@ -104,7 +104,7 @@ STRINGTABLE IDM_REGEDIT, "�� Wine" IDM_EXIT, "�� " IDM_CREATEINST, "Create an instance of the selected object" - IDM_CREATEINSTON, "Create an instance of the selected object on a specyfic machine" + IDM_CREATEINSTON, "Create an instance of the selected object on a specific machine" IDM_RELEASEINST, "Release the currently selected object instance" IDM_COPYCLSID, "�� GUID �� " IDM_VIEW, "Display the viewer for the selected item"

1 0

David Adam : ddraw/tests: Add a few tests for ComputeShereVisibility.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 62b8b9a8fd3eea3b90332064d314603a2540cfc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b8b9a8fd3eea3b90332064d… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jan 24 19:32:30 2009 +0100 ddraw/tests: Add a few tests for ComputeShereVisibility. --- dlls/ddraw/tests/d3d.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 3a2cd2b..6cd9e56 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2743,6 +2743,135 @@ static void SetMaterialTest(void) ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc); } +static void ComputeSphereVisibility(void) +{ + D3DMATRIX proj, view, world; + D3DVALUE radius; + D3DVECTOR center; + DWORD result[1]; + HRESULT rc; + + world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; + world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; + world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; + world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; + + view._11=1.000000; view._12=0.000000; view._13=0.000000; view._14=0.000000; + view._21=0.000000; view._22=0.768221; view._23=-0.640185; view._24=0.000000; + view._31=-0.000000; view._32=0.640185; view._33=0.768221; view._34=0.000000; + view._41=-14.852037; view._42=9.857489; view._43=11.600972; view._44=1.000000; + + proj._11=1.810660; proj._12=0.000000; proj._13=0.00000; proj._14=0.000000; + proj._21=0.000000; proj._22=2.414213; proj._23=0.000000, proj._24=0.000000; + proj._31=0.000000; proj._32=0.000000; proj._33=1.020408, proj._34=1.000000; + proj._41=0.000000; proj._42=0.000000; proj._43=-0.102041; proj._44=0.000000; + + center.x=11.461533; + center.y=-4.761727; + center.z=-1.171646; + + radius=38.252632; + + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); + + rc = IDirect3DDevice7_ComputeSphereVisibility(lpD3DDevice, &center, &radius, 1, 0, result); + + ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); + todo_wine ok(result[0] == 0x3f, "Expected 0x3f, got %x\n", result[0]); + + world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; + world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; + world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; + world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; + + view._11=1.0; view._12=0.0; view._13=0.0; view._14=0.0; + view._21=0.0; view._22=1.0; view._23=0.0; view._24=0.0; + view._31=0.0; view._32=0.0; view._33=1.0; view._34=0.0; + view._41=0.0; view._42=0.0; view._43=0.0; view._44=1.0; + + proj._11=10.0; proj._12=0.0; proj._13=0.0; proj._14=0.0; + proj._21=0.0; proj._22=10.0; proj._23=0.0, proj._24=0.0; + proj._31=0.0; proj._32=0.0; proj._33=10.0, proj._34=0.0; + proj._41=0.0; proj._42=0.0; proj._43=0.0; proj._44=1.0; + + center.x=0.0; + center.y=0.0; + center.z=0.05; + + radius=0.04; + + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); + + rc = IDirect3DDevice7_ComputeSphereVisibility(lpD3DDevice, &center, &radius, 1, 0, result); + + ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); + todo_wine ok(result[0] == 0x0, "Expected 0x0, got %x\n", result[0]); + + world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; + world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; + world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; + world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; + + view._11=1.0; view._12=0.0; view._13=0.0; view._14=0.0; + view._21=0.0; view._22=1.0; view._23=0.0; view._24=0.0; + view._31=0.0; view._32=0.0; view._33=1.0; view._34=0.0; + view._41=0.0; view._42=0.0; view._43=0.0; view._44=1.0; + + proj._11=1.0; proj._12=0.0; proj._13=0.0; proj._14=0.0; + proj._21=0.0; proj._22=1.0; proj._23=0.0, proj._24=0.0; + proj._31=0.0; proj._32=0.0; proj._33=1.0, proj._34=0.0; + proj._41=0.0; proj._42=0.0; proj._43=0.0; proj._44=1.0; + + center.x=0.0; + center.y=0.0; + center.z=0.5; + + radius=0.5; + + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); + + rc = IDirect3DDevice7_ComputeSphereVisibility(lpD3DDevice, &center, &radius, 1, 0, result); + + ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); + todo_wine ok(result[0] == 0x0, "Expected 0x0, got %x\n", result[0]); + + world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; + world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; + world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; + world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; + + view._11=1.0; view._12=0.0; view._13=0.0; view._14=0.0; + view._21=0.0; view._22=1.0; view._23=0.0; view._24=0.0; + view._31=0.0; view._32=0.0; view._33=1.0; view._34=0.0; + view._41=0.0; view._42=0.0; view._43=0.0; view._44=1.0; + + proj._11=1.0; proj._12=0.0; proj._13=0.0; proj._14=0.0; + proj._21=0.0; proj._22=1.0; proj._23=0.0, proj._24=0.0; + proj._31=0.0; proj._32=0.0; proj._33=1.0, proj._34=0.0; + proj._41=0.0; proj._42=0.0; proj._43=0.0; proj._44=1.0; + + center.x=0.0; + center.y=0.0; + center.z=0.0; + + radius=0.0; + + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); + IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); + + rc = IDirect3DDevice7_ComputeSphereVisibility(lpD3DDevice, &center, &radius, 1, 0, result); + + ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); + todo_wine ok(result[0] == 0x0, "Expected 0x0, got %x\n", result[0]); +} + START_TEST(d3d) { init_function_pointers(); @@ -2761,6 +2890,7 @@ START_TEST(d3d) LimitTest(); D3D7EnumTest(); SetMaterialTest(); + ComputeSphereVisibility(); CapsTest(); VertexBufferDescTest(); D3D7_OldRenderStateTest();

1 0

Nikolay Sivov : msi: Remove redundant pointer check (Coverity).
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: c3e2cb00d5b06752df2b4a591c0de5405be21a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e2cb00d5b06752df2b4a591… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jan 25 15:08:58 2009 +0300 msi: Remove redundant pointer check (Coverity). --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 7cd1c71..e9c2196 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1818,7 +1818,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num done: msiobj_release(&rec->hdr); - if (columns) columns->ops->delete(columns); + columns->ops->delete(columns); return r; }

1 0

Ricardo Filipe : ntdll: Add stub for RtlGetCompressionWorkSpaceSize.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: f4eb36531f3915ed4a7ca2ce32c88e99f3bf4de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4eb36531f3915ed4a7ca2ce3… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sat Jan 24 13:41:37 2009 +0000 ntdll: Add stub for RtlGetCompressionWorkSpaceSize. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 13 +++++++++++++ include/winternl.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ac4b51..4ea9ec9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -612,7 +612,7 @@ @ stdcall RtlGetAce(ptr long ptr) @ stdcall RtlGetActiveActivationContext(ptr) @ stub RtlGetCallersAddress -@ stub RtlGetCompressionWorkSpaceSize +@ stdcall RtlGetCompressionWorkSpaceSize(long ptr ptr) @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetCurrentDirectory_U(long ptr) @ stdcall RtlGetCurrentPeb() diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index a4d1dac..eb33cca 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1067,3 +1067,16 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER ListHeader, return oldHeader.s.Next.Next; #endif } + +/****************************************************************************** + * RtlGetCompressionWorkSpaceSize [NTDLL.@] + */ +NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT CompressionFormatAndEngine, + PULONG CompressBufferWorkSpaceSize, + PULONG CompressFragmentWorkSpaceSize) +{ + FIXME("0x%04x, %p, %p: stub!\n", CompressionFormatAndEngine, CompressBufferWorkSpaceSize, + CompressFragmentWorkSpaceSize); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/winternl.h b/include/winternl.h index 60ca821..b3f980e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2342,6 +2342,7 @@ NTSYSAPI void WINAPI RtlFreeThreadActivationContextStack(void); NTSYSAPI void WINAPI RtlFreeUnicodeString(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlGetAce(PACL,DWORD,LPVOID *); NTSYSAPI NTSTATUS WINAPI RtlGetActiveActivationContext(HANDLE*); +NTSYSAPI NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR_CONTROL,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR); NTSYSAPI PEB * WINAPI RtlGetCurrentPeb(void);

1 0

Jeff Latimer : user32/tests: Add tests for invalid instance passed to DdeCreateStringHandle.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 77e0e9cccc67537fa49409407174d8e5905e372d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e0e9cccc67537fa49409407… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Jan 24 21:34:35 2009 +1100 user32/tests: Add tests for invalid instance passed to DdeCreateStringHandle. Similar the DdeCreateDataHandle, DdeCreateStringHandle behaves the same way. If an invalid instance Id is passed then lastError is set for all instances of that thread. --- dlls/user32/tests/dde.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eaea63c..01dc529 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1550,6 +1550,7 @@ static void test_DdeCreateDataHandle(void) BOOL ret; HSZ item; LPBYTE ptr; + WCHAR item_str[] = {'i','t','e','m',0}; dde_inst = 0; dde_inst2 = 0; @@ -1559,6 +1560,29 @@ static void test_DdeCreateDataHandle(void) res = DdeInitializeA(&dde_inst2, client_ddeml_callback, APPCMD_CLIENTONLY, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + /* 0 instance id + * This block tests an invalid instance Id. The correct behaviour is that if the instance Id + * is invalid then the lastError of all instances is set to the error. There are two instances + * created, lastError is cleared, an error is generated and then both instances are checked to + * ensure that they both have the same error set + */ + item = DdeCreateStringHandleA(0, "item", CP_WINANSI); + ok(item == NULL, "Expected NULL hsz got %p\n", item); + err = DdeGetLastError(dde_inst); + todo_wine + ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + err = DdeGetLastError(dde_inst2); + todo_wine + ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + item = DdeCreateStringHandleW(0, item_str, CP_WINUNICODE); + ok(item == NULL, "Expected NULL hsz got %p\n", item); + err = DdeGetLastError(dde_inst); + todo_wine + ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + err = DdeGetLastError(dde_inst2); + todo_wine + ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + item = DdeCreateStringHandleA(dde_inst, "item", CP_WINANSI); ok(item != NULL, "Expected non-NULL hsz\n"); item = DdeCreateStringHandleA(dde_inst2, "item", CP_WINANSI);

1 0

Jeff Latimer : user32: DdeCreateStringHandle checks for an invalid instance Id and sets lastError for instances on that thread .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: c743f9d0bdfc190d24881e0238aaeb29f5167d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c743f9d0bdfc190d24881e023… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Jan 24 21:34:44 2009 +1100 user32: DdeCreateStringHandle checks for an invalid instance Id and sets lastError for instances on that thread. --- dlls/user32/dde_misc.c | 8 ++++++-- dlls/user32/tests/dde.c | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 2b7fb81..3cbbae8 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1128,7 +1128,9 @@ HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); pInstance = WDML_GetInstance(idInst); - if (pInstance) + if (pInstance == NULL) + WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); + else { if (codepage == 0) codepage = CP_WINANSI; hsz = WDML_CreateString(pInstance, psz, codepage); @@ -1155,7 +1157,9 @@ HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) HSZ hsz = 0; pInstance = WDML_GetInstance(idInst); - if (pInstance) + if (pInstance == NULL) + WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); + else { if (codepage == 0) codepage = CP_WINUNICODE; hsz = WDML_CreateString(pInstance, psz, codepage); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 01dc529..a60e562 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1569,18 +1569,14 @@ static void test_DdeCreateDataHandle(void) item = DdeCreateStringHandleA(0, "item", CP_WINANSI); ok(item == NULL, "Expected NULL hsz got %p\n", item); err = DdeGetLastError(dde_inst); - todo_wine ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); err = DdeGetLastError(dde_inst2); - todo_wine ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); item = DdeCreateStringHandleW(0, item_str, CP_WINUNICODE); ok(item == NULL, "Expected NULL hsz got %p\n", item); err = DdeGetLastError(dde_inst); - todo_wine ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); err = DdeGetLastError(dde_inst2); - todo_wine ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); item = DdeCreateStringHandleA(dde_inst, "item", CP_WINANSI);

1 0

Vincent Povirk : gdiplus: Do not call delete_element(NULL).
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 3184dc9125a472388d69b0741996a501a2313095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3184dc9125a472388d69b0741… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jan 24 00:30:50 2009 -0600 gdiplus: Do not call delete_element(NULL). --- dlls/gdiplus/region.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4d694f4..89b107f 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -268,7 +268,6 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin out: GdipFree(left); - delete_element(right); GdipDeleteRegion(path_region); return stat; } @@ -315,7 +314,6 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, out: GdipFree(left); - delete_element(right); GdipDeleteRegion(rect_region); return stat; } @@ -373,7 +371,6 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, if (stat != Ok) { GdipFree(left); - delete_element(right); return OutOfMemory; }

1 0

Marcus Meissner : winefile: Avoid array overrun (coverity).
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 9a0a89271ec467938d06748387a647ebc0e3601f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0a89271ec467938d0674838… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 24 09:52:36 2009 +0100 winefile: Avoid array overrun (coverity). --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 2caff8e..aefe7bd 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2732,7 +2732,7 @@ static void calc_single_width(Pane* pane, int col) x = pane->positions[col] + cx; - for(; col<COLUMNS; ) { + for(; col<COLUMNS-1; ) { pane->positions[++col] = x; x += pane->widths[col]; }

1 0

Juan Lang : cryptui: Implement CryptUIWizExport for the no UI case.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 56215060dcb1d696dd8db3b842c521a6e279c1ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=56215060dcb1d696dd8db3b84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 13:25:51 2009 -0800 cryptui: Implement CryptUIWizExport for the no UI case. --- dlls/cryptui/main.c | 49 +++++++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b03659e..78d5b18 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6097,42 +6097,41 @@ static BOOL save_cms(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, return ret; } -static BOOL do_export(struct ExportWizData *data) +static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, + PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo) { BOOL ret; - switch (data->pExportInfo->dwSubjectChoice) + switch (pExportInfo->dwSubjectChoice) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: - ret = save_der(data->file, - data->pExportInfo->u.pCRLContext->pbCrlEncoded, - data->pExportInfo->u.pCRLContext->cbCrlEncoded); + ret = save_der(file, + pExportInfo->u.pCRLContext->pbCrlEncoded, + pExportInfo->u.pCRLContext->cbCrlEncoded); break; case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: - ret = save_der(data->file, - data->pExportInfo->u.pCTLContext->pbCtlEncoded, - data->pExportInfo->u.pCTLContext->cbCtlEncoded); + ret = save_der(file, + pExportInfo->u.pCTLContext->pbCtlEncoded, + pExportInfo->u.pCTLContext->cbCtlEncoded); break; default: - switch (data->contextInfo.dwExportFormat) + switch (pContextInfo->dwExportFormat) { case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: - ret = save_base64(data->file, - data->pExportInfo->u.pCertContext->pbCertEncoded, - data->pExportInfo->u.pCertContext->cbCertEncoded); + ret = save_base64(file, + pExportInfo->u.pCertContext->pbCertEncoded, + pExportInfo->u.pCertContext->cbCertEncoded); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: - ret = save_cms(data->file, data->pExportInfo, - data->contextInfo.fExportChain); + ret = save_cms(file, pExportInfo, pContextInfo->fExportChain); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: FIXME("unimplemented for PFX\n"); ret = FALSE; break; default: - ret = save_der(data->file, - data->pExportInfo->u.pCertContext->pbCertEncoded, - data->pExportInfo->u.pCertContext->cbCertEncoded); + ret = save_der(file, pExportInfo->u.pCertContext->pbCertEncoded, + pExportInfo->u.pCertContext->cbCertEncoded); } } return ret; @@ -6191,7 +6190,8 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, DWORD mbFlags; data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); - if ((data->success = do_export(data))) + if ((data->success = do_export(data->file, data->pExportInfo, + &data->contextInfo))) { messageID = IDS_EXPORT_SUCCEEDED; mbFlags = MB_OK; @@ -6344,8 +6344,17 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, pvoid); else { - FIXME("stub\n"); - ret = FALSE; + HANDLE file = CreateFileW(pExportInfo->pwszExportFileName, + GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CREATE_ALWAYS, 0, NULL); + + if (file != INVALID_HANDLE_VALUE) + { + ret = do_export(file, pExportInfo, pvoid); + CloseHandle(file); + } + else + ret = FALSE; } return ret; }

1 0

Juan Lang : cryptui: Fix a typo.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 8e5f9d57fcdbc389b7179de12334468de7457b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5f9d57fcdbc389b7179de12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 13:26:59 2009 -0800 cryptui: Fix a typo. --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 78d5b18..f607ccc 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5288,7 +5288,7 @@ static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } else import_warning(data->dwFlags, hwnd, data->pwszWizardTitle, - IDS_IMPORT_SUCCEEDED); + IDS_IMPORT_FAILED); break; } }

1 0