October 2007 - Wine-Commits

Francois Gouget : wrc: Modify the error, warning and tracing functions to behave like all the other Wine tracing methods , that is to not append a '\n' to the message.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 7e92283678d1bc156365373a4b5920613ab170c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e92283678d1bc156365373a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:11:52 2007 +0200 wrc: Modify the error, warning and tracing functions to behave like all the other Wine tracing methods, that is to not append a '\n' to the message. --- tools/wrc/genres.c | 26 +++++----- tools/wrc/newstruc.c | 36 +++++++------- tools/wrc/parser.l | 42 +++++++++--------- tools/wrc/parser.y | 122 +++++++++++++++++++++++++------------------------- tools/wrc/readres.c | 20 ++++---- tools/wrc/utils.c | 11 +--- tools/wrc/wrc.c | 6 +- tools/wrc/writeres.c | 6 +- 8 files changed, 132 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e92283678d1bc1563653…

1 0

Francois Gouget : widl: Modify generic_msg() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 4152085af13209a604d39c3b39596dbdcf904c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4152085af13209a604d39c3b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:11:30 2007 +0200 widl: Modify generic_msg() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message. --- tools/widl/header.c | 2 +- tools/widl/parser.l | 10 +++++----- tools/widl/proxy.c | 2 +- tools/widl/utils.c | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 8de9b9f..40fda80 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -839,7 +839,7 @@ static void write_coclass_guid(type_t *cocl) static void write_com_interface(type_t *iface) { if (!iface->funcs && !iface->ref) { - parser_warning("%s has no methods", iface->name); + parser_warning("%s has no methods\n", iface->name); return; } diff --git a/tools/widl/parser.l b/tools/widl/parser.l index e9bfb1f..78ee4b2 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -113,10 +113,10 @@ UUID *parse_uuid(const char *u) yy_pop_state(); lineno = (int)strtol(yytext, &cptr, 10); if(!lineno) - parser_error("Malformed '#...' line-directive; invalid linenumber"); + parser_error("Malformed '#...' line-directive; invalid linenumber\n"); fname = strchr(cptr, '"'); if(!fname) - parser_error("Malformed '#...' line-directive; missing filename"); + parser_error("Malformed '#...' line-directive; missing filename\n"); fname++; cptr = strchr(fname, '"'); if(!cptr) @@ -352,7 +352,7 @@ static void addcchar(char c) cbufalloc += 1024; cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); if(cbufalloc > 65536) - parser_warning("Reallocating string buffer larger than 64kB"); + parser_warning("Reallocating string buffer larger than 64kB\n"); } cbuffer[cbufidx++] = c; } @@ -414,7 +414,7 @@ int do_import(char *fname) first_import = import; if (!(path = wpp_find_include( fname, input_name ))) - parser_error("Unable to open include file %s", fname); + parser_error("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; import_stack[ptr].input_name = input_name; @@ -427,7 +427,7 @@ int do_import(char *fname) if (ret) exit(1); if((f = fopen(temp_name, "r")) == NULL) - parser_error("Unable to open %s", temp_name); + parser_error("Unable to open %s\n", temp_name); import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5354c27..0255923 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -509,7 +509,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) gen_stub(iface, cur, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( cur ); if (midx == -1) midx = idx; - else if (midx != idx) parser_error("method index mismatch in write_proxy"); + else if (midx != idx) parser_error("method index mismatch in write_proxy\n"); midx++; } } diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 03994d7..1382597 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -62,8 +62,6 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) free(cpy); } } - - fprintf(stderr, "\n"); }

1 0

Jacek Caban : mshtml: Set selection to default on IHTMLSelectionObject:: createRange if there is no range selected.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 52b78f055ed2c335de83d8ee8f19a160163db189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b78f055ed2c335de83d8ee8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 14:54:42 2007 +0200 mshtml: Set selection to default on IHTMLSelectionObject::createRange if there is no range selected. --- dlls/mshtml/selection.c | 30 +++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 4139d3b..df2d635 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -153,8 +153,36 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac nsresult nsres; nsISelection_GetRangeCount(This->nsselection, &nsrange_cnt); - if(nsrange_cnt != 1) + if(!nsrange_cnt) { + nsIDOMDocument *nsdoc; + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMHTMLElement *nsbody = NULL; + + TRACE("nsrange_cnt = 0\n"); + + nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + + nsres = nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); + nsIDOMHTMLDocument_Release(nshtmldoc); + if(NS_FAILED(nsres) || !nsbody) { + ERR("Could not get body: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsISelection_Collapse(This->nsselection, (nsIDOMNode*)nsbody, 0); + nsIDOMHTMLElement_Release(nsbody); + if(NS_FAILED(nsres)) + ERR("Collapse failed: %08x\n", nsres); + }else if(nsrange_cnt > 1) { FIXME("range_cnt = %d\n", nsrange_cnt); + } nsres = nsISelection_GetRangeAt(This->nsselection, 0, &nsrange); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bf9f499..3933ac8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -539,6 +539,20 @@ static void _test_range_isequal(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRa } } +#define test_range_parent(r,t) _test_range_parent(__LINE__,r,t) +static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t type) +{ + IHTMLElement *elem; + HRESULT hres; + + hres = IHTMLTxtRange_parentElement(range, &elem); + ok_(__FILE__,line) (hres == S_OK, "parentElement failed: %08x\n", hres); + + _test_elem_type(line, (IUnknown*)elem, type); + + IHTMLElement_Release(elem); +} + static void test_elem_collection(IHTMLElementCollection *col, const elem_type_t *elem_types, long exlen) { long len; @@ -695,6 +709,8 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLBodyElement *body; IHTMLTxtRange *body_range, *range, *range2; + IHTMLSelectionObject *selection; + IDispatch *disp_range; HRESULT hres; hres = IHTMLDocument2_get_body(doc, &elem); @@ -841,6 +857,24 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); + + hres = IHTMLDocument2_get_selection(doc, &selection); + ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08x\n", hres); + + hres = IHTMLSelectionObject_createRange(selection, &disp_range); + ok(hres == S_OK, "IHTMLSelectionObject_createRange failed: %08x\n", hres); + IHTMLSelectionObject_Release(selection); + + hres = IDispatch_QueryInterface(disp_range, &IID_IHTMLTxtRange, (void **)&range); + ok(hres == S_OK, "Could not get IID_IHTMLTxtRange interface: 0x%08x\n", hres); + IDispatch_Release(disp_range); + + test_range_text(range, NULL); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "wor"); + test_range_parent(range, ET_BODY); + + IHTMLTxtRange_Release(range); } static void test_compatmode(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Added support for installing Gecko from build dir.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 84098e54a00e4b407feaba2c720fa2a1da67fe31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84098e54a00e4b407feaba2c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 15:06:54 2007 +0200 mshtml: Added support for installing Gecko from build dir. --- dlls/mshtml/install.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 3890ac2..4acef19 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -251,22 +251,25 @@ static BOOL install_from_registered_dir(void) static BOOL install_from_default_dir(void) { - const char *data_dir; + const char *data_dir, *subdir; char *file_name; - int len; + int len, len2; BOOL ret; - static const char gecko_dir[] = "/gecko/"; - - data_dir = wine_get_data_dir(); - if(!data_dir) return FALSE; + if((data_dir = wine_get_data_dir())) + subdir = "/gecko/"; + else if((data_dir = wine_get_build_dir())) + subdir = "/../gecko/"; + else + return FALSE; len = strlen(data_dir); + len2 = strlen(subdir); - file_name = mshtml_alloc(len+sizeof(gecko_dir)+sizeof(GECKO_FILE_NAME)); + file_name = mshtml_alloc(len+len2+sizeof(GECKO_FILE_NAME)); memcpy(file_name, data_dir, len); - memcpy(file_name+len, gecko_dir, sizeof(gecko_dir)); - memcpy(file_name+len+sizeof(gecko_dir)-1, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME)); + memcpy(file_name+len, subdir, len2); + memcpy(file_name+len+len2, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME)); ret = install_from_unix_file(file_name);

1 0

Francois Gouget : winegcc: Modify error() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: dc3feef055e823690c54abf9f41fa8f0615028ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3feef055e823690c54abf9f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:11:47 2007 +0200 winegcc: Modify error() to behave like all the other Wine tracing methods, that is to not append a '\n' to the message. --- tools/winegcc/utils.c | 11 +++++------ tools/winegcc/winegcc.c | 14 +++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index c5b46a4..225062d 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -43,7 +43,6 @@ void error(const char* s, ...) va_start(ap, s); fprintf(stderr, "winegcc: "); vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); va_end(ap); exit(2); } @@ -53,7 +52,7 @@ void* xmalloc(size_t size) void* p; if ((p = malloc (size)) == NULL) - error("Could not malloc %d bytes.", size); + error("Could not malloc %d bytes\n", size); return p; } @@ -62,7 +61,7 @@ void *xrealloc(void* p, size_t size) { void* p2 = realloc (p, size); if (size && !p2) - error("Could not realloc %d bytes.", size); + error("Could not realloc %d bytes\n", size); return p2; } @@ -120,7 +119,7 @@ void strarray_add(strarray* arr, const char* str) void strarray_del(strarray* arr, unsigned int i) { - if (i >= arr->size) error("Invalid index i=%d", i); + if (i >= arr->size) error("Invalid index i=%d\n", i); memmove(&arr->base[i], &arr->base[i + 1], (arr->size - i - 1) * sizeof(arr->base[0])); arr->size--; } @@ -195,7 +194,7 @@ void create_file(const char* name, int mode, const char* fmt, ...) if (verbose) printf("Creating file %s\n", name); va_start(ap, fmt); if ( !(file = fopen(name, "w")) ) - error("Unable to open %s for writing.", name); + error("Unable to open %s for writing\n", name); vfprintf(file, fmt, ap); va_end(ap); fclose(file); @@ -327,7 +326,7 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) if ((status = spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) { - if (status > 0) error("%s failed.", argv[0]); + if (status > 0) error("%s failed\n", argv[0]); else perror("winegcc"); exit(3); } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3955276..38a1f5e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -201,7 +201,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) free(tmp); tmp = strmake("/tmp/%s-XXXXXX%s", prefix, suffix); fd = mkstemps( tmp, strlen(suffix) ); - if (fd == -1) error( "could not create temp file" ); + if (fd == -1) error( "could not create temp file\n" ); } close( fd ); strarray_add(tmp_files, tmp); @@ -233,7 +233,7 @@ static const strarray* get_translator(enum processor processor) if (!as) as = strarray_fromstring(AS, " "); return as; } - error("Unknown processor"); + error("Unknown processor\n"); } static void compile(struct options* opts, const char* lang) @@ -507,12 +507,12 @@ static void build(struct options* opts) case file_def: case file_spec: if (spec_file) - error("Only one spec file can be specified."); + error("Only one spec file can be specified\n"); spec_file = file; break; case file_rc: /* FIXME: invoke wrc to build it */ - error("Can't compile .rc file at the moment: %s", file); + error("Can't compile .rc file at the moment: %s\n", file); break; case file_res: strarray_add(files, strmake("-r%s", file)); @@ -527,7 +527,7 @@ static void build(struct options* opts) strarray_add(files, strmake("-s%s", file)); break; case file_na: - error("File does not exist: %s", file); + error("File does not exist: %s\n", file); break; default: file = compile_to_object(opts, file, lang); @@ -541,7 +541,7 @@ static void build(struct options* opts) lang = file; } if (opts->shared && !spec_file) - error("A spec file is currently needed in shared mode"); + error("A spec file is currently needed in shared mode\n"); /* add the default libraries, if needed */ if (!opts->nostdlib && opts->use_msvcrt) add_library(lib_dirs, files, "msvcrt"); @@ -1020,7 +1020,7 @@ int main(int argc, char **argv) } if (opts.processor == proc_cpp) linking = 0; - if (linking == -1) error("Static linking is not supported."); + if (linking == -1) error("Static linking is not supported\n"); if (opts.files->size == 0) forward(argc, argv, &opts); else if (linking) build(&opts);

1 0

Jacek Caban : wine.inf: Self-register msimtf.dll.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 4565b4f4bc9cf93f84fd8b1ea2ea1fc06fd857f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4565b4f4bc9cf93f84fd8b1ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 16:16:23 2007 +0200 wine.inf: Self-register msimtf.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 5428750..80715fa 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2180,6 +2180,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,mshtml.dll,1 11,,msi.dll,1 11,,msiexec.exe,1 +11,,msimtf.dll,1 11,,msxml3.dll,1 11,,objsel.dll,1 11,,ole32.dll,1

1 0

Francois Gouget : widl: Remove internal_error() as it is unused.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 490841ee064117b31a0ff681fb7573928f66e27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=490841ee064117b31a0ff681f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 18 17:10:30 2007 +0200 widl: Remove internal_error() as it is unused. --- tools/widl/utils.c | 10 ---------- tools/widl/utils.h | 1 - 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 68b74b4..03994d7 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -86,16 +86,6 @@ int parser_warning(const char *s, ...) return 0; } -void internal_error(const char *file, int line, const char *s, ...) -{ - va_list ap; - va_start(ap, s); - fprintf(stderr, "Internal error (please report) %s %d: ", file, line); - vfprintf(stderr, s, ap); - va_end(ap); - exit(3); -} - void error(const char *s, ...) { va_list ap; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index c4dbb31..37f12f0 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -35,7 +35,6 @@ char *xstrdup(const char *str); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); -void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Alexandre Julliard : shell32: Check for internal shell classes before querying the registry in SHCoCreateInstance .
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: d7892ccf2b5c702f59c01142249926ad6fd14324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7892ccf2b5c702f59c011422… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 15:15:40 2007 +0200 shell32: Check for internal shell classes before querying the registry in SHCoCreateInstance. --- dlls/shell32/shellole.c | 52 +++++++++++++++++----------------------------- 1 files changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 21ae519..d3fb7c3 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -128,10 +128,8 @@ HRESULT WINAPI SHCoCreateInstance( const WCHAR sInProcServer32[16] ={'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; const WCHAR sLoadWithoutCOM[15] ={'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; WCHAR sDllPath[MAX_PATH]; - HKEY hKey; + HKEY hKey = 0; DWORD dwSize; - BOOLEAN bLoadFromShell32 = FALSE; - BOOLEAN bLoadWithoutCOM = FALSE; IClassFactory * pcf = NULL; if(!ppv) return E_POINTER; @@ -148,42 +146,33 @@ HRESULT WINAPI SHCoCreateInstance( TRACE("(%p,%s,unk:%p,%s,%p)\n", aclsid,shdebugstr_guid(myclsid),pUnkOuter,shdebugstr_guid(refiid),ppv); + if (SUCCEEDED(DllGetClassObject(myclsid, &IID_IClassFactory,(LPVOID*)&pcf))) + { + hres = IClassFactory_CreateInstance(pcf, pUnkOuter, refiid, ppv); + IClassFactory_Release(pcf); + goto end; + } + /* we look up the dll path in the registry */ __SHGUIDToStringW(myclsid, sClassID); lstrcpyW(sKeyName, sCLSID); lstrcatW(sKeyName, sClassID); lstrcatW(sKeyName, sInProcServer32); - if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, sKeyName, 0, KEY_READ, &hKey)) { - dwSize = sizeof(sDllPath); - SHQueryValueExW(hKey, NULL, 0,0, sDllPath, &dwSize ); - - /* if a special registry key is set, we load a shell extension without help of OLE32 */ - bLoadWithoutCOM = (ERROR_SUCCESS == SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)); - - /* if the com object is inside shell32, omit use of ole32 */ - bLoadFromShell32 = (0==lstrcmpiW( PathFindFileNameW(sDllPath), sShell32)); - - RegCloseKey (hKey); - } else { - /* since we can't find it in the registry we try internally */ - bLoadFromShell32 = TRUE; - } - - TRACE("WithoutCom=%u FromShell=%u\n", bLoadWithoutCOM, bLoadFromShell32); - - /* now we create an instance */ - if (bLoadFromShell32) { - if (! SUCCEEDED(DllGetClassObject(myclsid, &IID_IClassFactory,(LPVOID*)&pcf))) { - ERR("LoadFromShell failed for CLSID=%s\n", shdebugstr_guid(myclsid)); - } - } else if (bLoadWithoutCOM) { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, sKeyName, 0, KEY_READ, &hKey)) + return E_ACCESSDENIED; + /* if a special registry key is set, we load a shell extension without help of OLE32 */ + if (!SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)) + { /* load an external dll without ole32 */ HANDLE hLibrary; typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); DllGetClassObjectFunc DllGetClassObject; + dwSize = sizeof(sDllPath); + SHQueryValueExW(hKey, NULL, 0,0, sDllPath, &dwSize ); + if ((hLibrary = LoadLibraryExW(sDllPath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) { ERR("couldn't load InprocServer32 dll %s\n", debugstr_w(sDllPath)); hres = E_ACCESSDENIED; @@ -198,19 +187,16 @@ HRESULT WINAPI SHCoCreateInstance( goto end; } + hres = IClassFactory_CreateInstance(pcf, pUnkOuter, refiid, ppv); + IClassFactory_Release(pcf); } else { /* load an external dll in the usual way */ hres = CoCreateInstance(myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv); - goto end; } - /* here we should have a ClassFactory */ - if (!pcf) return E_ACCESSDENIED; - - hres = IClassFactory_CreateInstance(pcf, pUnkOuter, refiid, ppv); - IClassFactory_Release(pcf); end: + if (hKey) RegCloseKey(hKey); if(hres!=S_OK) { ERR("failed (0x%08x) to create CLSID:%s IID:%s\n",

1 0

Alexandre Julliard : ntdll: Cache the DOS drives stat info for up to one second.
by Alexandre Julliard Oct. 19, 2007

Oct. 19, 2007

Module: wine Branch: master Commit: 7fd1ad5ffaed038dd046dbdffdd2a66e5e6c6e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd1ad5ffaed038dd046dbdff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 15:16:07 2007 +0200 ntdll: Cache the DOS drives stat info for up to one second. --- dlls/ntdll/directory.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 9 +++++++ dlls/ntdll/path.c | 50 +----------------------------------------- 3 files changed, 65 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 894d336..9288d31 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -227,6 +227,60 @@ static char *get_default_lpt_device( int num ) /*********************************************************************** + * DIR_get_drives_info + * + * Retrieve device/inode number for all the drives. Helper for find_drive_root. + */ +unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ) +{ + static struct drive_info cache[MAX_DOS_DRIVES]; + static time_t last_update; + static unsigned int nb_drives; + unsigned int ret; + time_t now = time(NULL); + + RtlEnterCriticalSection( &dir_section ); + if (now != last_update) + { + const char *config_dir = wine_get_config_dir(); + char *buffer, *p; + struct stat st; + unsigned int i; + + if ((buffer = RtlAllocateHeap( GetProcessHeap(), 0, + strlen(config_dir) + sizeof("/dosdevices/a:") ))) + { + strcpy( buffer, config_dir ); + strcat( buffer, "/dosdevices/a:" ); + p = buffer + strlen(buffer) - 2; + + for (i = nb_drives = 0; i < MAX_DOS_DRIVES; i++) + { + *p = 'a' + i; + if (!stat( buffer, &st )) + { + cache[i].dev = st.st_dev; + cache[i].ino = st.st_ino; + nb_drives++; + } + else + { + cache[i].dev = 0; + cache[i].ino = 0; + } + } + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } + last_update = now; + } + memcpy( info, cache, sizeof(cache) ); + ret = nb_drives; + RtlLeaveCriticalSection( &dir_section ); + return ret; +} + + +/*********************************************************************** * parse_mount_entries * * Parse mount entries looking for a given device. Helper for get_default_drive_device. diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 05df507..4f64421 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -29,6 +29,14 @@ #define MAX_NT_PATH_LENGTH 277 +#define MAX_DOS_DRIVES 26 + +struct drive_info +{ + dev_t dev; + ino_t ino; +}; + /* exceptions */ extern void wait_suspend( CONTEXT *context ); extern void WINAPI __regs_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); @@ -113,6 +121,7 @@ extern NTSTATUS FILE_GetNtStatus(void); extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle ); extern NTSTATUS DIR_get_unix_cwd( char **cwd ); +extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ); /* virtual memory */ extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index a42682d..6f161a3 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -50,52 +50,6 @@ static const WCHAR UncPfxW[] = {'U','N','C','\\',0}; #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') -#define MAX_DOS_DRIVES 26 - -struct drive_info -{ - dev_t dev; - ino_t ino; -}; - -/*********************************************************************** - * get_drives_info - * - * Retrieve device/inode number for all the drives. Helper for find_drive_root. - */ -static inline int get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ) -{ - const char *config_dir = wine_get_config_dir(); - char *buffer, *p; - struct stat st; - int i, ret; - - buffer = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ); - if (!buffer) return 0; - strcpy( buffer, config_dir ); - strcat( buffer, "/dosdevices/a:" ); - p = buffer + strlen(buffer) - 2; - - for (i = ret = 0; i < MAX_DOS_DRIVES; i++) - { - *p = 'a' + i; - if (!stat( buffer, &st )) - { - info[i].dev = st.st_dev; - info[i].ino = st.st_ino; - ret++; - } - else - { - info[i].dev = 0; - info[i].ino = 0; - } - } - RtlFreeHeap( GetProcessHeap(), 0, buffer ); - return ret; -} - - /*********************************************************************** * remove_last_componentA * @@ -149,7 +103,7 @@ static NTSTATUS find_drive_rootA( LPCSTR *ppath, unsigned int len, int *drive_re struct drive_info info[MAX_DOS_DRIVES]; /* get device and inode of all drives */ - if (!get_drives_info( info )) return STATUS_OBJECT_PATH_NOT_FOUND; + if (!DIR_get_drives_info( info )) return STATUS_OBJECT_PATH_NOT_FOUND; /* strip off trailing slashes */ while (len > 1 && path[len - 1] == '/') len--; @@ -240,7 +194,7 @@ static int find_drive_rootW( LPCWSTR *ppath ) struct drive_info info[MAX_DOS_DRIVES]; /* get device and inode of all drives */ - if (!get_drives_info( info )) return -1; + if (!DIR_get_drives_info( info )) return -1; /* strip off trailing slashes */ lenW = strlenW(path);

1 0

EA Durbin : kernel32: Partially implement GetUserGeoID().
by Alexandre Julliard Oct. 18, 2007

Oct. 18, 2007

Module: wine Branch: master Commit: 9984ac8a12e0d78ca9cfa33db7340ff1a8e60f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9984ac8a12e0d78ca9cfa33db… Author: EA Durbin <ead1234(a)hotmail.com> Date: Tue Oct 16 21:06:46 2007 -0500 kernel32: Partially implement GetUserGeoID(). --- dlls/kernel32/locale.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6624f81..1ecda49 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3500,8 +3500,36 @@ BOOL WINAPI InvalidateNLSCache(void) */ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) { - FIXME("%d\n",GeoClass); - return GEOID_NOT_AVAILABLE; + GEOID ret = GEOID_NOT_AVAILABLE; + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + WCHAR bufferW[40], *end; + DWORD count; + HANDLE hkey, hSubkey = 0; + UNICODE_STRING keyW; + const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; + RtlInitUnicodeString( &keyW, nationW ); + count = sizeof(bufferW); + + if(!(hkey = create_registry_key())) return ret; + + switch( GeoClass ){ + case GEOCLASS_NATION: + if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + (LPBYTE)bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((LPCWSTR)info->Data, &end, 10); + } + break; + case GEOCLASS_REGION: + FIXME("GEOCLASS_REGION not handled yet\n"); + break; + } + + NtClose(hkey); + if (hSubkey) NtClose(hSubkey); + return ret; } /******************************************************************************

1 0