December 2005 - Wine-Commits

Robert Shearman : wininet: Move URL cache hash table creation to a separate function.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 2ceb052496f32b22304c982f3824b8fc599714ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ceb052496f32b22304c982… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:20:29 2005 +0100 wininet: Move URL cache hash table creation to a separate function. --- dlls/wininet/urlcache.c | 65 +++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 80a5510..a19c54a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -179,7 +179,7 @@ typedef struct _URLCACHECONTAINER /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); -static BOOL URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlocksNeeded, CACHEFILE_ENTRY ** ppEntry); +static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash); /*********************************************************************** * URLCache_PathToObjectName (Internal) @@ -297,7 +297,6 @@ static BOOL URLCacheContainer_OpenIndex( WCHAR wszDirPath[MAX_PATH]; FILETIME ft; int i, j; - HASH_CACHEFILE_ENTRY *pPrevHash = 0; dwFileSize = NEWFILE_SIZE; @@ -328,37 +327,7 @@ static BOOL URLCacheContainer_OpenIndex( RegCloseKey(key); } - /* Now create the hash table entries. Windows would create - * these as needed, but WINE doesn't do that yet, so create - * four and hope it's enough. - */ - - for (i = 0; i < 4; ++i) - { - HASH_CACHEFILE_ENTRY *pHash; - DWORD dwOffset; - - /* Request 0x20 blocks - no need to check for failure here because - * we started with an empty file - */ - URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **) &pHash); - - dwOffset = (BYTE *) pHash - (BYTE *) pHeader; - - if (pPrevHash) - pPrevHash->dwAddressNext = dwOffset; - else - pHeader->dwOffsetFirstHashTable = dwOffset; - pHash->CacheFileEntry.dwSignature = HASH_SIGNATURE; - pHash->CacheFileEntry.dwBlocksUsed = 0x20; - pHash->dwHashTableNumber = i; - for (j = 0; j < HASHTABLE_SIZE; ++j) - { - pHash->HashTable[j].dwOffsetEntry = 0; - pHash->HashTable[j].dwHashKey = HASHTABLE_FREE; - } - pPrevHash = pHash; - } + URLCache_CreateHashTable(pHeader, NULL); /* Last step - create the directories */ @@ -1307,6 +1276,36 @@ static BOOL URLCache_AddEntryToHash(LPCU return FALSE; } +static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash) +{ + HASH_CACHEFILE_ENTRY *pHash; + DWORD dwOffset; + int i; + + if (!URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **)&pHash)) + { + FIXME("no free space for hash table\n"); + SetLastError(ERROR_DISK_FULL); + return NULL; + } + + dwOffset = (BYTE *)pHash - (BYTE *)pHeader; + + if (pPrevHash) + pPrevHash->dwAddressNext = dwOffset; + else + pHeader->dwOffsetFirstHashTable = dwOffset; + pHash->CacheFileEntry.dwSignature = HASH_SIGNATURE; + pHash->CacheFileEntry.dwBlocksUsed = 0x20; + pHash->dwHashTableNumber = pPrevHash ? pPrevHash->dwHashTableNumber + 1 : 0; + for (i = 0; i < HASHTABLE_SIZE; i++) + { + pHash->HashTable[i].dwOffsetEntry = 0; + pHash->HashTable[i].dwHashKey = HASHTABLE_FREE; + } + return pHash; +} + /*********************************************************************** * GetUrlCacheEntryInfoExA (WININET.@) *

1 0

Jacek Caban : urlmon: Removed not used code.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 3a04ff683690171deceb49a44736978743eca706 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a04ff683690171deceb49a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 31 13:19:32 2005 +0100 urlmon: Removed not used code. --- dlls/urlmon/umon.c | 115 ++-------------------------------------------------- 1 files changed, 5 insertions(+), 110 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index d722220..affcdfa 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -3,6 +3,7 @@ * * Copyright 1999 Ulrich Czekalla for Corel Corporation * Copyright 2002 Huw D M Davies for CodeWeavers + * Copyright 2005 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -496,55 +497,6 @@ static HRESULT WINAPI URLMonikerImpl_Bin return E_NOTIMPL; } -typedef struct { - enum {OnProgress, OnDataAvailable} callback; -} URLMON_CallbackData; - - -#if 0 -static LRESULT CALLBACK URLMON_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - return DefWindowProcA(hwnd, msg, wparam, lparam); -} - -static void PostOnProgress(URLMonikerImpl *This, UINT progress, UINT maxprogress, DWORD status, LPCWSTR *str) -{ -} - -static void CALLBACK URLMON_InternetCallback(HINTERNET hinet, /*DWORD_PTR*/ DWORD context, DWORD status, - void *status_info, DWORD status_info_len) -{ - URLMonikerImpl *This = (URLMonikerImpl *)context; - TRACE("handle %p this %p status %08lx\n", hinet, This, status); - - if(This->filesize == -1) { - switch(status) { - case INTERNET_STATUS_RESOLVING_NAME: - PostOnProgess(This, 0, 0, BINDSTATUS_FINDINGRESOURCE, status_info); - break; - case INTERNET_STATUS_CONNECTING_TO_SERVER: - PostOnProgress(This, 0, 0, BINDSTATUS_CONNECTING, NULL); - break; - case INTERNET_STATUS_SENDING_REQUEST: - PostOnProgress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - break; - case INTERNET_REQUEST_COMPLETE: - { - DWORD len, lensz = sizeof(len); - - HttpQueryInfoW(hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); - This->filesize = len; - break; - } - } - } - - return; -} -#endif - - /****************************************************************************** * URLMoniker_BindToStorage ******************************************************************************/ @@ -601,7 +553,7 @@ static HRESULT URLMonikerImpl_BindToStor if(SUCCEEDED(hres)) { WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path, *partial_path, *user, *pass; + WCHAR *host, *path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -622,17 +574,6 @@ static HRESULT URLMonikerImpl_BindToStor if (*tmpwc == '\\') *tmpwc = '/'; -#if 0 - if(!registered_wndclass) { - WNDCLASSA urlmon_wndclass = {0, URLMON_WndProc,0, 0, URLMON_hInstance, 0, 0, 0, NULL, "URLMON_Callback_Window_Class"}; - RegisterClassA(&urlmon_wndclass); - registered_wndclass = TRUE; - } - - This->hwndCallback = CreateWindowA("URLMON_Callback_Window_Class", NULL, 0, 0, 0, 0, 0, 0, 0, - URLMON_hInstance, NULL); - -#endif bind->expected_size = 0; bind->total_read = 0; @@ -667,15 +608,9 @@ static HRESULT URLMonikerImpl_BindToStor pass = 0; } - switch ((DWORD) url.nScheme) - { - case INTERNET_SCHEME_FTP: - case INTERNET_SCHEME_GOPHER: - case INTERNET_SCHEME_HTTP: - case INTERNET_SCHEME_HTTPS: - bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(bind->hinternet, URLMON_InternetCallback);*/ + do { + bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0); if (!bind->hinternet) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -797,48 +732,8 @@ static HRESULT URLMonikerImpl_BindToStor InternetCloseHandle(bind->hconnect); InternetCloseHandle(bind->hinternet); - break; - - case INTERNET_SCHEME_FILE: - partial_path = bind->URLName + 5; /* Skip the "file:" part */ - if ((partial_path[0] != '/' && partial_path[0] != '\\') || - (partial_path[1] != '/' && partial_path[1] != '\\')) - { - hres = E_FAIL; - } - else - { - HANDLE h; - - partial_path += 2; - if (partial_path[0] == '/' || partial_path[0] == '\\') - ++partial_path; - h = CreateFileW(partial_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - if (h == (HANDLE) HFILE_ERROR) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - } - else - { - char buf[4096]; - DWORD bufread; - - IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); - - while (ReadFile(h, buf, sizeof(buf), &bufread, NULL) && bufread > 0) - hres = Binding_MoreCacheData(bind, buf, bufread); + } while(0); - CloseHandle(h); - hres = S_OK; - } - } - - break; - - default: - FIXME("Unsupported URI scheme"); - break; - } Binding_CloseCacheDownload(bind); Binding_FinishedDownload(bind, hres);

1 0

Robert Shearman : widl: Output sizing information for arrays in the generated marshaling code.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 8494f57d178a042559fc9e093dd8a60b5ff22907 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8494f57d178a042559fc9e0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:19:13 2005 +0100 widl: Output sizing information for arrays in the generated marshaling code. --- tools/widl/typegen.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1346729..33eecbc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -448,11 +448,31 @@ void marshall_arguments(FILE *file, int if (!has_length && !has_size) array_type = "FixedArray"; else if (has_length && !has_size) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, length_is, 1); + fprintf(file, ";\n\n"); array_type = "VaryingArray"; + } else if (!has_length && has_size) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, size_is ? size_is : var->array, 1); + fprintf(file, ";\n\n"); array_type = "ConformantArray"; + } else + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, size_is ? size_is : var->array, 1); + fprintf(file, ";\n"); + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, length_is, 1); + fprintf(file, ";\n\n"); array_type = "ConformantVaryingArray"; + } } print_file(file, indent,

1 0

Robert Shearman : widl: Export the bracket adding functionality of do_write_expr outside
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ae94c2207fc5fb4afd0634ba11f7d816a4b38402 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae94c2207fc5fb4afd0634b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:18:49 2005 +0100 widl: Export the bracket adding functionality of do_write_expr outside of header.c. --- tools/widl/header.c | 37 ++++++++++++++++--------------------- tools/widl/header.h | 2 +- tools/widl/proxy.c | 6 +++--- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3b85adb..a8071b1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -189,7 +189,7 @@ static void write_enums(FILE *h, var_t * write_name(h, v); if (v->eval) { fprintf(h, " = "); - write_expr(h, v->eval); + write_expr(h, v->eval, 0); } } if (PREV_LINK(v)) @@ -399,7 +399,7 @@ void write_typedef(type_t *type, const v fprintf(header, ";\n"); } -static void do_write_expr(FILE *h, expr_t *e, int p) +void write_expr(FILE *h, const expr_t *e, int brackets) { switch (e->type) { case EXPR_VOID: @@ -415,21 +415,21 @@ static void do_write_expr(FILE *h, expr_ break; case EXPR_NEG: fprintf(h, "-"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_NOT: fprintf(h, "~"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_PPTR: fprintf(h, "*"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_CAST: fprintf(h, "("); write_type(h, e->u.tref->ref, NULL, e->u.tref->name); fprintf(h, ")"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_SIZEOF: fprintf(h, "sizeof("); @@ -444,8 +444,8 @@ static void do_write_expr(FILE *h, expr_ case EXPR_SUB: case EXPR_AND: case EXPR_OR: - if (p) fprintf(h, "("); - do_write_expr(h, e->ref, 1); + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; @@ -457,30 +457,25 @@ static void do_write_expr(FILE *h, expr_ case EXPR_OR: fprintf(h, " | "); break; default: break; } - do_write_expr(h, e->u.ext, 1); - if (p) fprintf(h, ")"); + write_expr(h, e->u.ext, 1); + if (brackets) fprintf(h, ")"); break; case EXPR_COND: - if (p) fprintf(h, "("); - do_write_expr(h, e->ref, 1); + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); fprintf(h, " ? "); - do_write_expr(h, e->u.ext, 1); + write_expr(h, e->u.ext, 1); fprintf(h, " : "); - do_write_expr(h, e->ext2, 1); - if (p) fprintf(h, ")"); + write_expr(h, e->ext2, 1); + if (brackets) fprintf(h, ")"); break; } } -void write_expr(FILE *h, expr_t *e) -{ - do_write_expr(h, e, 0); -} - void write_constdef(const var_t *v) { fprintf(header, "#define %s (", get_name(v)); - write_expr(header, v->eval); + write_expr(header, v->eval, 0); fprintf(header, ")\n\n"); } diff --git a/tools/widl/header.h b/tools/widl/header.h index de38a70..1a767c7 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -38,7 +38,7 @@ extern void write_interface(type_t *ifac extern void write_dispinterface(type_t *iface); extern void write_coclass(class_t *iface); extern void write_typedef(type_t *type, const var_t *names); -extern void write_expr(FILE *h, expr_t *e); +extern void write_expr(FILE *h, const expr_t *e, int brackets); extern void write_constdef(const var_t *v); extern void write_externdef(const var_t *v); extern void write_library(const char *name, attr_t *attr); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 988f1e7..a953ff5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -213,7 +213,7 @@ static void marshall_size_arg( var_t *ar if (expr) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_expr(proxy, expr, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrConformantArrayBufferSize( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -305,7 +305,7 @@ static void marshall_copy_arg( var_t *ar if (expr) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_expr(proxy, expr, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrConformantArrayMarshall( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -494,7 +494,7 @@ static void free_variable( var_t *arg ) if (expr) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_expr(proxy, expr, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrClearOutParameters( &_StubMsg, "); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], ", index );

1 0

Mike McCormack : msi: Change some FIXME messages to comments.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: b7270b8c2d92f5459adb75909b2aa833d4fa44d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7270b8c2d92f5459adb759… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:18:11 2005 +0100 msi: Change some FIXME messages to comments. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5cb33c2..0a062ba 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3096,7 +3096,7 @@ static UINT ACTION_PublishProduct(MSIPAC } msi_free(buffer); - FIXME("Need to write more keys to the user registry\n"); + /* FIXME: Need to write more keys to the user registry */ hDb= alloc_msihandle( &package->db->hdr ); rc = MsiGetSummaryInformationW(hDb, NULL, 0, &hSumInfo); @@ -3540,7 +3540,7 @@ static UINT ACTION_RegisterProduct(MSIPA return rc; /* dump all the info i can grab */ - FIXME("Flesh out more information\n"); + /* FIXME: Flesh out more information */ msi_write_uninstall_property_vals( package, hkey ); @@ -3554,7 +3554,7 @@ static UINT ACTION_RegisterProduct(MSIPA RegSetValueExW(hkey,szUninstallString,0,REG_EXPAND_SZ,(LPBYTE)buffer,size); msi_free(buffer); - FIXME("Write real Estimated Size when we have it\n"); + /* FIXME: Write real Estimated Size when we have it */ msi_reg_set_val_dword( hkey, szEstimatedSize, 0 ); GetLocalTime(&systime);

1 0

Mike McCormack : msi: Define the property Intel if we're running on an Intel processor.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 04a086ad657f5188e7c8d5884b2d7abef134d997 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04a086ad657f5188e7c8d58… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:14:34 2005 +0100 msi: Define the property "Intel" if we're running on an Intel processor. --- dlls/msi/package.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 96bf46f..e2ba8e7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -228,6 +228,8 @@ static VOID set_installer_properties(MSI static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szScreenFormat[] = {'%','d',0}; + static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; + SYSTEM_INFO sys_info; /* * Other things that probably should be set: @@ -353,6 +355,13 @@ static VOID set_installer_properties(MSI sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); MSI_SetPropertyW( package, szVersionMsi, bufstr ); + GetSystemInfo( &sys_info ); + if (sys_info.u.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + { + sprintfW( bufstr, szScreenFormat, sys_info.wProcessorLevel ); + MSI_SetPropertyW( package, szIntel, bufstr ); + } + /* Screen properties. */ dc = GetDC(0); sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, HORZRES ) );

1 0

Mike McCormack : msi: Add stub actions for CCPSearch and RMCCPSearch.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: f24a9e2a2494427b7391c93e822d2a4a9be97789 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f24a9e2a2494427b7391c93… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:14:23 2005 +0100 msi: Add stub actions for CCPSearch and RMCCPSearch. --- dlls/msi/action.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index be2b686..5cb33c2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4210,11 +4210,23 @@ static UINT ACTION_UnregisterFonts( MSIP return msi_unimplemented_action_stub( package, "UnregisterFonts", table ); } +static UINT ACTION_CCPSearch( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','C','P','S','e','a','r','c','h',0 }; + return msi_unimplemented_action_stub( package, "CCPSearch", table ); +} + +static UINT ACTION_RMCCPSearch( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','C','P','S','e','a','r','c','h',0 }; + return msi_unimplemented_action_stub( package, "RMCCPSearch", table ); +} + static struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, { szBindImage, ACTION_BindImage }, - { szCCPSearch, NULL}, + { szCCPSearch, ACTION_CCPSearch}, { szCostFinalize, ACTION_CostFinalize }, { szCostInitialize, ACTION_CostInitialize }, { szCreateFolders, ACTION_CreateFolders }, @@ -4266,7 +4278,7 @@ static struct _actions StandardActions[] { szRemoveRegistryValues, NULL}, { szRemoveShortcuts, NULL}, { szResolveSource, ACTION_ResolveSource}, - { szRMCCPSearch, NULL}, + { szRMCCPSearch, ACTION_RMCCPSearch}, { szScheduleReboot, NULL}, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules },

1 0

Mike McCormack : riched20: Add newlines to ERR macro output.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 53858d61d070ff5eb34c597022c024a0a3368bdd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53858d61d070ff5eb34c597… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:14:12 2005 +0100 riched20: Add newlines to ERR macro output. --- dlls/riched20/reader.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 83cfb76..72cff65 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -219,7 +219,7 @@ void RTFInit(RTF_Info *info) info->rtfTextBuf = RTFAlloc (rtfBufSiz); info->pushedTextBuf = RTFAlloc (rtfBufSiz); if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) - ERR ("Cannot allocate text buffers."); + ERR ("Cannot allocate text buffers.\n"); info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } @@ -283,7 +283,7 @@ void RTFSetInputName(RTF_Info *info, cha info->inputName = RTFStrSave (name); if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory"); + ERR ("RTFSetInputName: out of memory\n"); } @@ -299,7 +299,7 @@ void RTFSetOutputName(RTF_Info *info, ch info->outputName = RTFStrSave (name); if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory"); + ERR ("RTFSetOutputName: out of memory\n"); } @@ -388,7 +388,7 @@ void RTFRouteToken(RTF_Info *info) if (info->rtfClass < 0 || info->rtfClass >= rtfMaxClass) /* watchdog */ { - ERR( "Unknown class %d: %s (reader malfunction)", + ERR( "Unknown class %d: %s (reader malfunction)\n", info->rtfClass, info->rtfTextBuf); } if (RTFCheckCM (info, rtfControl, rtfDestination)) @@ -490,9 +490,9 @@ void RTFUngetToken(RTF_Info *info) TRACE("\n"); if (info->pushedClass >= 0) /* there's already an ungotten token */ - ERR ("cannot unget two tokens"); + ERR ("cannot unget two tokens\n"); if (info->rtfClass < 0) - ERR ("no token to unget"); + ERR ("no token to unget\n"); info->pushedClass = info->rtfClass; info->pushedMajor = info->rtfMajor; info->pushedMinor = info->rtfMinor; @@ -893,19 +893,19 @@ static void ReadFontTbl(RTF_Info *info) else if (RTFCheckCM (info, rtfGroup, rtfBeginGroup)) old = 0; /* brace */ else /* can't tell! */ - ERR ( "%s: Cannot determine format", fn); + ERR ( "%s: Cannot determine format\n", fn); } if (old == 0) /* need to find "{" here */ { if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"", fn); + ERR ( "%s: missing \"{\"\n", fn); RTFGetToken (info); /* yes, skip to next token */ if (info->rtfClass == rtfEOF) break; } fp = New (RTFFont); if (fp == NULL) - ERR ( "%s: cannot allocate font entry", fn); + ERR ( "%s: cannot allocate font entry\n", fn); fp->rtfNextFont = info->fontList; info->fontList = fp; @@ -991,7 +991,7 @@ static void ReadFontTbl(RTF_Info *info) *bp = '\0'; fp->rtfFName = RTFStrSave (buf); if (fp->rtfFName == NULL) - ERR ( "%s: cannot allocate font name", fn); + ERR ( "%s: cannot allocate font name\n", fn); /* already have next token; don't read one */ /* at bottom of loop */ continue; @@ -1012,7 +1012,7 @@ static void ReadFontTbl(RTF_Info *info) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"", fn); + ERR ( "%s: missing \"}\"\n", fn); if (info->rtfClass == rtfEOF) break; } @@ -1026,7 +1026,7 @@ static void ReadFontTbl(RTF_Info *info) } } if (fp->rtfFNum == -1) - ERR( "%s: missing font number", fn); + ERR( "%s: missing font number\n", fn); /* * Could check other pieces of structure here, too, I suppose. */ @@ -1068,7 +1068,7 @@ static void ReadColorTbl(RTF_Info *info) break; cp = New (RTFColor); if (cp == NULL) - ERR ( "%s: cannot allocate color entry", fn); + ERR ( "%s: cannot allocate color entry\n", fn); cp->rtfCNum = cnum++; cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; cp->rtfNextColor = info->colorList; @@ -1086,7 +1086,7 @@ static void ReadColorTbl(RTF_Info *info) if (info->rtfClass == rtfEOF) break; if (!RTFCheckCM (info, rtfText, ';')) - ERR ("%s: malformed entry", fn); + ERR ("%s: malformed entry\n", fn); } RTFRouteToken (info); /* feed "}" back to router */ } @@ -1116,7 +1116,7 @@ static void ReadStyleSheet(RTF_Info *inf break; sp = New (RTFStyle); if (sp == NULL) - ERR ( "%s: cannot allocate stylesheet entry", fn); + ERR ( "%s: cannot allocate stylesheet entry\n", fn); sp->rtfSName = NULL; sp->rtfSNum = -1; sp->rtfSType = rtfParStyle; @@ -1128,7 +1128,7 @@ static void ReadStyleSheet(RTF_Info *inf sp->rtfExpanding = 0; info->styleList = sp; if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"", fn); + ERR ( "%s: missing \"{\"\n", fn); real_style = TRUE; for (;;) { @@ -1140,7 +1140,7 @@ static void ReadStyleSheet(RTF_Info *inf { if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) { RTFGetToken(info); - ERR( "%s: skipping optional destination", fn); + ERR( "%s: skipping optional destination\n", fn); RTFSkipGroup(info); info->rtfClass = rtfGroup; info->rtfMajor = rtfEndGroup; @@ -1182,14 +1182,14 @@ static void ReadStyleSheet(RTF_Info *inf } sep = New (RTFStyleElt); if (sep == NULL) - ERR ( "%s: cannot allocate style element", fn); + ERR ( "%s: cannot allocate style element\n", fn); sep->rtfSEClass = info->rtfClass; sep->rtfSEMajor = info->rtfMajor; sep->rtfSEMinor = info->rtfMinor; sep->rtfSEParam = info->rtfParam; sep->rtfSEText = RTFStrSave (info->rtfTextBuf); if (sep->rtfSEText == NULL) - ERR ( "%s: cannot allocate style element text", fn); + ERR ( "%s: cannot allocate style element text\n", fn); if (sepLast == NULL) sp->rtfSSEList = sep; /* first element */ else /* add to end */ @@ -1203,7 +1203,7 @@ static void ReadStyleSheet(RTF_Info *inf * This passes over "{\*\keycode ... }, among * other things. A temporary (perhaps) hack. */ - ERR( "%s: skipping begin", fn); + ERR( "%s: skipping begin\n", fn); RTFSkipGroup (info); continue; } @@ -1224,7 +1224,7 @@ static void ReadStyleSheet(RTF_Info *inf *bp = '\0'; sp->rtfSName = RTFStrSave (buf); if (sp->rtfSName == NULL) - ERR ( "%s: cannot allocate style name", fn); + ERR ( "%s: cannot allocate style name\n", fn); } else /* unrecognized */ { @@ -1236,7 +1236,7 @@ static void ReadStyleSheet(RTF_Info *inf if (real_style) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"", fn); + ERR ( "%s: missing \"}\"\n", fn); /* * Check over the style structure. A name is a must. * If no style number was specified, check whether it's the @@ -1248,12 +1248,12 @@ static void ReadStyleSheet(RTF_Info *inf * Some German RTF writers use "Standard" instead of "Normal". */ if (sp->rtfSName == NULL) - ERR ( "%s: missing style name", fn); + ERR ( "%s: missing style name\n", fn); if (sp->rtfSNum < 0) { if (strncmp (buf, "Normal", 6) != 0 && strncmp (buf, "Standard", 8) != 0) - ERR ( "%s: missing style number", fn); + ERR ( "%s: missing style number\n", fn); sp->rtfSNum = rtfNormalStyleNum; } if (sp->rtfSNextPar == -1) /* if \snext not given, */ @@ -1359,7 +1359,7 @@ void RTFExpandStyle(RTF_Info *info, int if (s == NULL) return; if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d", n); + ERR ("Style expansion loop, style %d\n", n); s->rtfExpanding = 1; /* set expansion flag for loop detection */ /* * Expand "based-on" style (unless it's the same as the current

1 0

Robert Reif : comctl32: Create ipaddress in enabled state.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ac9b08702654707fa730a30a846289915ce67419 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac9b08702654707fa730a30… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 31 13:13:52 2005 +0100 comctl32: Create ipaddress in enabled state. --- dlls/comctl32/ipaddress.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index f4da2ff..aa59cb2 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -189,7 +189,7 @@ static LRESULT IPADDRESS_Create (HWND hw edit.bottom = rcClient.bottom - 2; infoPtr->Self = hwnd; - infoPtr->Enabled = FALSE; + infoPtr->Enabled = TRUE; infoPtr->Notify = lpCreate->hwndParent; for (i = 0; i < 4; i++) { @@ -208,6 +208,7 @@ static LRESULT IPADDRESS_Create (HWND hw part->OrigProc = (WNDPROC) SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)IPADDRESS_SubclassProc); + EnableWindow(part->EditHwnd, infoPtr->Enabled); } return 0;

1 0

Raphael Junqueira : wined3d: Added support for WINED3DFMT_X4R4G4B4.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ee5d72b136fa4fa0ba2d52a6df63e6581a7b63ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee5d72b136fa4fa0ba2d52a… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Sat Dec 31 13:13:34 2005 +0100 wined3d: Added support for WINED3DFMT_X4R4G4B4. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/surface.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a0ae182..b9178a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1073,6 +1073,9 @@ static BOOL IWineD3DImpl_IsGLXFBConfigCo case WINED3DFMT_A1R5G5B5: if (5 == rb && 5 == gb && 5 == bb && 1 == ab) return TRUE; break; + case WINED3DFMT_X4R4G4B4: + if (16 == buf_sz && 4 == rb && 4 == gb && 4 == bb) return TRUE; + break; case WINED3DFMT_R5G6B5: if (5 == rb && 6 == gb && 5 == bb) return TRUE; break; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e1711e6..793f4e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -752,6 +752,25 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); vcheckGLcall("glRasterPos2f"); switch (This->resource.format) { + case WINED3DFMT_X4R4G4B4: + { + int size; + unsigned short *data; + data = (unsigned short *)This->resource.allocatedMemory; + size = (This->lockedRect.bottom - This->lockedRect.top) * (This->lockedRect.right - This->lockedRect.left); + while(size > 0) { + *data |= 0xF000; + data++; + size--; + } + } + case WINED3DFMT_A4R4G4B4: + { + glDrawPixels(This->lockedRect.right - This->lockedRect.left, (This->lockedRect.bottom - This->lockedRect.top)-1, + GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV, This->resource.allocatedMemory); + vcheckGLcall("glDrawPixels"); + } + break; case WINED3DFMT_R5G6B5: { glDrawPixels(This->lockedRect.right - This->lockedRect.left, (This->lockedRect.bottom - This->lockedRect.top)-1,

1 0