May 2012 - Wine-Commits - list.winehq.org

Detlef Riekenberg : ntdll: Implement RtlGetProductInfo.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 0f4e9ffc22f32affcd6fb92c9e1925883c208de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4e9ffc22f32affcd6fb92c9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed May 30 18:40:33 2012 +0200 ntdll: Implement RtlGetProductInfo. --- dlls/ntdll/version.c | 18 +++++++++++++++--- include/winnt.h | 5 ++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 0185d7f..745ee5d 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -544,7 +544,7 @@ done: } /*********************************************************************** - * GetProductInfo (NTDLL.@) + * RtlGetProductInfo (NTDLL.@) * * Gives info about the current Windows product type, in a format compatible * with the given Windows version @@ -554,10 +554,22 @@ done: BOOLEAN WINAPI RtlGetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD dwSpMajorVersion, DWORD dwSpMinorVersion, PDWORD pdwReturnedProductType) { - FIXME("(%d,%d,%d,%d,%p): stub\n", dwOSMajorVersion, dwOSMinorVersion, + TRACE("(%d, %d, %d, %d, %p)\n", dwOSMajorVersion, dwOSMinorVersion, dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); - *pdwReturnedProductType = PRODUCT_ULTIMATE_N; + if (!pdwReturnedProductType) + return FALSE; + + if (dwOSMajorVersion < 6) + { + *pdwReturnedProductType = PRODUCT_UNDEFINED; + return FALSE; + } + + if (current_version->wProductType == VER_NT_WORKSTATION) + *pdwReturnedProductType = PRODUCT_ULTIMATE_N; + else + *pdwReturnedProductType = PRODUCT_STANDARD_SERVER; return TRUE; } diff --git a/include/winnt.h b/include/winnt.h index 02c92e6..bed2a19 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1976,7 +1976,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define PRODUCT_DATACENTER_SERVER 0x00000008 #define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C #define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027 -#define PRODUCT_SERVER_V 0x00000025 +#define PRODUCT_EMBEDDED 0x00000041 #define PRODUCT_ENTERPRISE 0x00000004 #define PRODUCT_ENTERPRISE_N 0x0000001B #define PRODUCT_ENTERPRISE_SERVER 0x0000000A @@ -1992,8 +1992,11 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT 0x0000001E #define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020 #define PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY 0x0000001F +#define PRODUCT_PROFESSIONAL 0x00000030 +#define PRODUCT_PROFESSIONAL_N 0x00000031 #define PRODUCT_SERVER_FOR_SMALLBUSINESS 0x00000018 #define PRODUCT_SERVER_FOR_SMALLBUSINESS_V 0x00000023 +#define PRODUCT_SERVER_V 0x00000025 #define PRODUCT_SMALLBUSINESS_SERVER 0x00000009 #define PRODUCT_STANDARD_SERVER 0x00000007 #define PRODUCT_STANDARD_SERVER_CORE 0x0000000D

1 0

Stefan Leichter : kernel32: Fix OutputDebugStringA called with NULL pointer .
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 68aa42a4191c50bb9bf2767c51a4b9c7b7aaef5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68aa42a4191c50bb9bf2767c5… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed May 30 22:47:34 2012 +0200 kernel32: Fix OutputDebugStringA called with NULL pointer. --- dlls/kernel32/debugger.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 7e1a860..528ba76 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -245,6 +245,8 @@ void WINAPI OutputDebugStringA( LPCSTR str ) static HANDLE DBWinMutex = NULL; static BOOL mutex_inited = FALSE; + if (!str) str = ""; + /* send string to attached debugger */ SERVER_START_REQ( output_debug_string ) {

1 0

Hans Leidekker : msi: Don' t create empty values for special registry entries.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: e16bcda4862e7df0f266a42630030ad8c393c72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16bcda4862e7df0f266a4263… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 31 10:06:02 2012 +0200 msi: Don't create empty values for special registry entries. --- dlls/msi/action.c | 49 +++++++++++++++++++++++++--------------------- dlls/msi/tests/action.c | 12 ++++++++-- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index efdc79c..ec00886 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2578,6 +2578,11 @@ static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) return strdupW( path ); } +static BOOL is_special_entry( const WCHAR *name, const WCHAR *value ) +{ + return (name && (name[0] == '*' || name[0] == '+') && !name[1] && !value); +} + static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; @@ -2612,10 +2617,8 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) /* null values can have special meanings */ if (name[0]=='-' && name[1] == 0) return ERROR_SUCCESS; - else if ((name[0]=='+' && name[1] == 0) || - (name[0] == '*' && name[1] == 0)) - name = NULL; - check_first = TRUE; + if ((name[0] == '+' || name[0] == '*') && !name[1]) + check_first = TRUE; } root = MSI_RecordGetInteger(row,2); @@ -2652,28 +2655,30 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) } deformat_string(package, name, &deformated); - - if (!check_first) - { - TRACE("Setting value %s of %s\n",debugstr_w(deformated), - debugstr_w(uikey)); - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); - } - else + if (!is_special_entry( name , value )) { - DWORD sz = 0; - rc = RegQueryValueExW(hkey, deformated, NULL, NULL, NULL, &sz); - if (rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) + if (!check_first) { - TRACE("value %s of %s checked already exists\n", - debugstr_w(deformated), debugstr_w(uikey)); + TRACE("Setting value %s of %s\n", debugstr_w(deformated), + debugstr_w(uikey)); + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); } else { - TRACE("Checked and setting value %s of %s\n", - debugstr_w(deformated), debugstr_w(uikey)); - if (deformated || size) - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE) value_data, size); + DWORD sz = 0; + rc = RegQueryValueExW(hkey, deformated, NULL, NULL, NULL, &sz); + if (rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) + { + TRACE("value %s of %s checked already exists\n", debugstr_w(deformated), + debugstr_w(uikey)); + } + else + { + TRACE("Checked and setting value %s of %s\n", debugstr_w(deformated), + debugstr_w(uikey)); + if (deformated || size) + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); + } } } RegCloseKey(hkey); @@ -2773,7 +2778,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para { if (name[0] == '+' && !name[1]) return ERROR_SUCCESS; - else if ((name[0] == '-' && !name[1]) || (name[0] == '*' && !name[1])) + if ((name[0] == '-' || name[0] == '*') && !name[1]) { delete_key = TRUE; name = NULL; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 2b482df..0bd65a0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -487,7 +487,10 @@ static const char wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" - "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus"; + "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus\n" + "regdata1\t2\tSOFTWARE\\Wine\\msitest\t*\t\taugustus\n" + "regdata2\t2\tSOFTWARE\\Wine\\msitest\t*\t#%\taugustus\n" + "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -4572,7 +4575,7 @@ static void test_write_registry_values(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = MAX_PATH; - type = REG_MULTI_SZ; + type = 0xdeadbeef; memset(path, 'a', MAX_PATH); res = RegQueryValueExA(hkey, "Value", NULL, &type, (LPBYTE)path, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4580,9 +4583,12 @@ static void test_write_registry_values(void) ok(size == 15, "Expected 15, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegDeleteValueA(hkey, "Value"); RegCloseKey(hkey); - RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); error: DeleteFile(msifile);

1 0

Józef Kucia : d3dx9: Implement D3DXSaveSurfaceToFileInMemory.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 70b1bff69520c2ba82bb54b12338a76664c9e60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b1bff69520c2ba82bb54b12… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 29 11:29:22 2012 +0200 d3dx9: Implement D3DXSaveSurfaceToFileInMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 2 + dlls/d3dx9_36/surface.c | 96 +++++++++++++++++++++++++++++--------- dlls/d3dx9_36/tests/surface.c | 27 +++++++++++ dlls/d3dx9_36/util.c | 19 ++++++++ include/d3dx9tex.h | 6 ++ 6 files changed, 128 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70b1bff69520c2ba82bb5…

1 0

Huw Davies : winspool: Change get_dword_from_reg to accept a unicode value name.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: b97c5da2cf1a24099fa7f43798000ebf4c3d687b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97c5da2cf1a24099fa7f4379… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 31 13:57:39 2012 +0100 winspool: Change get_dword_from_reg to accept a unicode value name. --- dlls/winspool.drv/info.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f12522b..481bad9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -195,6 +195,7 @@ static const WCHAR Default_DevModeW[] = {'D','e','f','a','u','l','t',' ','D','e' static const WCHAR Default_PriorityW[] = {'D','e','f','a','u','l','t',' ','P','r','i','o','r','i','t','y',0}; static const WCHAR Dependent_FilesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; static const WCHAR DescriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR dnsTimeoutW[] = {'d','n','s','T','i','m','e','o','u','t',0}; static const WCHAR DriverW[] = {'D','r','i','v','e','r',0}; static const WCHAR HardwareIDW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR Help_FileW[] = {'H','e','l','p',' ','F','i','l','e',0}; @@ -218,6 +219,7 @@ static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ', static const WCHAR Share_NameW[] = {'S','h','a','r','e',' ','N','a','m','e',0}; static const WCHAR StartTimeW[] = {'S','t','a','r','t','T','i','m','e',0}; static const WCHAR StatusW[] = {'S','t','a','t','u','s',0}; +static const WCHAR txTimeoutW[] = {'t','x','T','i','m','e','o','u','t',0}; static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; @@ -3358,29 +3360,28 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) } /***************************************************************************** - * WINSPOOL_GetDWORDFromReg + * get_dword_from_reg * - * Return DWORD associated with ValueName from hkey. + * Return DWORD associated with name from hkey. */ -static DWORD WINSPOOL_GetDWORDFromReg(HKEY hkey, LPCSTR ValueName) +static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name ) { DWORD sz = sizeof(DWORD), type, value = 0; LONG ret; - ret = RegQueryValueExA(hkey, ValueName, 0, &type, (LPBYTE)&value, &sz); + ret = RegQueryValueExW( hkey, name, 0, &type, (LPBYTE)&value, &sz ); if(ret != ERROR_SUCCESS) { - WARN("Got ret = %d on name %s\n", ret, ValueName); - return 0; + WARN("Got ret = %d on name %s\n", ret, debugstr_w(name)); + return 0; } if(type != REG_DWORD) { ERR("Got type %d\n", type); - return 0; + return 0; } return value; } - /***************************************************************************** * get_filename_from_reg [internal] * @@ -3770,12 +3771,11 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, *pcbNeeded += size; } if(pi2) { - pi2->Attributes = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Attributes"); - pi2->Priority = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Priority"); - pi2->DefaultPriority = WINSPOOL_GetDWORDFromReg(hkeyPrinter, - "Default Priority"); - pi2->StartTime = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "StartTime"); - pi2->UntilTime = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "UntilTime"); + pi2->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); + pi2->Priority = get_dword_from_reg( hkeyPrinter, PriorityW ); + pi2->DefaultPriority = get_dword_from_reg( hkeyPrinter, Default_PriorityW ); + pi2->StartTime = get_dword_from_reg( hkeyPrinter, StartTimeW ); + pi2->UntilTime = get_dword_from_reg( hkeyPrinter, UntilTimeW ); } if(!space && pi2) /* zero out pi2 if we can't completely fill buf */ @@ -3808,7 +3808,7 @@ static BOOL WINSPOOL_GetPrinter_4(HKEY hkeyPrinter, PRINTER_INFO_4W *pi4, *pcbNeeded += size; } if(pi4) { - pi4->Attributes = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Attributes"); + pi4->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); } if(!space && pi4) /* zero out pi4 if we can't completely fill buf */ @@ -3850,11 +3850,9 @@ static BOOL WINSPOOL_GetPrinter_5(HKEY hkeyPrinter, PRINTER_INFO_5W *pi5, *pcbNeeded += size; } if(pi5) { - pi5->Attributes = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Attributes"); - pi5->DeviceNotSelectedTimeout = WINSPOOL_GetDWORDFromReg(hkeyPrinter, - "dnsTimeout"); - pi5->TransmissionRetryTimeout = WINSPOOL_GetDWORDFromReg(hkeyPrinter, - "txTimeout"); + pi5->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW ); + pi5->DeviceNotSelectedTimeout = get_dword_from_reg( hkeyPrinter, dnsTimeoutW ); + pi5->TransmissionRetryTimeout = get_dword_from_reg( hkeyPrinter, txTimeoutW ); } if(!space && pi5) /* zero out pi5 if we can't completely fill buf */ @@ -4021,7 +4019,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, size = sizeof(PRINTER_INFO_6); if (size <= cbBuf) { /* FIXME: We do not update the status yet */ - pi6->dwStatus = WINSPOOL_GetDWORDFromReg(hkeyPrinter, "Status"); + pi6->dwStatus = get_dword_from_reg( hkeyPrinter, StatusW ); ret = TRUE; } else { ret = FALSE;

1 0

Huw Davies : include: Add a couple of missing printer status values.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: e550cee7ccb7c4cf03203685b785d55e9f6f4c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e550cee7ccb7c4cf03203685b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 31 13:57:38 2012 +0100 include: Add a couple of missing printer status values. --- include/winspool.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index f436bea..4648ec4 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -98,6 +98,8 @@ extern "C" { #define PRINTER_STATUS_DOOR_OPEN 0x00400000 #define PRINTER_STATUS_SERVER_UNKNOWN 0x00800000 #define PRINTER_STATUS_POWER_SAVE 0x01000000 +#define PRINTER_STATUS_SERVER_OFFLINE 0x02000000 +#define PRINTER_STATUS_DRIVER_UPDATE_NEEDED 0x04000000 #define NO_PRIORITY 0 #define MAX_PRIORITY 99

1 0

Jacek Caban : dxgi.idl: Added IDXGIKeyedMutex declaration.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: bbf8c42f6915f1b392052070b12d4c45a60defdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf8c42f6915f1b392052070b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 31 13:19:54 2012 +0200 dxgi.idl: Added IDXGIKeyedMutex declaration. --- include/dxgi.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index e74b525..d87a72c 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -192,6 +192,18 @@ interface IDXGIResource : IDXGIDeviceSubObject [ object, + uuid(9d8e1289-d7b3-465f-8126-250e349af85d), + local, + pointer_default(unique) +] +interface IDXGIKeyedMutex : IDXGIDeviceSubObject +{ + HRESULT AcquireSync([in] UINT64 Key, [in] DWORD dwMilliseconds); + HRESULT ReleaseSync([in] UINT64 Key); +} + +[ + object, local, uuid(cafcb56c-6ac3-4889-bf47-9e23bbd260ec) ]

1 0

Józef Kucia : d3dx9: Forward D3DXSaveTextureToFile to D3DXSaveTextureToFileInMemory.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: dfc5ab140c3211d73239352253ee0f80a960dfd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc5ab140c3211d7323935225… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 29 11:29:23 2012 +0200 d3dx9: Forward D3DXSaveTextureToFile to D3DXSaveTextureToFileInMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 6 ++-- dlls/d3dx9_36/texture.c | 61 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9tex.h | 5 +++ 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 44efaf5..aec2a5c 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -266,9 +266,9 @@ @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stub D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stub D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index c17a327..97d26d9 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1606,3 +1606,64 @@ HRESULT WINAPI D3DXFillVolumeTexture(LPDIRECT3DVOLUMETEXTURE9 texture, return D3D_OK; } + +HRESULT WINAPI D3DXSaveTextureToFileA(const char *dst_filename, D3DXIMAGE_FILEFORMAT file_format, + IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) +{ + int len; + WCHAR *filename; + HRESULT hr; + ID3DXBuffer *buffer; + + TRACE("(%s, %#x, %p, %p): relay\n", + wine_dbgstr_a(dst_filename), file_format, src_texture, src_palette); + + if (!dst_filename) return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, dst_filename, -1, NULL, 0); + filename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, dst_filename, -1, filename, len); + + hr = D3DXSaveTextureToFileInMemory(&buffer, file_format, src_texture, src_palette); + if (SUCCEEDED(hr)) + { + hr = write_buffer_to_file(filename, buffer); + ID3DXBuffer_Release(buffer); + } + + HeapFree(GetProcessHeap(), 0, filename); + return hr; +} + +HRESULT WINAPI D3DXSaveTextureToFileW(const WCHAR *dst_filename, D3DXIMAGE_FILEFORMAT file_format, + IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) +{ + HRESULT hr; + ID3DXBuffer *buffer; + + TRACE("(%s, %#x, %p, %p): relay\n", + wine_dbgstr_w(dst_filename), file_format, src_texture, src_palette); + + if (!dst_filename) return D3DERR_INVALIDCALL; + + hr = D3DXSaveTextureToFileInMemory(&buffer, file_format, src_texture, src_palette); + if (SUCCEEDED(hr)) + { + hr = write_buffer_to_file(dst_filename, buffer); + ID3DXBuffer_Release(buffer); + } + + return hr; +} + +HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE_FILEFORMAT file_format, + IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) +{ + FIXME("(%p, %#x, %p, %p): stub\n", + dst_buffer, file_format, src_texture, src_palette); + + if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL; + + return E_NOTIMPL; +} diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 0e89021..38441ce 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -638,6 +638,11 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 devic PALETTEENTRY *palette, LPDIRECT3DVOLUMETEXTURE9 *volume); +HRESULT WINAPI D3DXSaveTextureToFileInMemory(LPD3DXBUFFER *destbuffer, + D3DXIMAGE_FILEFORMAT destformat, + LPDIRECT3DBASETEXTURE9 srctexture, + CONST PALETTEENTRY *srcpalette); + HRESULT WINAPI D3DXSaveTextureToFileA(LPCSTR destfile, D3DXIMAGE_FILEFORMAT destformat, LPDIRECT3DBASETEXTURE9 srctexture,

1 0

Juan Lang : crypt32/tests: Add more tests of CertCreateSelfSignCertificate and the CERT_KEY_PROV_INFO parameter .
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: ecfa9b87a0c552ffc3146b5314e62768f9a8a5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfa9b87a0c552ffc3146b531… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 18 15:19:31 2012 -0700 crypt32/tests: Add more tests of CertCreateSelfSignCertificate and the CERT_KEY_PROV_INFO parameter. --- dlls/crypt32/tests/cert.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 6e46a57..52d3013 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2138,13 +2138,82 @@ static void testCreateSelfSignCert(void) CRYPT_DELETEKEYSET); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + /* Do the same test with a CSP, AT_KEYEXCHANGE and key info */ + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + ret = CryptGenKey(csp, AT_SIGNATURE, 0, &key); + ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); - /* do the same test with AT_KEYEXCHANGE and key info*/ memset(&info,0,sizeof(info)); info.dwProvType = PROV_RSA_FULL; info.dwKeySpec = AT_KEYEXCHANGE; info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; info.pwszContainerName = cspNameW; + /* This should fail because the CSP doesn't have the specified key. */ + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + ok(context == NULL, "expected failure\n"); + if (context != NULL) + CertFreeCertificateContext(context); + else + todo_wine + ok(GetLastError() == NTE_NO_KEY, "expected NTE_NO_KEY, got %08x\n", + GetLastError()); + /* Again, with a CSP, AT_SIGNATURE and key info */ + info.dwKeySpec = AT_SIGNATURE; + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + todo_wine + ok(context != NULL, + "CertCreateSelfSignCertificate failed: %08x\n", GetLastError()); + if (context) + { + DWORD size = 0; + + /* The context must have a key provider info property */ + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret && size, "Expected non-zero key provider info\n"); + if (size) + { + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) + { + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); + if (ret) + { + /* Sanity-check the key provider */ + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + "Unexpected key container\n"); + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), + "Unexpected provider\n"); + ok(pInfo->dwKeySpec == AT_SIGNATURE, + "Expected AT_SIGNATURE, got %d\n", pInfo->dwKeySpec); + } + HeapFree(GetProcessHeap(), 0, pInfo); + } + } + + CertFreeCertificateContext(context); + } + CryptDestroyKey(key); + + CryptReleaseContext(csp, 0); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + + /* Do the same test with no CSP, AT_KEYEXCHANGE and key info */ + info.dwKeySpec = AT_KEYEXCHANGE; context = pCertCreateSelfSignCertificate(0, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context != NULL, "CertCreateSelfSignCertificate failed: %08x\n",

1 0

Hans Leidekker : msi: Don't terminate the string in msi_id2stringA.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: c959e38625ee3c72310f91e995ffdad19b21e450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c959e38625ee3c72310f91e99… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 31 10:05:14 2012 +0200 msi: Don't terminate the string in msi_id2stringA. This makes sure that the last string can be fully written when saving the string table. --- dlls/msi/string.c | 32 ++++++++------------------------ dlls/msi/tests/db.c | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 4185c15..065c04a 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -357,14 +357,12 @@ const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ) * [in/out] sz - number of bytes available in the buffer on input * number of bytes used on output * - * The size includes the terminating nul character. Short buffers - * will be filled, but not nul terminated. + * Returned string is not nul terminated. */ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) { - UINT len; + UINT len, lenW; const WCHAR *str; - int n; TRACE("Finding string %d of %d\n", id, st->maxcount); @@ -372,26 +370,14 @@ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT if( !str ) return ERROR_FUNCTION_FAILED; - len = WideCharToMultiByte( st->codepage, 0, str, -1, NULL, 0, NULL, NULL ); - - if( !buffer ) + lenW = strlenW( str ); + len = WideCharToMultiByte( st->codepage, 0, str, lenW, NULL, 0, NULL, NULL ); + if( *sz < len ) { *sz = len; - return ERROR_SUCCESS; - } - - if( len > *sz ) - { - n = strlenW( str ) + 1; - while( n && (len > *sz) ) - len = WideCharToMultiByte( st->codepage, 0, - str, --n, NULL, 0, NULL, NULL ); + return ERROR_MORE_DATA; } - else - n = -1; - - *sz = WideCharToMultiByte( st->codepage, 0, str, n, buffer, len, NULL, NULL ); - + *sz = WideCharToMultiByte( st->codepage, 0, str, lenW, buffer, *sz, NULL, NULL ); return ERROR_SUCCESS; } @@ -588,7 +574,7 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt data = msi_alloc( datasize ); if( ! data ) { - WARN("Failed to alloc data %d bytes\n", poolsize ); + WARN("Failed to alloc data %d bytes\n", datasize ); goto err; } @@ -622,8 +608,6 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt ERR("failed to fetch string\n"); sz = 0; } - if( sz && (sz < (datasize - used ) ) ) - sz--; if (sz) pool[ n*2 + 1 ] = st->strings[i].persistent_refcount; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7a2fd7c..8b62c39 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9345,7 +9345,7 @@ static void test_createtable(void) size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + ok(!strcmp(buffer,"b"), "b != %s\n", buffer); res = MsiCloseHandle( hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0