March 2010 - Wine-Commits - list.winehq.org

Christian Costa : d3dx9_36/tests: Fix contant table header in ctab data.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: e6d540d5c8ecf59bbf429b298903eab774be0b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d540d5c8ecf59bbf429b298… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:56:40 2010 +0100 d3dx9_36/tests: Fix contant table header in ctab data. --- dlls/d3dx9_36/tests/shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8a2a5b1..c49d089 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -43,8 +43,8 @@ static const DWORD simple_ps[] = { static const DWORD shader_with_ctab[] = { 0xfffe0300, /* vs_3_0 */ 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ - 0x0006fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ - 0x00000000, + 0x0008fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ + 0x00000000, 0x00000000, 0x00000000, 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ 0x0000ffff}; /* END */ @@ -111,7 +111,7 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); - ok(size == 20, "Got result %d, expected 20\n", size); + ok(size == 28, "Got result %d, expected 28\n", size); } static void test_get_shader_constant_table_ex(void) @@ -139,7 +139,7 @@ static void test_get_shader_constant_table_ex(void) if (constant_table) { size = ID3DXConstantTable_GetBufferSize(constant_table); - ok(size == 20, "Got result %x, expected 20\n", size); + ok(size == 28, "Got result %x, expected 28\n", size); data = ID3DXConstantTable_GetBufferPointer(constant_table); ok(!memcmp(data, shader_with_ctab + 6, size), "Retreived wrong CTAB data\n");

1 0

Vincent Povirk : ole32: Allow CopyTo to succeed in spite of already open source streams.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 8d58a91fa325e77f30c7170fdcda3fcee6a54815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d58a91fa325e77f30c7170fd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 5 11:03:18 2010 -0600 ole32: Allow CopyTo to succeed in spite of already open source streams. --- dlls/ole32/storage32.c | 26 ++++++++++++++++++++++---- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 837365b..f1a98e1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1599,11 +1599,15 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( SNB snbExclude, /* [unique][in] */ IStorage* pstgDest) /* [unique][in] */ { + StorageBaseImpl* const This=(StorageBaseImpl*)iface; + IEnumSTATSTG *elements = 0; STATSTG curElement, strStat; HRESULT hr; IStorage *pstgTmp, *pstgChild; IStream *pstrTmp, *pstrChild; + DirRef srcEntryRef; + DirEntry srcEntry; BOOL skip = FALSE, skip_storage = FALSE, skip_stream = FALSE; int i; @@ -1728,11 +1732,25 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( goto cleanup; /* - * open child stream storage + * open child stream storage. This operation must succeed even if the + * stream is already open, so we use internal functions to do it. */ - hr = IStorage_OpenStream( iface, curElement.pwcsName, NULL, - STGM_READ|STGM_SHARE_EXCLUSIVE, - 0, &pstrChild ); + srcEntryRef = findElement( This, This->storageDirEntry, curElement.pwcsName, + &srcEntry); + if (!srcEntryRef) + { + ERR("source stream not found\n"); + hr = STG_E_DOCFILECORRUPT; + } + + if (hr == S_OK) + { + pstrChild = (IStream*)StgStreamImpl_Construct(This, STGM_READ|STGM_SHARE_EXCLUSIVE, srcEntryRef); + if (pstrChild) + IStream_AddRef(pstrChild); + else + hr = E_OUTOFMEMORY; + } if (hr == S_OK) { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7568a0c..8fa1afd 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2750,7 +2750,7 @@ static void test_copyto_locking(void) /* Try to copy the storage while the stream is open */ r = IStorage_CopyTo(stg2, 0, NULL, NULL, stg3); - todo_wine ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); + ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); IStream_Release(stm);

1 0

Alexandre Julliard : krnl386.exe: Preload gdi and user when thunks are being used.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 60f364068aac6844db6893320b94cc8a9477d089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f364068aac6844db6893320… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 13 17:25:49 2010 +0100 krnl386.exe: Preload gdi and user when thunks are being used. --- dlls/krnl386.exe16/ne_module.c | 7 ++----- dlls/krnl386.exe16/thunk.c | 8 ++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 49b527b..aa1c9c2 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -782,12 +782,9 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; - /* special magic for gdi and user */ - if (!NE_strcasecmp( buffer, "user" )) strcpy( buffer, "USER.EXE" ); - else if (!NE_strcasecmp( buffer, "gdi" )) strcpy( buffer, "GDI.EXE" ); /* Append .DLL to name if no extension present */ - else if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) + strcat( buffer, ".DLL" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) { diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 2f8562c..8b42619 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -272,6 +272,14 @@ static LPVOID _loadthunk(LPCSTR module, LPCSTR func, LPCSTR module32, struct ThunkDataCommon *TD16; HMODULE16 hmod; int ordinal; + static int done; + + if (!done) + { + LoadLibrary16( "gdi.exe" ); + LoadLibrary16( "user.exe" ); + done = TRUE; + } if ((hmod = LoadLibrary16(module)) <= 32) {

1 0

Paul Vriens : msi/tests: Remove a key after running tests.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: e5c182f0dfd0ce14f88918a8dbc1446cd5d3a9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c182f0dfd0ce14f88918a8d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 6 13:53:31 2010 +0100 msi/tests: Remove a key after running tests. --- dlls/msi/tests/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 62d1ef6..23b4564 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -8171,6 +8171,8 @@ static void test_feature_override(void) ok(delete_pf("msitest", FALSE), "File not installed\n"); delete_test_files(); + + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest"); } static void test_create_folder(void)

1 0

Christian Costa : d3dxof: Fix tzip and bzip files tests on all windows platform.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 41fdff866de917f2c0e9a096cabb5633c161ac5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fdff866de917f2c0e9a096c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 8 08:55:52 2010 +0100 d3dxof: Fix tzip and bzip files tests on all windows platform. --- dlls/d3dxof/tests/d3dxof.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 1198229..b630ae4 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -55,8 +55,15 @@ char object[] = char empty_txt_file[] = "xof 0302txt 0064"; char empty_bin_file[] = "xof 0302bin 0064"; -char empty_tzip_file[] = "xof 0302tzip0064"; -char empty_bzip_file[] = "xof 0302bzip0064"; +/* MSZip data is generated with the command "MAKECAB.EXE /D Compress=ON /D CompressionType=MSZip file packed" + * Data in cab is after the filename (null terminated) and the 32-bit checksum: + * size (16-bit), packed_size (16-bit) and compressed data (with leading 16-bit CK signature) + * Data in x files is preceding by 2 16-bit words: size with xof header (16 bytes) and a 0 value + * It does not seem possible to generate a MSZip data with no byte, so put just 1 byte here */ +/* "\n" packed with MSZip => not text */ +char empty_tzip_file[] = "xof 0302tzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; +/* "\n" packed with MSZip => not token (token are 16-bit and there is only 1 byte) */ +char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; char empty_cmp_file[] = "xof 0302cmp 0064"; char empty_xxxx_file[] = "xof 0302xxxx0064"; @@ -224,11 +231,11 @@ static void test_file_types(void) hr = IDirectXFile_RegisterTemplates(dxfile, empty_bin_file, strlen(empty_bin_file)); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_RegisterTemplates(dxfile, empty_tzip_file, strlen(empty_tzip_file)); - ok(hr == DXFILEERR_BADALLOC, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + hr = IDirectXFile_RegisterTemplates(dxfile, empty_tzip_file, sizeof(empty_tzip_file) - 1); + todo_wine ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_RegisterTemplates(dxfile, empty_bzip_file, strlen(empty_bzip_file)); - ok(hr == DXFILEERR_BADALLOC, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + hr = IDirectXFile_RegisterTemplates(dxfile, empty_bzip_file, sizeof(empty_bzip_file) - 1); + todo_wine ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_cmp_file, strlen(empty_cmp_file)); ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); @@ -249,14 +256,16 @@ static void test_file_types(void) if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_tzip_file; - lminfo.dSize = strlen(empty_tzip_file); + lminfo.dSize = sizeof(empty_tzip_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILEERR_BADALLOC, "IDirectXFile_CreateEnumObject: %x\n", hr); + todo_wine ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_bzip_file; - lminfo.dSize = strlen(empty_bzip_file); + lminfo.dSize = sizeof(empty_bzip_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILEERR_BADALLOC, "IDirectXFile_CreateEnumObject: %x\n", hr); + todo_wine ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_cmp_file; lminfo.dSize = strlen(empty_cmp_file);

1 0

Alexandre Julliard : makefiles: Don't recurse for the testclean target.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 8e9f7a30b62165c906869a671ce3ffb0fa72cbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9f7a30b62165c906869a671… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 13 18:44:58 2010 +0100 makefiles: Don't recurse for the testclean target. --- Makefile.in | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index d93ea81..fbc38ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -148,15 +148,13 @@ $(ALL_TEST_DIRS:%=%/__test__): dummy $(ALL_TEST_DIRS:%=%/__crosstest__): dummy @cd `dirname $@` && $(MAKE) crosstest -$(ALL_TEST_DIRS:%=%/__testclean__): dummy - @cd `dirname $@` && $(MAKE) testclean - check test:: $(ALL_TEST_DIRS:%=%/__test__) crosstest:: $(ALL_TEST_DIRS:%=%/__crosstest__) -testclean:: $(ALL_TEST_DIRS:%=%/__testclean__) -.PHONY: check test testclean crosstest $(ALL_TEST_DIRS:%=%/__test__) \ - $(ALL_TEST_DIRS:%=%/__crosstest__) $(ALL_TEST_DIRS:%=%/__testclean__) +testclean:: + $(RM) $(ALL_TEST_DIRS:%=%/*.ok) + +.PHONY: check test testclean crosstest $(ALL_TEST_DIRS:%=%/__test__) $(ALL_TEST_DIRS:%=%/__crosstest__) # Rules for auto documentation @@ -230,7 +228,6 @@ RECURSE_TARGETS = \ __instal-dev__ \ __install-lib__ \ __uninstall__ \ - __testclean__ \ __crosstest__ $(MAKEDEP): include/config.h tools/Makefile

1 0

Henry Kroll III : notepad: Don't prompt to save empty Untitled file.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: d3369086ed34bc8147ceed6a2e2d3a4e0ec7d775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3369086ed34bc8147ceed6a2… Author: Henry Kroll III <henry(a)comptune.com> Date: Sat Mar 6 21:05:21 2010 -0800 notepad: Don't prompt to save empty Untitled file. --- programs/notepad/dialog.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 45d0c75..e19e4d6 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -297,7 +297,9 @@ BOOL DoCloseFile(void) int nResult; static const WCHAR empty_strW[] = { 0 }; - if (SendMessageW(Globals.hEdit, EM_GETMODIFY, 0, 0)) + nResult=GetWindowTextLengthW(Globals.hEdit); + if (SendMessageW(Globals.hEdit, EM_GETMODIFY, 0, 0) && + (nResult || Globals.szFileName[0])) { /* prompt user to save changes */ nResult = AlertFileNotSaved(Globals.szFileName);

1 0

Alexandre Julliard : kernel32: Abstract the key creation routine and move the key existence check to the top-level function .
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 2bb93d39be49a78f6919879bacd78f60fa5efb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb93d39be49a78f6919879ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 13 19:24:46 2010 +0100 kernel32: Abstract the key creation routine and move the key existence check to the top-level function. --- dlls/kernel32/oldconfig.c | 112 +++++++++++++------------------------------- 1 files changed, 33 insertions(+), 79 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index c77e7b2..02dac06 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -55,6 +55,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); +static NTSTATUS create_key( HANDLE root, const char *name, HANDLE *key, DWORD *disp ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + NTSTATUS status; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!RtlCreateUnicodeStringFromAsciiz( &nameW, name )) return STATUS_NO_MEMORY; + status = NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, disp ); + if (status) ERR("Cannot create %s registry key\n", name ); + RtlFreeUnicodeString( &nameW ); + return status; +} + /****************************************************************** * create_scsi_entry * @@ -69,7 +89,6 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD static UCHAR uCdromNumber = 0; static UCHAR uTapeNumber = 0; - OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR dataW[50]; DWORD sizeW; @@ -83,52 +102,14 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD HANDLE lunKey; DWORD disp; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE" ) || - NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create HARDWARE registry key\n" ); - return; - } - NtClose( scsiKey ); - RtlFreeUnicodeString( &nameW ); - if (disp == REG_OPENED_EXISTING_KEY) return; - - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE\\DEVICEMAP" ) || - NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP registry key\n" ); - return; - } + if (create_key( 0, "Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; NtClose( scsiKey ); - RtlFreeUnicodeString( &nameW ); /* Ensure there is Scsi key */ - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE\\DEVICEMAP\\Scsi" ) || - NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, - NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP\\Scsi registry key\n" ); - return; - } - RtlFreeUnicodeString( &nameW ); + if (create_key( 0, "Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; snprintf(buffer,sizeof(buffer),"Scsi Port %d",scsi_addr->PortNumber); - attr.RootDirectory = scsiKey; - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, buffer ) || - NtCreateKey( &portKey, KEY_ALL_ACCESS, &attr, 0, - NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP\\Scsi Port registry key\n" ); - return; - } - RtlFreeUnicodeString( &nameW ); + if (create_key( scsiKey, buffer, &portKey, &disp )) return; RtlCreateUnicodeStringFromAsciiz( &nameW, "Driver" ); RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriver, strlen(lpDriver)+1); @@ -158,49 +139,17 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD } snprintf(buffer, sizeof(buffer),"Scsi Bus %d", scsi_addr->PathId); - attr.RootDirectory = portKey; - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, buffer ) || - NtCreateKey( &busKey, KEY_ALL_ACCESS, &attr, 0, - NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP\\Scsi Port\\Scsi Bus registry key\n" ); - return; - } - RtlFreeUnicodeString( &nameW ); + if (create_key( portKey, buffer, &busKey, &disp )) return; - attr.RootDirectory = busKey; /* FIXME: get real controller Id for SCSI */ - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Initiator Id 255" ) || - NtCreateKey( &targetKey, KEY_ALL_ACCESS, &attr, 0, - NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP\\Scsi Port\\Scsi Bus\\Initiator Id 255 registry key\n" ); - return; - } - RtlFreeUnicodeString( &nameW ); + if (create_key( busKey, buffer, &targetKey, &disp )) return; NtClose( targetKey ); snprintf(buffer, sizeof(buffer),"Target Id %d", scsi_addr->TargetId); - attr.RootDirectory = busKey; - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, buffer ) || - NtCreateKey( &targetKey, KEY_ALL_ACCESS, &attr, 0, - NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP\\Scsi Port\\Scsi Bus 0\\Target Id registry key\n" ); - return; - } - RtlFreeUnicodeString( &nameW ); + if (create_key( busKey, buffer, &targetKey, &disp )) return; snprintf(buffer, sizeof(buffer),"Logical Unit Id %d", scsi_addr->Lun); - attr.RootDirectory = targetKey; - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, buffer ) || - NtCreateKey( &lunKey, KEY_ALL_ACCESS, &attr, 0, - NULL, REG_OPTION_VOLATILE, &disp )) - { - ERR("Cannot create DEVICEMAP\\Scsi Port\\Scsi Bus 0\\Target Id registry key\\Logical Unit Id\n" ); - return; - } - RtlFreeUnicodeString( &nameW ); + if (create_key( targetKey, buffer, &lunKey, &disp )) return; switch (uDriveType) { @@ -445,6 +394,11 @@ static void create_hardware_branch(void) */ void convert_old_config(void) { + HANDLE key; + DWORD disp; + /* create some hardware keys (FIXME: should not be done here) */ - create_hardware_branch(); + if (create_key( 0, "Machine\\HARDWARE", &key, &disp )) return; + NtClose( key ); + if (disp != REG_OPENED_EXISTING_KEY) create_hardware_branch(); }

1 0

Alexander Nicolaysen Sørnes : bug: Fix email text when processing links from version pages
by Alexander Nicolaysen Sørnes March 14, 2010

March 14, 2010

Module: appdb Branch: master Commit: 9c9b4e6929a3302cce8202e1a6551dabf1b9faff URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9c9b4e6929a3302cce8202e1… Author: Alexander Nicolaysen Sørnes <alexander(a)227.(none)> Date: Sat Mar 13 00:18:05 2010 +0100 bug: Fix email text when processing links from version pages --- include/bugs.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index b07a3ca..c2447bb 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -691,7 +691,8 @@ class Bug function getOutputEditorValues($aClean) { - $this->iBug_id = $aClean['iBuglinkId']; + if(getInput('iBuglinkId', $aClean)) + $this->iBug_id = $aClean['iBuglinkId']; if($aClean['iVersionId']) $this->iVersionId = $aClean['iVersionId'];

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.40
by Jeremy Newman March 8, 2010

March 8, 2010

Module: website Branch: master Commit: e23584645b3a25478696cf9fea2edf0d025b068b URL: http://source.winehq.org/git/website.git/?a=commit;h=e23584645b3a25478696cf… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Mar 5 19:57:12 2010 +0100 Polish translation for release 1.1.40 --- news/pl/2010030501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2010030501.xml b/news/pl/2010030501.xml new file mode 100644 index 0000000..5521c1e --- /dev/null +++ b/news/pl/2010030501.xml @@ -0,0 +1,18 @@ +<news> +<date>Marzec 5, 2010</date> +<title>Wydano Wine 1.1.40</title> +<body> + Wydanie rozwojowe Wine 1.1.40 jest już dostępne. + <a href="{$root}/announce/1.1.40">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla przekierowywania rejestru dla Wow64.</li> + <li>Zwiększone ilości standardowych akcji MSI.</li> + <li>Rozmaite ulepszenia w Wordpadzie.</li> + <li>Wiele poprawek do powłoki dla lepszego wsparcia IE.</li> + <li>Ulepszone wsparcie dla typelibs.</li> + <li>Lepsze wykrywanie kart graficznych.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.40.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0