February 2006 - Wine-Commits

Robert Shearman : ole: Change the Apartment Model field to a boolean.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: a37a5014a2f03f4220277aa984490e88a3ea07b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a37a5014a2f03f4220277aa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Feb 20 11:15:57 2006 +0100 ole: Change the Apartment Model field to a boolean. Change the apartment model field to a boolean that just specifies whether the apartment is multi-threaded or not and fix up all the places where this is used. Fixes a bug where we would return an error if the previous apartment model passed into CoInitializeEx matches the new apartment model, but additional optimisation flags are specified. --- dlls/ole32/compobj.c | 23 +++++++++++++++-------- dlls/ole32/compobj_private.h | 4 ++-- dlls/ole32/rpc.c | 4 ++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ab44b20..a757adb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -229,17 +229,17 @@ static APARTMENT *apartment_construct(DW InitializeCriticalSection(&apt->cs); DEBUG_SET_CRITSEC_NAME(&apt->cs, "apartment"); - apt->model = model; + apt->multi_threaded = !(model & COINIT_APARTMENTTHREADED); - if (model & COINIT_APARTMENTTHREADED) + if (apt->multi_threaded) { /* FIXME: should be randomly generated by in an RPC call to rpcss */ - apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId(); + apt->oxid = ((OXID)GetCurrentProcessId() << 32) | 0xcafe; } else { /* FIXME: should be randomly generated by in an RPC call to rpcss */ - apt->oxid = ((OXID)GetCurrentProcessId() << 32) | 0xcafe; + apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId(); } TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid)); @@ -292,6 +292,11 @@ static APARTMENT *apartment_get_or_creat return apt; } +static inline BOOL apartment_is_model(APARTMENT *apt, DWORD model) +{ + return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED)); +} + DWORD apartment_addref(struct apartment *apt) { DWORD refs = InterlockedIncrement(&apt->refs); @@ -420,7 +425,7 @@ static LRESULT CALLBACK apartment_wndpro HRESULT apartment_createwindowifneeded(struct apartment *apt) { - if (!(apt->model & COINIT_APARTMENTTHREADED)) + if (apt->multi_threaded) return S_OK; if (!apt->win) @@ -443,7 +448,7 @@ HRESULT apartment_createwindowifneeded(s HWND apartment_getwindow(struct apartment *apt) { - assert(apt->model & COINIT_APARTMENTTHREADED); + assert(!apt->multi_threaded); return apt->win; } @@ -633,11 +638,13 @@ HRESULT WINAPI CoInitializeEx(LPVOID lpR apt = apartment_get_or_create(dwCoInit); if (!apt) return E_OUTOFMEMORY; } - else if (dwCoInit != apt->model) + else if (!apartment_is_model(apt, dwCoInit)) { /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine code then we are probably using the wrong threading model to implement that API. */ - ERR("Attempt to change threading model of this apartment from 0x%lx to 0x%lx\n", apt->model, dwCoInit); + ERR("Attempt to change threading model of this apartment from %s to %s\n", + apt->multi_threaded ? "multi-threaded" : "apartment threaded", + dwCoInit & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded"); return RPC_E_CHANGED_MODE; } else diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 2e86a99..caa84de 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -132,10 +132,10 @@ struct proxy_manager /* this needs to become a COM object that implements IRemUnknown */ struct apartment { - struct list entry; + struct list entry; LONG refs; /* refcount of the apartment (LOCK) */ - DWORD model; /* threading model (RO) */ + BOOL multi_threaded; /* multi-threaded or single-threaded apartment? (RO) */ DWORD tid; /* thread id (RO) */ OXID oxid; /* object exporter ID (RO) */ LONG ipidc; /* interface pointer ID counter, starts at 1 (LOCK) */ diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 05becb2..806c323 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -277,7 +277,7 @@ static HRESULT WINAPI ClientRpcChannelBu RpcBindingInqObject(msg->Handle, &ipid); hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); - if ((hr == S_OK) && (apt->model & COINIT_APARTMENTTHREADED)) + if ((hr == S_OK) && !apt->multi_threaded) { params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -536,7 +536,7 @@ static void __RPC_STUB dispatch_rpc(RPC_ /* Note: this is the important difference between STAs and MTAs - we * always execute RPCs to STAs in the thread that originally created the * apartment (i.e. the one that pumps messages to the window) */ - if (apt->model & COINIT_APARTMENTTHREADED) + if (!apt->multi_threaded) { params->handle = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

YunSong Hwang : winecfg: Updated Korean translation.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 021a125dc36d22d3b597121d21f4b43e2ad24ccb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=021a125dc36d22d3b597121… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Mon Feb 20 11:14:59 2006 +0100 winecfg: Updated Korean translation. --- programs/winecfg/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 8fe62c0..4f6c91c 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -208,7 +208,7 @@ BEGIN IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "��" IDS_WINECFG_TITLE "Wine ��" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_WINECFG_TITLE_APP "%s�� wine ��" IDS_THEMEFILE "�׸� ��" IDS_THEMEFILE_SELECT "�׸� �� " IDS_AUDIO_MISSING "��Ʈ��  �� ̹�� ϴ�.\n\n�� ̹�� ϱ⸦ ��õ�մϴ�.\n�� ̹�� ٸ� ��̹�� ֽ��ϴ�.\n\n�� ݵ�� ϰ� Ŭ��ؾ� �˴ϴ�."

1 0

YunSong Hwang : wordpad: Add Korean translation.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 7ab5e7c59a4d31348beacdceb3b8a9e57041ffe5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ab5e7c59a4d31348beacdc… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Mon Feb 20 11:14:48 2006 +0100 wordpad: Add Korean translation. --- programs/wordpad/Ko.rc | 67 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 programs/wordpad/Ko.rc diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc new file mode 100644 index 0000000..467b27f --- /dev/null +++ b/programs/wordpad/Ko.rc @@ -0,0 +1,67 @@ + /* + * Copyright 2004 by Krzysztof Foltman + * Copyright 2006 by YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "��(&F)" + BEGIN + MENUITEM "�� (&N)", ID_FILE_NEW + MENUITEM "��(&O)", ID_FILE_OPEN + MENUITEM "��(&S)", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "��(&E)", ID_FILE_EXIT + END + POPUP "��(&E)" + BEGIN + MENUITEM "�ǵ��(&U)\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "�ٽ� ��(&R)\tCtrl+Y", ID_EDIT_REDO + MENUITEM "�� (&S)\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "�߶󳻱�(&T)\tCtrl+X", ID_EDIT_CUT + MENUITEM "��(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "�б� ��(&O)", ID_EDIT_READONLY + MENUITEM "�� (&M)", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "��Ÿ(&E)" + BEGIN + MENUITEM "�� (&I)", ID_EDIT_SELECTIONINFO + MENUITEM "�� (&F)", ID_EDIT_CHARFORMAT + MENUITEM "��ǵ� ��ڿ� ��(&D)", ID_EDIT_DEFCHARFORMAT + MENUITEM "�ܶ� ��(&H)", ID_EDIT_PARAFORMAT + MENUITEM "�ؽ�Ʈ ��(&G)", ID_EDIT_GETTEXT + END + END + POPUP "��(&O)" + BEGIN + POPUP "��(&B)" + BEGIN + MENUITEM "�ý��(&S)\tCtrl+1", ID_BACK_1 + MENUITEM "��(&P)\tCtrl+2", ID_BACK_2 + END + POPUP "��(&A)" + BEGIN + MENUITEM "��(&L)\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "��(&C)\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "��(&R)\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index c2e2347..21cbaba 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -79,5 +79,6 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" #include "De.rc" #include "En.rc" #include "Fr.rc" +#include "Ko.rc" #include "Nl.rc" #include "Ru.rc"

1 0

Eric Pouech : dbghelp: Fix SymFindFileInPath to return files matching the requested
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 0f86dd93246f9c2ca21adbe7703bb9739e43831d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f86dd93246f9c2ca21adbe… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 20 11:14:34 2006 +0100 dbghelp: Fix SymFindFileInPath to return files matching the requested criteria (it was mainly doing the opposite). --- dlls/dbghelp/path.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index b8f1775..2362ca1 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -220,11 +220,17 @@ struct sffip void* user; }; +/* checks that buffer (as found by matching the name) matches the info + * (information is based on file type) + * returns TRUE when file is found, FALSE to continue searching + * (NB this is the opposite conventions as for SymFindFileInPathProc) + */ static BOOL CALLBACK sffip_cb(LPCSTR buffer, void* user) { struct sffip* s = (struct sffip*)user; DWORD size, checksum; DWORD_PTR timestamp; + /* FIXME: should check that id/two/three match the file pointed * by buffer */ @@ -239,7 +245,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf size = ~s->two; hFile = CreateFileA(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) return TRUE; + if (hFile == INVALID_HANDLE_VALUE) return FALSE; if ((hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != NULL) { if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) @@ -255,7 +261,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf if (timestamp != (DWORD_PTR)s->id || size != s->two) { WARN("Found %s, but wrong size or timestamp\n", buffer); - return TRUE; + return FALSE; } } break; @@ -266,13 +272,13 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf { WARN("Found %s, but wrong checksums: %08lx %08lx\n", buffer, checksum, (DWORD_PTR)s->id); - return TRUE; + return FALSE; } } else { WARN("Couldn't read %s\n", buffer); - return TRUE; + return FALSE; } break; case DMT_PDB: @@ -281,7 +287,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf break; default: FIXME("What the heck??\n"); - return TRUE; + return FALSE; } /* yes, EnumDirTree/do_search and SymFindFileInPath callbacks use the opposite * convention to stop/continue enumeration. sigh. @@ -342,7 +348,8 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr strcpy(tmp, searchPath); searchPath = NULL; } - if (do_search(filename, tmp, FALSE, sffip_cb, &s)) { + if (do_search(filename, tmp, FALSE, sffip_cb, &s)) + { strcpy(buffer, tmp); return TRUE; }

1 0

Jacek Caban : shdocvw: Change FIXMEs to TRACE in IDispatch' s methods as they return
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 00f249022cdc6ae6ec04be17dfafecb38c34ab74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00f249022cdc6ae6ec04be1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 11:13:51 2006 +0100 shdocvw: Change FIXMEs to TRACE in IDispatch's methods as they return E_NOTIMPL in Windows as well. --- dlls/shdocvw/client.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 981132a..58ce558 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -370,7 +370,9 @@ static ULONG WINAPI ClDispatch_Release(I static HRESULT WINAPI ClDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) { WebBrowser *This = DISP_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); + + TRACE("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; } @@ -378,7 +380,9 @@ static HRESULT WINAPI ClDispatch_GetType ITypeInfo **ppTInfo) { WebBrowser *This = DISP_THIS(iface); - FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); + + TRACE("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; } @@ -386,8 +390,10 @@ static HRESULT WINAPI ClDispatch_GetIDsO UINT cNames, LCID lcid, DISPID *rgDispId) { WebBrowser *This = DISP_THIS(iface); - FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + + TRACE("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Create nsIChannel for protocols not handled by Gecko.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 746616903481155b576c201ed734ebe9a61a82a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=746616903481155b576c201… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 11:13:37 2006 +0100 mshtml: Create nsIChannel for protocols not handled by Gecko. --- dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 31 +++++- dlls/mshtml/nsio.c | 232 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 231 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=746616903481155b576…

1 0

Saulius Krasuckas : mscms: Fix four todos for GetStandardColorSpaceProfile[ AW].
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: ecebfb49ea7ddbe625895ace5df96ce9a90f3681 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecebfb49ea7ddbe625895ac… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Mon Feb 20 11:13:28 2006 +0100 mscms: Fix four todos for GetStandardColorSpaceProfile[AW]. --- dlls/mscms/profile.c | 8 ++++---- dlls/mscms/tests/profile.c | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 8f0279f..6f6ff62 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -348,13 +348,13 @@ BOOL WINAPI GetStandardColorSpaceProfile if (machine) { - SetLastError(ERROR_NOT_SUPPORTED); + SetLastError( ERROR_NOT_SUPPORTED ); return FALSE; } if (!size) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -413,13 +413,13 @@ BOOL WINAPI GetStandardColorSpaceProfile if (machine) { - SetLastError(ERROR_NOT_SUPPORTED); + SetLastError( ERROR_NOT_SUPPORTED ); return FALSE; } if (!size) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 5714cb6..2f46e37 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -601,7 +601,6 @@ static void test_GetStandardColorSpacePr fail_GSCSP(A, machine, SPACE_RGB, newprofile, &size, sizeP, FALSE, (GLE == ERROR_NOT_SUPPORTED)); todo_wine fail_GSCSP(A, NULL, (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); - todo_wine fail_GSCSP(A, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER)); if (query_colorspace(SPACE_RGB)) @@ -619,7 +618,6 @@ static void test_GetStandardColorSpacePr /* Several invalid parameter checks */ fail_GSCSP(A, machine, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); - todo_wine fail_GSCSP(A, NULL, 0, newprofile, NULL, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine fail_GSCSP(A, NULL, 0, NULL, &size, 0, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); @@ -670,14 +668,12 @@ static void test_GetStandardColorSpacePr fail_GSCSP(W, NULL, (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); todo_wine fail_GSCSP(W, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); - todo_wine fail_GSCSP(W, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine fail_GSCSP(W, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); /* Several invalid parameter checks */ fail_GSCSP(W, machineW, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); - todo_wine fail_GSCSP(W, NULL, 0, newprofile, NULL, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine fail_GSCSP(W, NULL, 0, NULL, &size, 0, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND));

1 0

Saulius Krasuckas : mscms: Branching fixes for some test routines
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 44e942fbb14d249843c8b212f14c4bbf901ad6c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44e942fbb14d249843c8b21… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Mon Feb 20 11:12:53 2006 +0100 mscms: Branching fixes for some test routines --- dlls/mscms/tests/profile.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index c982528..5714cb6 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -527,7 +527,6 @@ static HKEY reg_open_mscms_key(void) RegCloseKey( win9x_key ); RegCloseKey( winNT_key ); - if ( !ICM_key ) return NULL; return ICM_key; } @@ -548,15 +547,24 @@ static void check_registry(void) } res = RegQueryInfoKeyA(hkIcmKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwValCount, NULL, NULL, NULL, NULL); + if (!res) + { + trace("RegQueryInfoKeyA() failed\n"); + return; + } + trace("Count of profile entries found directly in the registry: %ld\n", dwValCount); - if (dwValCount<1) return; for (i = 0; i<dwValCount; i++) { dwNameLen = sizeof(szName); dwDataLen = sizeof(szData); res = RegEnumValueA( hkIcmKey, i, szName, &dwNameLen, NULL, &dwType, (LPBYTE)szData, &dwDataLen ); - if (res != ERROR_SUCCESS) break; + if (res != ERROR_SUCCESS) + { + trace("RegEnumValueA() failed (%ld), cannot enumerate profiles\n", res); + break; + } ok( dwType == REG_SZ, "RegEnumValueA() returned unexpected value type (%ld)\n", dwType ); if (dwType != REG_SZ) break; trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, strlen(szData));

1 0

Mike McCormack : setupapi: Add a stub implementation of CMP_WaitNoPendingInstallEvents.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 253e29643625da1b9937af2d44151a0d16672b56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=253e29643625da1b9937af2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Feb 20 11:12:39 2006 +0100 setupapi: Add a stub implementation of CMP_WaitNoPendingInstallEvents. --- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index f7bd6cf..99b82a2 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -853,3 +853,12 @@ void WINAPI pSetupSetGlobalFlags( DWORD { global_flags = flags; } + +/*********************************************************************** + * CMP_WaitNoPendingInstallEvents (SETUPAPI.@) + */ +DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout ) +{ + FIXME("%ld\n", dwTimeout); + return WAIT_OBJECT_0; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f4fa56f..f4b3ab8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -7,7 +7,7 @@ @ stub CMP_RegisterNotification @ stub CMP_Report_LogOn @ stub CMP_UnregisterNotification -@ stub CMP_WaitNoPendingInstallEvents +@ stdcall CMP_WaitNoPendingInstallEvents(long) @ stub CMP_WaitServices @ stub CM_Add_Empty_Log_Conf @ stub CM_Add_Empty_Log_Conf_Ex

1 0

Michael Kaufmann : user: Add the DS_NOIDLEMSG style to message boxes.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 1f3afd4b47b3d690e0dd53fcc72c1ed17d0f1d82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f3afd4b47b3d690e0dd53f… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Mon Feb 20 11:12:26 2006 +0100 user: Add the DS_NOIDLEMSG style to message boxes. --- dlls/user/resources/user32_Bg.rc | 2 +- dlls/user/resources/user32_Ca.rc | 2 +- dlls/user/resources/user32_Cs.rc | 2 +- dlls/user/resources/user32_Da.rc | 2 +- dlls/user/resources/user32_De.rc | 2 +- dlls/user/resources/user32_En.rc | 2 +- dlls/user/resources/user32_Eo.rc | 2 +- dlls/user/resources/user32_Es.rc | 2 +- dlls/user/resources/user32_Fi.rc | 2 +- dlls/user/resources/user32_Fr.rc | 2 +- dlls/user/resources/user32_Hu.rc | 2 +- dlls/user/resources/user32_It.rc | 2 +- dlls/user/resources/user32_Ja.rc | 2 +- dlls/user/resources/user32_Ko.rc | 2 +- dlls/user/resources/user32_Nl.rc | 2 +- dlls/user/resources/user32_No.rc | 2 +- dlls/user/resources/user32_Pl.rc | 2 +- dlls/user/resources/user32_Pt.rc | 2 +- dlls/user/resources/user32_Ru.rc | 2 +- dlls/user/resources/user32_Si.rc | 2 +- dlls/user/resources/user32_Sk.rc | 2 +- dlls/user/resources/user32_Sv.rc | 2 +- dlls/user/resources/user32_Tr.rc | 2 +- dlls/user/resources/user32_Uk.rc | 2 +- dlls/user/resources/user32_Wa.rc | 2 +- dlls/user/resources/user32_Zh.rc | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1f3afd4b47b3d690e0d…

1 0