February 2011 - Wine-Commits

Andrew Nguyen : dxdiagn: Add code that introduces the infrastructure of a provider information tree .
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 91130395ef2b76f6f6f849ccae97435e9cee7aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91130395ef2b76f6f6f849cca… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:14:09 2011 -0600 dxdiagn: Add code that introduces the infrastructure of a provider information tree. --- dlls/dxdiagn/dxdiag_private.h | 11 +++ dlls/dxdiagn/provider.c | 170 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 6329ccf..30891a0 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -34,6 +34,16 @@ typedef struct IDxDiagProviderImpl IDxDiagProviderImpl; typedef struct IDxDiagContainerImpl IDxDiagContainerImpl; +typedef struct IDxDiagContainerImpl_Container { + struct list entry; + WCHAR *contName; + + struct list subContainers; + DWORD nSubContainers; + struct list properties; + DWORD nProperties; +} IDxDiagContainerImpl_Container; + /* ---------------- */ /* IDxDiagProvider */ /* ---------------- */ @@ -48,6 +58,7 @@ struct IDxDiagProviderImpl { /* IDxDiagProvider fields */ BOOL init; DXDIAG_INIT_PARAMS params; + IDxDiagContainerImpl_Container *info_root; }; /* ---------------- */ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 67d75fa..9674c28 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -43,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont, IDxDiagProvider *pProv); +static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root); +static void free_information_tree(IDxDiagContainerImpl_Container *node); + /* IDxDiagProvider IUnknown parts follow: */ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) { @@ -80,6 +83,7 @@ static ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { + free_information_tree(This->info_root); HeapFree(GetProcessHeap(), 0, This); } @@ -91,6 +95,8 @@ static ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { /* IDxDiagProvider Interface follow: */ static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams) { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + HRESULT hr; + TRACE("(%p,%p)\n", iface, pParams); if (NULL == pParams) { @@ -101,6 +107,13 @@ static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDI return E_INVALIDARG; } + if (!This->info_root) + { + hr = build_information_tree(&This->info_root); + if (FAILED(hr)) + return hr; + } + This->init = TRUE; memcpy(&This->params, pParams, pParams->dwSize); return S_OK; @@ -814,3 +827,160 @@ static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont, IDxDi return S_OK; } + +static void free_information_tree(IDxDiagContainerImpl_Container *node) +{ + IDxDiagContainerImpl_Container *ptr, *cursor2; + + if (!node) + return; + + HeapFree(GetProcessHeap(), 0, node->contName); + + LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &node->subContainers, IDxDiagContainerImpl_Container, entry) + { + list_remove(&ptr->entry); + free_information_tree(ptr); + } + + HeapFree(GetProcessHeap(), 0, node); +} + +static IDxDiagContainerImpl_Container *allocate_information_node(const WCHAR *name) +{ + IDxDiagContainerImpl_Container *ret; + + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); + if (!ret) + return NULL; + + if (name) + { + ret->contName = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(*name)); + if (!ret->contName) + { + HeapFree(GetProcessHeap(), 0, ret); + return NULL; + } + strcpyW(ret->contName, name); + } + + list_init(&ret->subContainers); + list_init(&ret->properties); + + return ret; +} + +static inline void add_subcontainer(IDxDiagContainerImpl_Container *node, IDxDiagContainerImpl_Container *subCont) +{ + list_add_tail(&node->subContainers, &subCont->entry); + ++node->nSubContainers; +} + +static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_directmusic_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_directinput_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_directplay_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_systemdevices_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_directxfiles_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_logicaldisks_tree(IDxDiagContainerImpl_Container *node) +{ + return S_OK; +} + +static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root) +{ + static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; + static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; + static const WCHAR DxDiag_DirectSound[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d',0}; + static const WCHAR DxDiag_DirectMusic[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','M','u','s','i','c',0}; + static const WCHAR DxDiag_DirectInput[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','I','n','p','u','t',0}; + static const WCHAR DxDiag_DirectPlay[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','P','l','a','y',0}; + static const WCHAR DxDiag_SystemDevices[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','D','e','v','i','c','e','s',0}; + static const WCHAR DxDiag_DirectXFiles[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','X','F','i','l','e','s',0}; + static const WCHAR DxDiag_DirectShowFilters[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','h','o','w','F','i','l','t','e','r','s',0}; + static const WCHAR DxDiag_LogicalDisks[] = {'D','x','D','i','a','g','_','L','o','g','i','c','a','l','D','i','s','k','s',0}; + + static const struct + { + const WCHAR *name; + HRESULT (*initfunc)(IDxDiagContainerImpl_Container *); + } root_children[] = + { + {DxDiag_SystemInfo, build_systeminfo_tree}, + {DxDiag_DisplayDevices, build_displaydevices_tree}, + {DxDiag_DirectSound, build_directsound_tree}, + {DxDiag_DirectMusic, build_directmusic_tree}, + {DxDiag_DirectInput, build_directinput_tree}, + {DxDiag_DirectPlay, build_directplay_tree}, + {DxDiag_SystemDevices, build_systemdevices_tree}, + {DxDiag_DirectXFiles, build_directxfiles_tree}, + {DxDiag_DirectShowFilters, build_directshowfilters_tree}, + {DxDiag_LogicalDisks, build_logicaldisks_tree}, + }; + + IDxDiagContainerImpl_Container *info_root; + size_t index; + + info_root = allocate_information_node(NULL); + if (!info_root) + return E_OUTOFMEMORY; + + for (index = 0; index < sizeof(root_children)/sizeof(root_children[0]); index++) + { + IDxDiagContainerImpl_Container *node; + + node = allocate_information_node(root_children[index].name); + if (!node) + { + free_information_tree(info_root); + return E_OUTOFMEMORY; + } + + root_children[index].initfunc(node); + + add_subcontainer(info_root, node); + } + + *pinfo_root = info_root; + return S_OK; +}

1 0

Andrew Nguyen : dxdiagn: Add code that populates the DxDiag_SystemInfo container.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 9103efe6a489f5bab91d8fa4436483ddaf103131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9103efe6a489f5bab91d8fa44… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:14:19 2011 -0600 dxdiagn: Add code that populates the DxDiag_SystemInfo container. --- dlls/dxdiagn/provider.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 212 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 9674c28..ac5f366 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -828,6 +828,13 @@ static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont, IDxDi return S_OK; } +static void free_property_information(IDxDiagContainerImpl_Property *prop) +{ + VariantClear(&prop->vProp); + HeapFree(GetProcessHeap(), 0, prop->propName); + HeapFree(GetProcessHeap(), 0, prop); +} + static void free_information_tree(IDxDiagContainerImpl_Container *node) { IDxDiagContainerImpl_Container *ptr, *cursor2; @@ -839,6 +846,14 @@ static void free_information_tree(IDxDiagContainerImpl_Container *node) LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &node->subContainers, IDxDiagContainerImpl_Container, entry) { + IDxDiagContainerImpl_Property *prop, *prop_cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(prop, prop_cursor2, &ptr->properties, IDxDiagContainerImpl_Property, entry) + { + list_remove(&prop->entry); + free_property_information(prop); + } + list_remove(&ptr->entry); free_information_tree(ptr); } @@ -871,14 +886,203 @@ static IDxDiagContainerImpl_Container *allocate_information_node(const WCHAR *na return ret; } +static IDxDiagContainerImpl_Property *allocate_property_information(const WCHAR *name) +{ + IDxDiagContainerImpl_Property *ret; + + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); + if (!ret) + return NULL; + + ret->propName = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(*name)); + if (!ret->propName) + { + HeapFree(GetProcessHeap(), 0, ret); + return NULL; + } + strcpyW(ret->propName, name); + + return ret; +} + static inline void add_subcontainer(IDxDiagContainerImpl_Container *node, IDxDiagContainerImpl_Container *subCont) { list_add_tail(&node->subContainers, &subCont->entry); ++node->nSubContainers; } +static inline HRESULT add_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, const WCHAR *str) +{ + IDxDiagContainerImpl_Property *prop; + BSTR bstr; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + + bstr = SysAllocString(str); + if (!bstr) + { + free_property_information(prop); + return E_OUTOFMEMORY; + } + + V_VT(&prop->vProp) = VT_BSTR; + V_BSTR(&prop->vProp) = bstr; + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + +static inline HRESULT add_ui4_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, DWORD data) +{ + IDxDiagContainerImpl_Property *prop; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + + V_VT(&prop->vProp) = VT_UI4; + V_UI4(&prop->vProp) = data; + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + +static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data) +{ + IDxDiagContainerImpl_Property *prop; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + + V_VT(&prop->vProp) = VT_BOOL; + V_BOOL(&prop->vProp) = data; + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + +static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) +{ + IDxDiagContainerImpl_Property *prop; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + + V_VT(&prop->vProp) = VT_UI8; + V_UI8(&prop->vProp) = data; + + VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) { + static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; + static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i','n','o','r',0}; + static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e','t','t','e','r',0}; + static const WCHAR szDirectXVersionLetter_v[] = {'c',0}; + static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; + static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; + static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; + static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; + static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; + static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; + static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; + static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; + static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; + static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; + static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; + static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; + + HRESULT hr; + MEMORYSTATUSEX msex; + OSVERSIONINFOW info; + WCHAR buffer[MAX_PATH]; + + hr = add_ui4_property(node, dwDirectXVersionMajor, 9); + if (FAILED(hr)) + return hr; + + hr = add_ui4_property(node, dwDirectXVersionMinor, 0); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szDirectXVersionLetter, szDirectXVersionLetter_v); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szDirectXVersionEnglish, szDirectXVersionEnglish_v); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szDirectXVersionLongEnglish, szDirectXVersionLongEnglish_v); + if (FAILED(hr)) + return hr; + + hr = add_bool_property(node, bDebug, FALSE); + if (FAILED(hr)) + return hr; + + msex.dwLength = sizeof(msex); + GlobalMemoryStatusEx(&msex); + + hr = add_ull_as_bstr_property(node, ullPhysicalMemory, msex.ullTotalPhys); + if (FAILED(hr)) + return hr; + + hr = add_ull_as_bstr_property(node, ullUsedPageFile, msex.ullTotalPageFile - msex.ullAvailPageFile); + if (FAILED(hr)) + return hr; + + hr = add_ull_as_bstr_property(node, ullAvailPageFile, msex.ullAvailPageFile); + if (FAILED(hr)) + return hr; + + info.dwOSVersionInfoSize = sizeof(info); + GetVersionExW(&info); + + hr = add_ui4_property(node, dwOSMajorVersion, info.dwMajorVersion); + if (FAILED(hr)) + return hr; + + hr = add_ui4_property(node, dwOSMinorVersion, info.dwMinorVersion); + if (FAILED(hr)) + return hr; + + hr = add_ui4_property(node, dwOSBuildNumber, info.dwBuildNumber); + if (FAILED(hr)) + return hr; + + hr = add_ui4_property(node, dwOSPlatformID, info.dwPlatformId); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szCSDVersion, info.szCSDVersion); + if (FAILED(hr)) + return hr; + + GetWindowsDirectoryW(buffer, MAX_PATH); + + hr = add_bstr_property(node, szWindowsDir, buffer); + if (FAILED(hr)) + return hr; + return S_OK; } @@ -968,6 +1172,7 @@ static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_roo for (index = 0; index < sizeof(root_children)/sizeof(root_children[0]); index++) { IDxDiagContainerImpl_Container *node; + HRESULT hr; node = allocate_information_node(root_children[index].name); if (!node) @@ -976,7 +1181,13 @@ static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_roo return E_OUTOFMEMORY; } - root_children[index].initfunc(node); + hr = root_children[index].initfunc(node); + if (FAILED(hr)) + { + free_information_tree(node); + free_information_tree(info_root); + return hr; + } add_subcontainer(info_root, node); }

1 0

Juan Lang : rsaenh: Fully initialize schannel algorithm information.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 00ba1f606c0b393cdb44c83e867d99fe28640d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ba1f606c0b393cdb44c83e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 14 10:57:51 2011 -0800 rsaenh: Fully initialize schannel algorithm information. --- dlls/rsaenh/rsaenh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0acf4c7..61d1b87 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -866,6 +866,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwSaltLen = 0; memset(pCryptKey->abKeyValue, 0, sizeof(pCryptKey->abKeyValue)); memset(pCryptKey->abInitVector, 0, sizeof(pCryptKey->abInitVector)); + memset(&pCryptKey->siSChannelInfo.saEncAlg, 0, sizeof(pCryptKey->siSChannelInfo.saEncAlg)); + memset(&pCryptKey->siSChannelInfo.saMACAlg, 0, sizeof(pCryptKey->siSChannelInfo.saMACAlg)); init_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); init_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); init_data_blob(&pCryptKey->blobHmacKey);

1 0

Vincent Povirk : gdiplus: Add test for ImageLockModeUserInputBuf.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 732aa89c0814c2c19632f3f0d812e5c29ffd3eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732aa89c0814c2c19632f3f0d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 14 16:39:35 2011 -0600 gdiplus: Add test for ImageLockModeUserInputBuf. --- dlls/gdiplus/tests/image.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6e62178..41d9426 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -621,6 +621,90 @@ static void test_LockBits(void) expect(Ok, stat); } +static void test_LockBits_UserBuf(void) +{ + GpStatus stat; + GpBitmap *bm; + GpRect rect; + BitmapData bd; + const INT WIDTH = 10, HEIGHT = 20; + DWORD bits[200]; + ARGB color; + + bm = NULL; + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat32bppARGB, NULL, &bm); + expect(Ok, stat); + + memset(bits, 0xaa, sizeof(bits)); + + rect.X = 2; + rect.Y = 3; + rect.Width = 4; + rect.Height = 5; + + bd.Width = 4; + bd.Height = 6; + bd.Stride = WIDTH * 4; + bd.PixelFormat = PixelFormat32bppARGB; + bd.Scan0 = &bits[2+3*WIDTH]; + bd.Reserved = 0xaaaaaaaa; + + /* read-only */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); + todo_wine expect(Ok, stat); + + expect(0xaaaaaaaa, bits[0]); + todo_wine expect(0, bits[2+3*WIDTH]); + + bits[2+3*WIDTH] = 0xdeadbeef; + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + stat = GdipBitmapGetPixel(bm, 2, 3, &color); + expect(Ok, stat); + expect(0, color); + + /* write-only */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); + todo_wine expect(Ok, stat); + + expect(0xdeadbeef, bits[2+3*WIDTH]); + bits[2+3*WIDTH] = 0x12345678; + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + stat = GdipBitmapGetPixel(bm, 2, 3, &color); + expect(Ok, stat); + todo_wine expect(0x12345678, color); + + bits[2+3*WIDTH] = 0; + + /* read/write */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead|ImageLockModeWrite|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); + todo_wine expect(Ok, stat); + + todo_wine expect(0x12345678, bits[2+3*WIDTH]); + bits[2+3*WIDTH] = 0xdeadbeef; + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + stat = GdipBitmapGetPixel(bm, 2, 3, &color); + expect(Ok, stat); + todo_wine expect(0xdeadbeef, color); + + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); +} + static void test_GdipCreateBitmapFromHBITMAP(void) { GpBitmap* gpbm = NULL; @@ -2295,6 +2379,7 @@ START_TEST(image) test_SavingImages(); test_encoders(); test_LockBits(); + test_LockBits_UserBuf(); test_GdipCreateBitmapFromHBITMAP(); test_GdipGetImageFlags(); test_GdipCloneImage();

1 0

Nikolay Sivov : msxml3: Add basic putref_stylesheet() implementation.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 855ca45f295bcace966a603d354f6a9cb99ab596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855ca45f295bcace966a603d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 12 15:42:15 2011 +0300 msxml3: Add basic putref_stylesheet() implementation. --- dlls/msxml3/stylesheet.c | 27 ++++++++++++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 8455b30..446a97f 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -41,6 +41,8 @@ typedef struct _xsltemplate { IXSLTemplate IXSLTemplate_iface; LONG ref; + + IXMLDOMNode *node; } xsltemplate; static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) @@ -48,6 +50,13 @@ static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) return CONTAINING_RECORD(iface, xsltemplate, IXSLTemplate_iface); } +static void xsltemplate_set_node( xsltemplate *This, IXMLDOMNode *node ) +{ + if (This->node) IXMLDOMNode_Release(This->node); + This->node = node; + if (node) IXMLDOMNode_AddRef(node); +} + static HRESULT WINAPI xsltemplate_QueryInterface( IXSLTemplate *iface, REFIID riid, @@ -85,7 +94,10 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface ) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) + { + if (This->node) IXMLDOMNode_Release( This->node ); heap_free( This ); + } return ref; } @@ -166,8 +178,18 @@ static HRESULT WINAPI xsltemplate_putref_stylesheet( IXSLTemplate *iface, { xsltemplate *This = impl_from_IXSLTemplate( iface ); - FIXME("(%p)->(%p): stub\n", This, node); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, node); + + if (!node) + { + xsltemplate_set_node(This, NULL); + return S_OK; + } + + /* FIXME: test for document type */ + xsltemplate_set_node(This, node); + + return S_OK; } static HRESULT WINAPI xsltemplate_get_stylesheet( IXSLTemplate *iface, @@ -217,6 +239,7 @@ HRESULT XSLTemplate_create(IUnknown *pUnkOuter, void **ppObj) This->IXSLTemplate_iface.lpVtbl = &xsltemplate_vtbl; This->ref = 1; + This->node = NULL; *ppObj = &This->IXSLTemplate_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 34cc322..c1b5bb4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -627,12 +627,10 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid, #define _create(cls) cls, #cls #define create_document(iid) _create_object(&_create(CLSID_DOMDocument), iid, __LINE__) - #define create_document_version(v, iid) _create_object(&_create(CLSID_DOMDocument ## v), iid, __LINE__) - #define create_cache(iid) _create_object(&_create(CLSID_XMLSchemaCache), iid, __LINE__) - #define create_cache_version(v, iid) _create_object(&_create(CLSID_XMLSchemaCache ## v), iid, __LINE__) +#define create_xsltemplate(iid) _create_object(&_create(CLSID_XSLTemplate), iid, __LINE__) static BSTR alloc_str_from_narrow(const char *str) { @@ -7660,6 +7658,76 @@ static void test_get_xml(void) free_bstrs(); } +static void test_xsltemplate(void) +{ + IXSLTemplate *template; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HRESULT hr; + ULONG ref1, ref2; + + template = create_xsltemplate(&IID_IXSLTemplate); + if (!template) return; + + /* works as reset */ + hr = IXSLTemplate_putref_stylesheet(template, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + doc = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_("<a>test</a>"), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* putref with non-xsl document */ + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* not a freethreaded document */ + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + + IXMLDOMDocument_Release(doc); + + hr = CoCreateInstance(&CLSID_FreeThreadedDOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + if (hr != S_OK) + { + win_skip("failed to create free threaded document instance: 0x%08x\n", hr); + IXSLTemplate_Release(template); + return; + } + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* freethreaded document */ + ref1 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + ok(ref2 > ref1, "got %d\n", ref2); + + /* drop reference */ + hr = IXSLTemplate_putref_stylesheet(template, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + ok(ref2 == ref1, "got %d\n", ref2); + + IXMLDOMDocument_Release(doc); + IXSLTemplate_Release(template); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7724,6 +7792,7 @@ START_TEST(domdoc) test_createProcessingInstruction(); test_put_nodeTypedValue(); test_get_xml(); + test_xsltemplate(); CoUninitialize(); }

1 0

Thomas Mullaly : urlmon: Fixed invalid read and write errors (Valgrind).
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 1703368e26d852b8bdc8b127b9329ef84dc13242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1703368e26d852b8bdc8b127b… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Mon Feb 14 19:39:17 2011 -0500 urlmon: Fixed invalid read and write errors (Valgrind). --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index a425212..0a92dad 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6008,7 +6008,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, DWORD new_len = remove_dot_segments(path+offset,path_len-offset); if(new_len != path_len) { - WCHAR *tmp = heap_realloc(path, (path_offset+new_len+1)*sizeof(WCHAR)); + WCHAR *tmp = heap_realloc(path, (offset+new_len+1)*sizeof(WCHAR)); if(!tmp) { heap_free(path); *result = NULL;

1 0

Vincent Povirk : gdiplus: Store an ImageAttributes in texture brushes.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 86d58dc6c8c09976a53b93ee2a77ed499d205db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d58dc6c8c09976a53b93ee2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 14 15:35:47 2011 -0600 gdiplus: Store an ImageAttributes in texture brushes. --- dlls/gdiplus/brush.c | 66 +++++++++++++++++++++++++++++++-------- dlls/gdiplus/gdiplus_private.h | 2 +- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 480d0a3..6cc78e8 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -164,8 +164,14 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) GpStatus stat; GpTexture *texture = (GpTexture*)brush; GpTexture *new_texture; + UINT width, height; - stat = GdipCreateTexture(texture->image, texture->wrap, &new_texture); + stat = GdipGetImageWidth(texture->image, &width); + if (stat != Ok) return stat; + stat = GdipGetImageHeight(texture->image, &height); + if (stat != Ok) return stat; + + stat = GdipCreateTextureIA(texture->image, texture->imageattributes, 0, 0, width, height, &new_texture); if (stat == Ok) { @@ -773,7 +779,7 @@ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, GpTexture **texture) { UINT width, height; - GpImageAttributes attributes; + GpImageAttributes *attributes; GpStatus stat; TRACE("%p, %d %p\n", image, wrapmode, texture); @@ -785,10 +791,20 @@ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, if (stat != Ok) return stat; stat = GdipGetImageHeight(image, &height); if (stat != Ok) return stat; - attributes.wrap = wrapmode; - return GdipCreateTextureIA(image, &attributes, 0, 0, width, height, + stat = GdipCreateImageAttributes(&attributes); + + if (stat == Ok) + { + attributes->wrap = wrapmode; + + stat = GdipCreateTextureIA(image, attributes, 0, 0, width, height, texture); + + GdipDisposeImageAttributes(attributes); + } + + return stat; } /****************************************************************************** @@ -797,14 +813,25 @@ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) { - GpImageAttributes attributes; + GpImageAttributes *attributes; + GpStatus stat; TRACE("%p %d %f %f %f %f %p\n", image, wrapmode, x, y, width, height, texture); - attributes.wrap = wrapmode; - return GdipCreateTextureIA(image, &attributes, x, y, width, height, - texture); + stat = GdipCreateImageAttributes(&attributes); + + if (stat == Ok) + { + attributes->wrap = wrapmode; + + stat = GdipCreateTextureIA(image, attributes, x, y, width, height, + texture); + + GdipDisposeImageAttributes(attributes); + } + + return stat; } /****************************************************************************** @@ -854,16 +881,25 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, goto exit; } + if (imageattr) + { + status = GdipCloneImageAttributes(imageattr, &(*texture)->imageattributes); + } + else + { + status = GdipCreateImageAttributes(&(*texture)->imageattributes); + if (status == Ok) + (*texture)->imageattributes->wrap = WrapModeTile; + } + if (status != Ok) + goto exit; + (*texture)->brush.lb.lbStyle = BS_PATTERN; (*texture)->brush.lb.lbColor = 0; (*texture)->brush.lb.lbHatch = (ULONG_PTR)hbm; (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; - if (imageattr) - (*texture)->wrap = imageattr->wrap; - else - (*texture)->wrap = WrapModeTile; (*texture)->image = new_image; exit: @@ -876,6 +912,7 @@ exit: if (*texture) { GdipDeleteMatrix((*texture)->transform); + GdipDisposeImageAttributes((*texture)->imageattributes); GdipFree(*texture); *texture = NULL; } @@ -984,6 +1021,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); GdipDisposeImage(((GpTexture*)brush)->image); + GdipDisposeImageAttributes(((GpTexture*)brush)->imageattributes); break; default: break; @@ -1277,7 +1315,7 @@ GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture *brush, GpWrapMode *wrapmod if(!brush || !wrapmode) return InvalidParameter; - *wrapmode = brush->wrap; + *wrapmode = brush->imageattributes->wrap; return Ok; } @@ -1757,7 +1795,7 @@ GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture *brush, GpWrapMode wrapmode if(!brush) return InvalidParameter; - brush->wrap = wrapmode; + brush->imageattributes->wrap = wrapmode; return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 7665714..bdfb204 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -215,7 +215,7 @@ struct GpTexture{ GpBrush brush; GpMatrix *transform; GpImage *image; - WrapMode wrap; /* not used yet */ + GpImageAttributes *imageattributes; }; struct GpPath{

1 0

Alexandre Julliard : cabinet: Store folders in a list in memory instead of in a temp file.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: f6ebe3b8b21d5dd6f7edef6aca877448ce14324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ebe3b8b21d5dd6f7edef6ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 14 20:05:46 2011 +0100 cabinet: Store folders in a list in memory instead of in a temp file. --- dlls/cabinet/fci.c | 367 ++++++++++++++++------------------------------------ 1 files changed, 114 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6ebe3b8b21d5dd6f7ede…

1 0

Alexandre Julliard : cabarc: Add support for starting a new folder with a ' +' file name.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: c24cd869cd17d6fc47f74cc7befdb11149762a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24cd869cd17d6fc47f74cc7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 14 17:27:29 2011 +0100 cabarc: Add support for starting a new folder with a '+' file name. --- programs/cabarc/cabarc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 6528d70..2d1de8a 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -549,6 +549,7 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) static int new_cabinet( char *cab_dir ) { + static const WCHAR plusW[] = {'+',0}; WCHAR **file; ERF erf; BOOL ret = FALSE; @@ -573,7 +574,12 @@ static int new_cabinet( char *cab_dir ) fci_write, fci_close, fci_lseek, fci_delete, fci_get_temp, &cab, NULL ); for (file = opt_files; *file; file++) - if (!(ret = add_file_or_directory( fci, *file ))) break; + { + if (!strcmpW( *file, plusW )) + FCIFlushFolder( fci, fci_get_next_cab, fci_status ); + else + if (!(ret = add_file_or_directory( fci, *file ))) break; + } if (ret) {

1 0

Alexandre Julliard : cabarc: Add support for specifying a maximum cabinet file.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 0c1e7ff7c4142d474ebd3dc234d95cd6e01f7639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1e7ff7c4142d474ebd3dc23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 14 17:24:53 2011 +0100 cabarc: Add support for specifying a maximum cabinet file. --- programs/cabarc/cabarc.c | 61 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 13 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 2aeb88e..6528d70 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -63,12 +63,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _A_ARCH 0x20 /* command-line options */ +static int opt_cabinet_size = CB_MAX_DISK; static int opt_cabinet_id; static int opt_compression = tcompTYPE_MSZIP; static int opt_recurse; static int opt_preserve_paths; static int opt_reserve_space; static int opt_verbose; +static char *opt_cab_file; static WCHAR *opt_dest_dir; static WCHAR **opt_files; @@ -106,6 +108,29 @@ static char *strdupWtoA( UINT cp, const WCHAR *str ) return ret; } +/* format a cabinet name by replacing the '*' wildcard by the cabinet id */ +static BOOL format_cab_name( char *dest, int id, const char *name ) +{ + const char *num = strchr( name, '*' ); + int len; + + if (!num) + { + if (id == 1) + { + strcpy( dest, name ); + return TRUE; + } + WINE_MESSAGE( "cabarc: Cabinet name must contain a '*' character\n" ); + return FALSE; + } + len = num - name; + memcpy( dest, name, len ); + len += sprintf( dest + len, "%u", id ); + lstrcpynA( dest + len, num + 1, CB_MAX_CABINET_NAME - len ); + return TRUE; +} + static int CDECL fci_file_placed( CCAB *cab, char *file, LONG size, BOOL continuation, void *ptr ) { if (!continuation && opt_verbose) printf( "adding %s\n", file ); @@ -219,8 +244,7 @@ static BOOL CDECL fci_get_temp( char *name, int size, void *ptr ) static BOOL CDECL fci_get_next_cab( CCAB *cab, ULONG prev_size, void *ptr ) { - WINE_ERR( "shouldn't happen\n" ); - return FALSE; + return format_cab_name( cab->szCab, cab->iCab, opt_cab_file ); } static LONG CDECL fci_status( UINT type, ULONG cb1, ULONG cb2, void *ptr ) @@ -364,14 +388,14 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf } } -static int list_cabinet( char *cab_dir, char *cab_file ) +static int list_cabinet( char *cab_dir ) { ERF erf; int ret = 0; HFDI fdi = FDICreate( cab_alloc, cab_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_lseek, cpuUNKNOWN, &erf ); - if (!FDICopy( fdi, cab_file, cab_dir, 0, list_notify, NULL, NULL )) ret = GetLastError(); + if (!FDICopy( fdi, opt_cab_file, cab_dir, 0, list_notify, NULL, NULL )) ret = GetLastError(); FDIDestroy( fdi ); return ret; } @@ -436,14 +460,14 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION } } -static int extract_cabinet( char *cab_dir, char *cab_file ) +static int extract_cabinet( char *cab_dir ) { ERF erf; int ret = 0; HFDI fdi = FDICreate( cab_alloc, cab_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_lseek, cpuUNKNOWN, &erf ); - if (!FDICopy( fdi, cab_file, cab_dir, 0, extract_notify, NULL, NULL )) ret = GetLastError(); + if (!FDICopy( fdi, opt_cab_file, cab_dir, 0, extract_notify, NULL, NULL )) ret = GetLastError(); FDIDestroy( fdi ); return ret; } @@ -523,7 +547,7 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) return add_file( fci, name ); } -static int new_cabinet( char *cab_dir, char *cab_file ) +static int new_cabinet( char *cab_dir ) { WCHAR **file; ERF erf; @@ -531,7 +555,7 @@ static int new_cabinet( char *cab_dir, char *cab_file ) HFCI fci; CCAB cab; - cab.cb = CB_MAX_DISK; + cab.cb = opt_cabinet_size; cab.cbFolderThresh = CB_MAX_DISK; cab.cbReserveCFHeader = opt_reserve_space; cab.cbReserveCFFolder = 0; @@ -543,7 +567,7 @@ static int new_cabinet( char *cab_dir, char *cab_file ) strcpy( cab.szCabPath, cab_dir ); strcat( cab.szCabPath, "\\" ); - strcpy( cab.szCab, cab_file ); + format_cab_name( cab.szCab, 1, opt_cab_file ); fci = FCICreate( &erf, fci_file_placed, cab_alloc, cab_free,fci_open, fci_read, fci_write, fci_close, fci_lseek, fci_delete, fci_get_temp, &cab, NULL ); @@ -554,7 +578,7 @@ static int new_cabinet( char *cab_dir, char *cab_file ) if (ret) { if (!(ret = FCIFlushCabinet( fci, FALSE, fci_get_next_cab, fci_status ))) - WINE_MESSAGE( "cabarc: Failed to create cabinet %s\n", wine_dbgstr_a(cab_file) ); + WINE_MESSAGE( "cabarc: Failed to create cabinet %s\n", wine_dbgstr_a(opt_cab_file) ); } FCIDestroy( fci ); return !ret; @@ -569,6 +593,7 @@ static void usage( void ) " N Create a new cabinet\n" " X Extract files from the cabinet into dest_dir\n" "\nOptions:\n" + " -d size Set maximum disk size\n" " -h Display this help\n" " -i id Set cabinet id\n" " -m type Set compression type (mszip|none)\n" @@ -592,6 +617,15 @@ int wmain( int argc, WCHAR *argv[] ) { switch (argv[1][1]) { + case 'd': + argv++; argc--; + opt_cabinet_size = atoiW( argv[1] ); + if (opt_cabinet_size < 50000) + { + WINE_MESSAGE( "cabarc: Cabinet size must be at least 50000\n" ); + return 1; + } + break; case 'h': usage(); return 0; @@ -652,15 +686,16 @@ int wmain( int argc, WCHAR *argv[] ) for (p = argv[i]; *p; p++) if (*p == '/') *p = '\\'; opt_files = argv + 1; + opt_cab_file = file_part; switch (*command) { case 'l': case 'L': - return list_cabinet( buffer, file_part ); + return list_cabinet( buffer ); case 'n': case 'N': - return new_cabinet( buffer, file_part ); + return new_cabinet( buffer ); case 'x': case 'X': if (argc > 1) /* check for destination dir as last argument */ @@ -672,7 +707,7 @@ int wmain( int argc, WCHAR *argv[] ) argv[--argc] = NULL; } } - return extract_cabinet( buffer, file_part ); + return extract_cabinet( buffer ); default: usage(); return 1;

1 0