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

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 3be0cc810e1abf5063dd77ab2ecf248a66f2f834 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3be0cc810e1abf5063dd77a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:36:48 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/affinity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index c73054a..c07a925 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -49,7 +49,7 @@ void ProcessPage_OnSetAffinity(void) lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; }

1 0

Mike McCormack : regedit: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 01d99121e544ee27d4aca0fb6aa5df9c2df154a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01d99121e544ee27d4aca0f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:34:05 2006 +0900 regedit: Fix some gcc 4.1 warnings. --- programs/regedit/treeview.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index f040d81..db31c94 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -134,7 +134,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LP buf[260] = '\0'; hItem = TreeView_GetRoot(hwndTV); - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); hItem = TreeView_GetChild(hwndTV, hItem); hOldItem = hItem; while(1) { @@ -145,9 +145,9 @@ HTREEITEM FindPathInTree(HWND hwndTV, LP tvi.hItem = hItem; tvi.pszText = buf; tvi.cchTextMax = 260; - TreeView_GetItem(hwndTV, &tvi); + SendMessage(hwndTV, TVM_GETITEM, 0, (LPARAM) &tvi); if (!_tcsicmp(tvi.pszText, lpItemName)) { - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) return hItem; hOldItem = hItem; @@ -425,7 +425,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, while (childItem) { HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - TreeView_DeleteItem(hwndTV, childItem); + SendMessage(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem); } childItem = nextItem; } @@ -455,7 +455,7 @@ BOOL RefreshTreeView(HWND hwndTV) SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */ - TreeView_SelectItem(hwndTV, hSelectedItem); + SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem); return TRUE; } @@ -476,7 +476,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEI item.cChildren = 1; if (!TreeView_SetItem(hwndTV, &item)) return FALSE; } - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!hNewItem) { for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { item.mask = TVIF_HANDLE | TVIF_TEXT; @@ -487,7 +487,8 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEI if (lstrcmp(name, item.pszText) == 0) break; } } - if (hNewItem) TreeView_SelectItem(hwndTV, hNewItem); + if (hNewItem) + SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hNewItem); return hNewItem; } @@ -528,8 +529,8 @@ static BOOL InitTreeViewItems(HWND hwndT if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE; /* expand and select host name */ - TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); - TreeView_Select(hwndTV, hRoot, TVGN_CARET); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); + SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } @@ -567,7 +568,7 @@ static BOOL InitTreeViewImageLists(HWND } /* Associate the image list with the tree view control. */ - TreeView_SetImageList(hwndTV, himl, TVSIL_NORMAL); + SendMessage(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl); return TRUE; }

1 0

Juan Lang : crypt32: Implement CertGetSubjectCertificateFromStore.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: ae5823db3f193bcc039117dd94e2cf486c4c0f96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae5823db3f193bcc039117d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 16 19:22:56 2006 -0800 crypt32: Implement CertGetSubjectCertificateFromStore. --- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/store.c | 19 ++++++++++++-- dlls/crypt32/tests/store.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 3 ++ 4 files changed, 82 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 4fc11b3..0d08594 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -55,7 +55,7 @@ @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stub CertGetPublicKeyLength -@ stub CertGetSubjectCertificateFromStore +@ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName @ stdcall CertNameToStrA(long ptr long ptr long) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 495ca03..cf896f7 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -866,9 +866,10 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvOp dwFlags, pvPara, NULL, &provInfo); else { - PWINECRYPT_CERTSTORE memStore; + HCERTSTORE memStore; - memStore = CRYPT_MemOpenStore(hCryptProv, dwFlags, NULL); + memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { if (provOpenFunc(lpszStoreProvider, dwEncodingType, hCryptProv, @@ -2559,6 +2560,20 @@ PCCERT_CONTEXT WINAPI CertFindCertificat return ret; } +PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore, + DWORD dwCertEncodingType, PCERT_INFO pCertId) +{ + TRACE("(%p, %08lx, %p)\n", hCertStore, dwCertEncodingType, pCertId); + + if (!pCertId) + { + SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)); + return NULL; + } + return CertFindCertificateInStore(hCertStore, dwCertEncodingType, 0, + CERT_FIND_SUBJECT_CERT, pCertId, NULL); +} + BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority) { diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index c147afb..68356f7 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -261,6 +261,66 @@ static void testFindCert(void) } } +static void testGetSubjectCert(void) +{ + HCERTSTORE store; + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store, "CertOpenStore failed: %ld\n", GetLastError()); + if (store != NULL) + { + PCCERT_CONTEXT context1, context2; + CERT_INFO info = { 0 }; + BOOL ret; + + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert2, sizeof(bigCert2), CERT_STORE_ADD_NEW, &context1); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + ok(context1 != NULL, "Expected a context\n"); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + certWithUsage, sizeof(certWithUsage), CERT_STORE_ADD_NEW, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + NULL); + ok(!context2 && GetLastError() == + HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + &info); + ok(!context2 && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + info.SerialNumber.cbData = sizeof(serialNum); + info.SerialNumber.pbData = (LPBYTE)serialNum; + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + &info); + ok(!context2 && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + info.Issuer.cbData = sizeof(subjectName2); + info.Issuer.pbData = (LPBYTE)subjectName2; + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + &info); + ok(context2 != NULL, + "CertGetSubjectCertificateFromStore failed: %08lx\n", GetLastError()); + /* Not only should this find a context, but it should be the same + * (same address) as context1. + */ + ok(context1 == context2, "Expected identical context addresses\n"); + CertFreeCertificateContext(context2); + + CertFreeCertificateContext(context1); + CertCloseStore(store, 0); + } +} + static void testMemStore(void) { HCERTSTORE store1, store2; @@ -1534,6 +1594,7 @@ START_TEST(store) { testDupCert(); testFindCert(); + testGetSubjectCert(); /* various combinations of CertOpenStore */ testMemStore(); diff --git a/include/wincrypt.h b/include/wincrypt.h index 9784223..085d310 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2693,6 +2693,9 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore( DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, const void *pvFindPara, PCCTL_CONTEXT pPrevCtlContext); +PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore, + DWORD dwCertEncodingType, PCERT_INFO pCertId); + BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement);

1 0

Stefan Dösinger : wined3d: Add D3DBASISTYPE to wined3d_types.h.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 7870a5a6a1b99d219e6df9560411a702183dfcec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7870a5a6a1b99d219e6df95… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 16 23:29:07 2006 +0100 wined3d: Add D3DBASISTYPE to wined3d_types.h. --- include/wine/wined3d_types.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index d5fe5f7..b265c90 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -410,13 +410,21 @@ typedef enum _WINED3DTEXTURESTAGESTATETY #define WINED3D_HIGHEST_TEXTURE_STATE WINED3DTSS_CONSTANT +typedef enum _WINED3DBASISTYPE { + WINED3DBASIS_BEZIER = 0, + WINED3DBASIS_BSPLINE = 1, + WINED3DBASIS_INTERPOLATE = 2, + + WINED3DBASIS_FORCE_DWORD = 0x7fffffff +} WINED3DBASISTYPE; + typedef struct _WINEDD3DRECTPATCH_INFO { UINT StartVertexOffsetWidth; UINT StartVertexOffsetHeight; UINT Width; UINT Height; UINT Stride; - D3DBASISTYPE Basis; + WINED3DBASISTYPE Basis; WINED3DDEGREETYPE Degree; } WINED3DRECTPATCH_INFO;

1 0

Roderick Colenbrander : d3d8/wined3d: Vertex shader fixes.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: bcbf5f397e56b88d9f22fe01c33e03ab38023168 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcbf5f397e56b88d9f22fe0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Mar 16 22:42:00 2006 +0100 d3d8/wined3d: Vertex shader fixes. --- dlls/d3d8/device.c | 7 + dlls/wined3d/device.c | 31 +++-- dlls/wined3d/vertexshader.c | 248 +++++++++++++++++++++++-------------------- 3 files changed, 152 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bcbf5f397e56b88d9f2…

1 0

Alexandre Julliard : gdi: Support for loading fonts from the build directory.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 17b13bdc07dd477399a66a44ebf0c773032135bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17b13bdc07dd477399a66a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 13:10:09 2006 +0100 gdi: Support for loading fonts from the build directory. --- dlls/gdi/freetype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index a365778..f38ef1b 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1128,6 +1128,8 @@ static BOOL load_font_from_data_dir(LPCW BOOL ret = FALSE; const char *data_dir = wine_get_data_dir(); + if (!data_dir) data_dir = wine_get_build_dir(); + if (data_dir) { INT len;

1 0

Alexandre Julliard : winecfg: Support for loading the list of dlls from the build directory.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: bbb43033153c9bfca6e53c35c9e04685281cf078 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbb43033153c9bfca6e53c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 13:09:54 2006 +0100 winecfg: Support for loading the list of dlls from the build directory. --- programs/winecfg/libraries.c | 53 ++++++++++++++++++++++++++++++++---------- 1 files changed, 41 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index f4f4a80..6679976 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -32,6 +32,9 @@ #include <dirent.h> #include <assert.h> #include <stdlib.h> +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -252,38 +255,63 @@ static int is_16bit_dll( const char *dir } /* load the list of available libraries from a given dir */ -static void load_library_list_from_dir( HWND dialog, const char *dir_path ) +static void load_library_list_from_dir( HWND dialog, const char *dir_path, int check_subdirs ) { - char name[256]; + char *buffer = NULL, name[256]; struct dirent *de; DIR *dir = opendir( dir_path ); if (!dir) return; + if (check_subdirs) + buffer = HeapAlloc( GetProcessHeap(), 0, strlen(dir_path) + 2 * sizeof(name) + 10 ); + while ((de = readdir( dir ))) { size_t len = strlen(de->d_name); - if (len > sizeof(name) || len <= 7 || strcmp( de->d_name + len - 7, ".dll.so")) continue; - if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ - len -= 7; - memcpy( name, de->d_name, len ); - name[len] = 0; - /* skip dlls that should always be builtin */ - if (is_builtin_only( name )) continue; - SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); + if (len > sizeof(name)) continue; + if (len > 7 && !strcmp( de->d_name + len - 7, ".dll.so")) + { + if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ + len -= 7; + memcpy( name, de->d_name, len ); + name[len] = 0; + /* skip dlls that should always be builtin */ + if (is_builtin_only( name )) continue; + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); + } + else if (check_subdirs) + { + struct stat st; + if (is_builtin_only( de->d_name )) continue; + sprintf( buffer, "%s/%s/%s.dll.so", dir_path, de->d_name, de->d_name ); + if (!stat( buffer, &st )) + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + } } closedir( dir ); + HeapFree( GetProcessHeap(), 0, buffer ); } /* load the list of available libraries */ static void load_library_list( HWND dialog ) { unsigned int i = 0; - const char *path; + const char *path, *build_dir = wine_get_build_dir(); char item1[256], item2[256]; + HCURSOR old_cursor = SetCursor( LoadCursor(0, IDC_WAIT) ); + + if (build_dir) + { + char *dir = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/dlls") ); + strcpy( dir, build_dir ); + strcat( dir, "/dlls" ); + load_library_list_from_dir( dialog, dir, TRUE ); + HeapFree( GetProcessHeap(), 0, dir ); + } while ((path = wine_dll_enum_load_path( i++ ))) - load_library_list_from_dir( dialog, path ); + load_library_list_from_dir( dialog, path, FALSE ); /* get rid of duplicate entries */ @@ -301,6 +329,7 @@ static void load_library_list( HWND dial i++; } } + SetCursor( old_cursor ); } static void load_library_settings(HWND dialog)

1 0

Alexandre Julliard : libwine: Added magic handling of dll path when running in build dir.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 4db364cb771742f1493b092d8a491aa0eaca8e16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4db364cb771742f1493b092… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 13:08:08 2006 +0100 libwine: Added magic handling of dll path when running in build dir. This should ensure that we do the right thing in the build dir even if WINEDLLPATH isn't set. --- libs/wine/loader.c | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 9 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index b659694..e46ae30 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -56,8 +56,10 @@ char **__wine_main_environ = NULL; struct dll_path_context { - int index; - char *buffer; + int index; /* current index in the dll path list */ + char *buffer; /* buffer used for storing path names */ + char *name; /* start of file name part in buffer (including leading slash) */ + int namelen; /* length of file name without .so extension */ }; #define MAX_DLLS 100 @@ -74,6 +76,7 @@ static const IMAGE_NT_HEADERS *main_exe; static load_dll_callback_t load_dll_callback; +static const char *build_dir; static const char *default_dlldir; static const char **dll_paths; static int nb_dll_paths; @@ -112,6 +115,10 @@ static void build_dll_path(void) dll_path_maxlen = strlen(dlldir); dll_paths[nb_dll_paths++] = dlldir; } + else if ((build_dir = wine_get_build_dir())) + { + dll_path_maxlen = strlen(build_dir) + sizeof("/programs"); + } if (count) { @@ -144,18 +151,43 @@ inline static int file_exists( const cha return (fd != -1); } +inline static char *prepend( char *buffer, const char *str, size_t len ) +{ + return memcpy( buffer - len, str, len ); +} /* get a filename from the next entry in the dll path */ static char *next_dll_path( struct dll_path_context *context ) { int index = context->index++; + int namelen = context->namelen; + char *path = context->name; - if (index < nb_dll_paths) + switch(index) { - int len = strlen( dll_paths[index] ); - char *path = context->buffer + dll_path_maxlen - len; - memcpy( path, dll_paths[index], len ); + case 0: /* try programs dir for .exe files */ + if (namelen > 4 && !memcmp( context->name + namelen - 4, ".exe", 4 )) + { + path = prepend( path, context->name, namelen - 4 ); + path = prepend( path, "/programs", sizeof("/programs") - 1 ); + path = prepend( path, build_dir, strlen(build_dir) ); + return path; + } + context->index++; + /* fall through */ + case 1: /* try dlls dir with subdir prefix */ + if (namelen > 4 && !memcmp( context->name + namelen - 4, ".dll", 4 )) namelen -= 4; + path = prepend( path, context->name, namelen ); + /* fall through */ + case 2: /* try dlls dir without prefix */ + path = prepend( path, "/dlls", sizeof("/dlls") - 1 ); + path = prepend( path, build_dir, strlen(build_dir) ); return path; + default: + index -= 3; + if (index < nb_dll_paths) + return prepend( context->name, dll_paths[index], strlen( dll_paths[index] )); + break; } return NULL; } @@ -167,11 +199,13 @@ static char *first_dll_path( const char char *p; int namelen = strlen( name ); - context->buffer = p = malloc( dll_path_maxlen + namelen + strlen(ext) + 2 ); - context->index = 0; + context->buffer = malloc( dll_path_maxlen + 2 * namelen + strlen(ext) + 3 ); + context->index = build_dir ? 0 : 3; /* if no build dir skip all the build dir magic cases */ + context->name = context->buffer + dll_path_maxlen + namelen + 1; + context->namelen = namelen + 1; /* store the name at the end of the buffer, followed by extension */ - p += dll_path_maxlen; + p = context->name; *p++ = '/'; memcpy( p, name, namelen ); strcpy( p + namelen, ext );

1 0

Detlef Riekenberg : winbase.h: Add missing LMEM_INVALID_HANDLE define.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: 060d53748dc3d696f16c0d24ebf490735c79ed43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=060d53748dc3d696f16c0d2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 16 19:52:47 2006 +0100 winbase.h: Add missing LMEM_INVALID_HANDLE define. --- include/winbase.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index aeee6a0..fbbbbcd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -404,8 +404,9 @@ typedef struct _PROCESS_HEAP_ENTRY #define LMEM_ZEROINIT 0x0040 #define LMEM_MODIFY 0x0080 #define LMEM_DISCARDABLE 0x0F00 -#define LMEM_DISCARDED 0x4000 -#define LMEM_LOCKCOUNT 0x00FF +#define LMEM_DISCARDED 0x4000 +#define LMEM_INVALID_HANDLE 0x8000 +#define LMEM_LOCKCOUNT 0x00FF #define LPTR (LMEM_FIXED | LMEM_ZEROINIT) #define LHND (LMEM_MOVEABLE | LMEM_ZEROINIT)

1 0

Alexandre Julliard : libwine: Export wine_get_build_dir.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: 5ff1004c4d853691974bab0d0389b2fd06418939 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ff1004c4d853691974bab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:36:19 2006 +0100 libwine: Export wine_get_build_dir. --- include/wine/library.h | 1 + libs/wine/config.c | 6 ++++++ libs/wine/wine.def | 1 + libs/wine/wine.map | 1 + 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index 385256d..3555d57 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -29,6 +29,7 @@ /* configuration */ +extern const char *wine_get_build_dir(void); extern const char *wine_get_config_dir(void); extern const char *wine_get_data_dir(void); extern const char *wine_get_server_dir(void); diff --git a/libs/wine/config.c b/libs/wine/config.c index 79146d3..5aadf73 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -356,6 +356,12 @@ const char *wine_get_data_dir(void) return datadir; } +/* retrieve the wine build dir (if we are running from there) */ +const char *wine_get_build_dir(void) +{ + return build_dir; +} + /* return the full name of the server directory (the one containing the socket) */ const char *wine_get_server_dir(void) { diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 0388374..7f4ec26 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -25,6 +25,7 @@ EXPORTS wine_dlopen wine_dlsym wine_exec_wine_binary + wine_get_build_dir wine_get_config_dir wine_get_cs wine_get_data_dir diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 3a9c72a..a7e6f1d 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -25,6 +25,7 @@ WINE_1.0 wine_dlopen; wine_dlsym; wine_exec_wine_binary; + wine_get_build_dir; wine_get_config_dir; wine_get_cs; wine_get_data_dir;

1 0