January 2007 - Wine-commits

Francois Gouget : rpcrt4: Give a proper name to some formerly reserved MIDL_STUB_MESSAGE fields.
by Alexandre Julliard 11 Jan '07

11 Jan '07

Module: wine Branch: master Commit: fa7c32f56c038af5e5c569e9cd257913a732dc1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7c32f56c038af5e5c569e9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 10 16:28:20 2007 +0100 rpcrt4: Give a proper name to some formerly reserved MIDL_STUB_MESSAGE fields. Define NTDDI_VERSION so we get definitions for the Reserved51_X fields with the PSDK. This fixes compilation of the ndr_marshall.c with the PSDK. --- dlls/rpcrt4/tests/ndr_marshall.c | 7 +++++-- include/rpcndr.h | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index c625e26..4a5566f 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -20,6 +20,9 @@ #include <stdarg.h> +#define NTDDI_WIN2K 0x05000000 +#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ + #include "wine/test.h" #include <windef.h> #include <winbase.h> @@ -892,8 +895,8 @@ static void test_client_init(void) TEST_POINTER_UNSET(VarianceMark); ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused); TEST_POINTER_UNSET(pContext); - TEST_ULONG_UNSET(Reserved51_1); - TEST_ULONG_UNSET(Reserved51_2); + TEST_POINTER_UNSET(ContextHandleHash); + TEST_POINTER_UNSET(pUserMarshalList); TEST_ULONG_UNSET(Reserved51_3); TEST_ULONG_UNSET(Reserved51_4); TEST_ULONG_UNSET(Reserved51_5); diff --git a/include/rpcndr.h b/include/rpcndr.h index 01beba2..126091b 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -222,10 +222,10 @@ typedef struct _MIDL_STUB_MESSAGE CS_STUB_INFO *pCSInfo; unsigned char *ConformanceMark; unsigned char *VarianceMark; - INT_PTR Unused; + INT_PTR Unused; /* BackingStoreLowMark on IA64 */ struct _NDR_PROC_CONTEXT *pContext; - INT_PTR Reserved51_1; - INT_PTR Reserved51_2; + void* ContextHandleHash; + void* pUserMarshalList; INT_PTR Reserved51_3; INT_PTR Reserved51_4; INT_PTR Reserved51_5;

1 0

Louis Lenders : user32: Update Dutch resources.
by Alexandre Julliard 11 Jan '07

11 Jan '07

Module: wine Branch: master Commit: 4662079cd5a6002ed03e4e9bf8584a3666fb2285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4662079cd5a6002ed03e4e9bf… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jan 10 20:57:59 2007 +0000 user32: Update Dutch resources. --- dlls/user32/resources/user32_Nl.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/user32/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc index 411568a..e183083 100644 --- a/dlls/user32/resources/user32_Nl.rc +++ b/dlls/user32/resources/user32_Nl.rc @@ -63,3 +63,19 @@ BEGIN PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Venster selecteren" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 120, 100, 35, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "Fout" + IDS_MDI_MOREWINDOWS "Ov&erige vensters..." +}

1 0

Louis Lenders : comdlg32: Update Dutch resources.
by Alexandre Julliard 11 Jan '07

11 Jan '07

Module: wine Branch: master Commit: 22d6a19d16c8f170535d980bf7bd60548959cb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d6a19d16c8f170535d980bf… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jan 10 20:59:50 2007 +0000 comdlg32: Update Dutch resources. --- dlls/comdlg32/cdlg_Nl.rc | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 5f61d48..68609df 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -283,7 +283,40 @@ FONT 8, "MS Shell Dlg" RTEXT "&t/m:", stc3, 100,124, 16,8 } +STRINGTABLE DISCARDABLE +{ + IDS_ABOUTBOX "&Info over FolderPicker" + IDS_DOCUMENTFOLDERS "Documenten Mappen" + IDS_PERSONAL "Mijn Documenten" + IDS_FAVORITES "Mijn Favorieten" + IDS_PATH "Systeem Pad" + IDS_DESKTOP "Bureaublad" + IDS_FONTS "Lettertype" + IDS_MYCOMPUTER "Deze Computer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SYSTEMFOLDERS "Systeem mappen" + IDS_LOCALHARDRIVES "Lokale vaste schijven" + IDS_FILENOTFOUND "Bestand niet gevonden" + IDS_VERIFYFILE "Controleer of de juiste bestandnaam is opgegeven" + IDS_CREATEFILE "Dit bestand bestaat nog niet\nWilt u het bestand aanmaken?" + IDS_OVERWRITEFILE "Bestand bestaat al.\nWilt u het vervangen?" + IDS_INVALID_FILENAME_TITLE "De naam van het pad bevat ongeldige tekens" + IDS_INVALID_FILENAME "De volgende tekens mogen niet in de bestandsnaam voorkomen:\n / : < > |" + IDS_PATHNOTEXISTING "Het pad bestaat niet" + IDS_FILENOTEXISTING "Kan het bestand niet vinden" +} +STRINGTABLE DISCARDABLE +{ + IDS_UPFOLDER "Bovenliggende map" + IDS_NEWFOLDER "Nieuwe map aanmaken" + IDS_LISTVIEW "Lijst" + IDS_REPORTVIEW "Details" + IDS_TODESKTOP "Ga naar Bureaublad" +} STRINGTABLE DISCARDABLE {

1 0

Louis Lenders : clock: Update Dutch resource.
by Alexandre Julliard 11 Jan '07

11 Jan '07

Module: wine Branch: master Commit: 38c1551762e862b2548d49d094151a707fea6257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c1551762e862b2548d49d09… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jan 11 08:08:47 2007 +0000 clock: Update Dutch resource. --- programs/clock/Nl.rc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/clock/Nl.rc b/programs/clock/Nl.rc index e9c65b0..cdb7d43 100644 --- a/programs/clock/Nl.rc +++ b/programs/clock/Nl.rc @@ -42,6 +42,31 @@ MAIN_MENU MENU } } +STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "LICENTIE" +IDS_LICENSE, +"Dit is vrij beschikbare software; u kunt dit verspreiden en/of \ +aanpassen onder de voorwaarden van de GNU Lesser General Public \ +License zoals gepubliceerd door de Free Software Foundation; zowel \ +versie 2.1 van de Licentie, of een latere versie.\n\ +Deze software wordt verspreid in de hoop dat het bruikbaar is, \ +maar ZONDER ENIGE GARANTIE; zonder zelfs een impliciete garantie van \ +VERKOOPBAARHEID of GESCHIKHEID VOOR PARTICULIERE DOELEINDEN. Zie de GNU \ +Lesser General Public License voor meer details.\n\ +U heeft een kopie van de GNU Lesser General Public \ +License ontvangen samen met dit programma; zoniet, schrijf dan naar de \ +Free Software Foundation, 51 Franklin St, Fifth Floor, \ +Boston, MA 02110-1301 USA" + +IDS_WARRANTY_CAPTION, "GEEN GARANTIE" +IDS_WARRANTY, +"Deze software wordt verspreid in de hoop dat het bruikbaar is, \ +maar ZONDER ENIGE GARANTIE; zonder zelfs een impliciete garantie van \ +VERKOOPBAARHEID of GESCHIKHEID VOOR PARTICULIERE DOELEINDEN. Zie de GNU \ +Lesser General Public License voor meer details." +} + STRINGTABLE DISCARDABLE { IDS_CLOCK, "Klok"

1 0

Andrew Talbot : kernel32: Declare some functions static.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: e994f88cc2a9a732687e9d0bfb6c91e2e66c500e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e994f88cc2a9a732687e9d0bf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 10 18:28:25 2007 +0000 kernel32: Declare some functions static. --- dlls/kernel32/resource.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index dd4739a..fdf06a7 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -649,7 +649,7 @@ struct resource_data { BYTE data[1]; }; -int resource_strcmp( LPCWSTR a, LPCWSTR b ) +static int resource_strcmp( LPCWSTR a, LPCWSTR b ) { if ( a == b ) return 0; @@ -663,7 +663,7 @@ int resource_strcmp( LPCWSTR a, LPCWSTR return ( a < b ) ? -1 : 1; } -struct resource_dir_entry *find_resource_dir_entry( struct list *dir, LPCWSTR id ) +static struct resource_dir_entry *find_resource_dir_entry( struct list *dir, LPCWSTR id ) { struct resource_dir_entry *ent; @@ -675,7 +675,7 @@ struct resource_dir_entry *find_resource return NULL; } -struct resource_data *find_resource_data( struct list *dir, LANGID lang ) +static struct resource_data *find_resource_data( struct list *dir, LANGID lang ) { struct resource_data *res_data; @@ -687,7 +687,7 @@ struct resource_data *find_resource_data return NULL; } -void add_resource_dir_entry( struct list *dir, struct resource_dir_entry *resdir ) +static void add_resource_dir_entry( struct list *dir, struct resource_dir_entry *resdir ) { struct resource_dir_entry *ent; @@ -702,7 +702,7 @@ void add_resource_dir_entry( struct list list_add_tail( dir, &resdir->entry ); } -void add_resource_data_entry( struct list *dir, struct resource_data *resdata ) +static void add_resource_data_entry( struct list *dir, struct resource_data *resdata ) { struct resource_data *ent; @@ -717,7 +717,7 @@ void add_resource_data_entry( struct lis list_add_tail( dir, &resdata->entry ); } -LPWSTR res_strdupW( LPCWSTR str ) +static LPWSTR res_strdupW( LPCWSTR str ) { LPWSTR ret; UINT len; @@ -730,14 +730,14 @@ LPWSTR res_strdupW( LPCWSTR str ) return ret; } -void res_free_str( LPWSTR str ) +static void res_free_str( LPWSTR str ) { if (HIWORD(str)) HeapFree( GetProcessHeap(), 0, str ); } -BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, - WORD Language, DWORD codepage, LPCVOID lpData, DWORD cbData ) +static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, + WORD Language, DWORD codepage, LPCVOID lpData, DWORD cbData ) { struct resource_dir_entry *restype, *resname; struct resource_data *resdata; @@ -787,7 +787,7 @@ BOOL update_add_resource( QUEUEDUPDATES return TRUE; } -void free_resource_directory( struct list *head, int level ) +static void free_resource_directory( struct list *head, int level ) { struct list *ptr = NULL; @@ -813,7 +813,7 @@ void free_resource_directory( struct lis } } -IMAGE_NT_HEADERS *get_nt_header( void *base, DWORD mapping_size ) +static IMAGE_NT_HEADERS *get_nt_header( void *base, DWORD mapping_size ) { IMAGE_NT_HEADERS *nt; IMAGE_DOS_HEADER *dos; @@ -836,7 +836,7 @@ IMAGE_NT_HEADERS *get_nt_header( void *b return nt; } -IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, DWORD *num_sections ) +static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, DWORD *num_sections ) { IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER *sec; @@ -964,7 +964,7 @@ static void get_resource_sizes( QUEUEDUP si->strings_ofs, si->data_ofs, si->total_size); } -void res_write_padding( BYTE *res_base, DWORD size ) +static void res_write_padding( BYTE *res_base, DWORD size ) { static const BYTE pad[] = { 'P','A','D','D','I','N','G','X','X','P','A','D','D','I','N','G' }; @@ -975,7 +975,7 @@ void res_write_padding( BYTE *res_base, memcpy( &res_base[i*sizeof pad], pad, size%sizeof pad ); } -BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resource_size_info *si, DWORD rva ) +static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resource_size_info *si, DWORD rva ) { struct resource_dir_entry *types, *names; struct resource_data *data; @@ -1113,7 +1113,7 @@ BOOL write_resources( QUEUEDUPDATES *upd * header, how would that work? * Seems that at least some of these cases can't be handled properly. */ -IMAGE_SECTION_HEADER *get_resource_section( void *base, DWORD mapping_size ) +static IMAGE_SECTION_HEADER *get_resource_section( void *base, DWORD mapping_size ) { IMAGE_SECTION_HEADER *sec; IMAGE_NT_HEADERS *nt; @@ -1148,7 +1148,7 @@ IMAGE_SECTION_HEADER *get_resource_secti return &sec[i]; } -DWORD get_init_data_size( void *base, DWORD mapping_size ) +static DWORD get_init_data_size( void *base, DWORD mapping_size ) { DWORD i, sz = 0, num_sections = 0; IMAGE_SECTION_HEADER *s;

1 0

Rob Shearman : wininet: Don' t try to read anything if 0 bytes are to be read.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 392ceba61f36fa4b2006a83194e9a0ca66160071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392ceba61f36fa4b2006a8319… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 10 09:30:22 2007 -0600 wininet: Don't try to read anything if 0 bytes are to be read. --- dlls/wininet/netconnection.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8a4c72b..2418b97 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -498,6 +498,11 @@ BOOL NETCON_recv(WININET_NETCONNECTION * int *recvd /* out */) { if (!NETCON_connected(connection)) return FALSE; + if (!len) + { + *recvd = 0; + return TRUE; + } if (!connection->useSSL) { *recvd = recv(connection->socketFD, buf, len, flags);

1 0

Andrew Talbot : itss: Declare a function static.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 852ae99662f3f7e6cbb050936c270991ea725f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=852ae99662f3f7e6cbb050936… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 10 15:22:39 2007 +0000 itss: Declare a function static. --- dlls/itss/chm_lib.c | 147 ++++++++++++++++++++++++++------------------------- dlls/itss/chm_lib.h | 6 -- 2 files changed, 74 insertions(+), 79 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 33420e5..438bbe4 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -76,6 +76,7 @@ #ifndef CHM_MAX_BLOCKS_CACHED #define CHM_MAX_BLOCKS_CACHED 5 #endif +#define CHM_PARAM_MAX_BLOCKS_CACHED 0 /* * architecture specific defines @@ -599,6 +600,79 @@ static Int64 _chm_fetch_bytes(struct chm return readLen; } +/* + * set a parameter on the file handle. + * valid parameter types: + * CHM_PARAM_MAX_BLOCKS_CACHED: + * how many decompressed blocks should be cached? A simple + * caching scheme is used, wherein the index of the block is + * used as a hash value, and hash collision results in the + * invalidation of the previously cached block. + */ +static void chm_set_param(struct chmFile *h, + int paramType, + int paramVal) +{ + switch (paramType) + { + case CHM_PARAM_MAX_BLOCKS_CACHED: + CHM_ACQUIRE_LOCK(h->cache_mutex); + if (paramVal != h->cache_num_blocks) + { + UChar **newBlocks; + Int64 *newIndices; + int i; + + /* allocate new cached blocks */ + newBlocks = malloc(paramVal * sizeof (UChar *)); + newIndices = malloc(paramVal * sizeof (UInt64)); + for (i=0; i<paramVal; i++) + { + newBlocks[i] = NULL; + newIndices[i] = 0; + } + + /* re-distribute old cached blocks */ + if (h->cache_blocks) + { + for (i=0; i<h->cache_num_blocks; i++) + { + int newSlot = (int)(h->cache_block_indices[i] % paramVal); + + if (h->cache_blocks[i]) + { + /* in case of collision, destroy newcomer */ + if (newBlocks[newSlot]) + { + free(h->cache_blocks[i]); + h->cache_blocks[i] = NULL; + } + else + { + newBlocks[newSlot] = h->cache_blocks[i]; + newIndices[newSlot] = + h->cache_block_indices[i]; + } + } + } + + free(h->cache_blocks); + free(h->cache_block_indices); + } + + /* now, set new values */ + h->cache_blocks = newBlocks; + h->cache_block_indices = newIndices; + h->cache_num_blocks = paramVal; + } + CHM_RELEASE_LOCK(h->cache_mutex); + break; + + default: + break; + } +} + /* open an ITS archive */ struct chmFile *chm_openW(const WCHAR *filename) { @@ -813,79 +887,6 @@ void chm_close(struct chmFile *h) } /* - * set a parameter on the file handle. - * valid parameter types: - * CHM_PARAM_MAX_BLOCKS_CACHED: - * how many decompressed blocks should be cached? A simple - * caching scheme is used, wherein the index of the block is - * used as a hash value, and hash collision results in the - * invalidation of the previously cached block. - */ -void chm_set_param(struct chmFile *h, - int paramType, - int paramVal) -{ - switch (paramType) - { - case CHM_PARAM_MAX_BLOCKS_CACHED: - CHM_ACQUIRE_LOCK(h->cache_mutex); - if (paramVal != h->cache_num_blocks) - { - UChar **newBlocks; - Int64 *newIndices; - int i; - - /* allocate new cached blocks */ - newBlocks = malloc(paramVal * sizeof (UChar *)); - newIndices = malloc(paramVal * sizeof (UInt64)); - for (i=0; i<paramVal; i++) - { - newBlocks[i] = NULL; - newIndices[i] = 0; - } - - /* re-distribute old cached blocks */ - if (h->cache_blocks) - { - for (i=0; i<h->cache_num_blocks; i++) - { - int newSlot = (int)(h->cache_block_indices[i] % paramVal); - - if (h->cache_blocks[i]) - { - /* in case of collision, destroy newcomer */ - if (newBlocks[newSlot]) - { - free(h->cache_blocks[i]); - h->cache_blocks[i] = NULL; - } - else - { - newBlocks[newSlot] = h->cache_blocks[i]; - newIndices[newSlot] = - h->cache_block_indices[i]; - } - } - } - - free(h->cache_blocks); - free(h->cache_block_indices); - } - - /* now, set new values */ - h->cache_blocks = newBlocks; - h->cache_block_indices = newIndices; - h->cache_num_blocks = paramVal; - } - CHM_RELEASE_LOCK(h->cache_mutex); - break; - - default: - break; - } -} - -/* * helper methods for chm_resolve_object */ diff --git a/dlls/itss/chm_lib.h b/dlls/itss/chm_lib.h index 57b75d8..0413fe3 100644 --- a/dlls/itss/chm_lib.h +++ b/dlls/itss/chm_lib.h @@ -68,12 +68,6 @@ struct chmFile* chm_openW(const WCHAR *f /* close an ITS archive */ void chm_close(struct chmFile *h); -/* methods for ssetting tuning parameters for particular file */ -#define CHM_PARAM_MAX_BLOCKS_CACHED 0 -void chm_set_param(struct chmFile *h, - int paramType, - int paramVal); - /* resolve a particular object from the archive */ #define CHM_RESOLVE_SUCCESS (0) #define CHM_RESOLVE_FAILURE (1)

1 0

Andrew Talbot : imaadp32.acm: Remove unused function.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 39e6c8c9b67adf955578294cd17ee89c30c83aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e6c8c9b67adf955578294cd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 10 15:21:06 2007 +0000 imaadp32.acm: Remove unused function. --- dlls/imaadp32.acm/imaadp32.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 180c664..a5f2493 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -770,17 +770,6 @@ static LRESULT ADPCM_StreamClose(PACMDRV } /*********************************************************************** - * ADPCM_round - * - */ -static inline DWORD ADPCM_round(DWORD a, DWORD b, DWORD c) -{ - assert(a && b && c); - /* to be sure, always return an entire number of c... */ - return ((double)a * (double)b + (double)c - 1) / (double)c; -} - -/*********************************************************************** * ADPCM_StreamSize * */

1 0

Harry McNally : ntdll: Add Western Australia Summer Time.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: ca2c987caf45eed5fac34dcb42980fdf027f6af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2c987caf45eed5fac34dcb4… Author: Harry McNally <harrymc(a)decisions-and-designs.com.au> Date: Wed Jan 10 20:49:53 2007 +0900 ntdll: Add Western Australia Summer Time. --- dlls/ntdll/time.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 54d4adc..418cf2e 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -320,6 +320,9 @@ static const struct tagTZ_INFO TZ_INFO[] {"WST", {'W','.',' ','A','u','s','t','r','a','l','i','a',' ','S','t','a','n','d', 'a','r','d',' ','T','i','m','e','\0'}, -480, 0}, + {"WST", + {'W','.',' ','A','u','s','t','r','a','l','i','a',' ','S','u','m','m','e', + 'r',' ','T','i','m','e','\0'}, -540, 1}, {"JST", {'T','o','k','y','o',' ','S','t','a','n','d','a','r','d',' ','T','i','m', 'e','\0'}, -540, 0},

1 0

Francois Gouget : wine.inf: We cannot create fake dlls for 16bit libraries. So remove ddeml.dll.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: d9279fcda4fb56529d4ad9004924938e4e7c1fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9279fcda4fb56529d4ad9004… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 10 16:21:45 2007 +0100 wine.inf: We cannot create fake dlls for 16bit libraries. So remove ddeml.dll. --- tools/wine.inf | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index f21a0de..6dcfe41 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2160,7 +2160,6 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,d3d8.dll 11,,d3d9.dll 11,,dbghelp.dll -11,,ddeml.dll 11,,ddhelp.exe 11,,ddraw.dll 11,,dsound.dll

1 0