October 2013 - Wine-commits

Ken Thomases : winemac: Disable software GL rendering unless it' s enabled via a new registry setting, AllowSoftwareRendering.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 742c48b3489a21dd373221aa10bb648dd02c86d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742c48b3489a21dd373221aa1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 21 16:37:05 2013 -0500 winemac: Disable software GL rendering unless it's enabled via a new registry setting, AllowSoftwareRendering. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ dlls/winemac.drv/opengl.c | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 98ecb90..362d5ea 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern BOOL allow_software_rendering DECLSPEC_HIDDEN; extern HMODULE macdrv_module DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index b86c8ae..df45bb5 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +BOOL allow_software_rendering = FALSE; HMODULE macdrv_module = 0; @@ -176,6 +177,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) + allow_software_rendering = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 1ae2744..16b79df 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -619,6 +619,11 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA attribs[n++] = kCGLPFAAccelerated; attribs[n++] = kCGLPFANoRecovery; } + else if (!allow_software_rendering) + { + TRACE("ignoring software renderer because AllowSoftwareRendering is off\n"); + return; + } n_stack[++n_stack_idx] = n; for (double_buffer = 0; double_buffer <= 1; double_buffer++)

1 0

Frédéric Delanoy : comctl32: Use BOOL type where appropriate.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 411ef80ac7040a6af7d0af11df4f3630a507b31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=411ef80ac7040a6af7d0af11d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:08 2013 +0200 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/datetime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index faecba0..4b0b2ad 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -72,7 +72,7 @@ typedef struct RECT checkbox; /* checkbox allowing the control to be enabled/disabled */ RECT calbutton; /* button that toggles the dropdown of the monthcal control */ BOOL bCalDepressed; /* TRUE = cal button is depressed */ - int bDropdownEnabled; + BOOL bDropdownEnabled; int select; WCHAR charsEntered[4]; int nCharsEntered;

1 0

Frédéric Delanoy : shell32: Use BOOL type where appropriate.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 0666ac3ed8cb2f3cd692d239c8bd48145553d043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0666ac3ed8cb2f3cd692d239c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:09 2013 +0200 shell32: Use BOOL type where appropriate. --- dlls/shell32/classes.c | 4 ++-- dlls/shell32/control.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 7 ++++--- dlls/shell32/shlview_cmenu.c | 3 ++- dlls/shell32/xdg.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 10ff970..70abfe6 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -58,7 +58,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL /* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE; if (bPrependDot) szTemp[0] = '.'; @@ -92,7 +92,7 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP /* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE; if (bPrependDot) szTemp[0] = '.'; diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 659a871..fe392e3 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -711,7 +711,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) signed sp = -1; LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; - int quoted = 0; + BOOL quoted = FALSE; CPlApplet *applet; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); @@ -746,7 +746,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) if (extraPmtsBuf != NULL) { beg = end = extraPmtsBuf; - quoted = 0; + quoted = FALSE; for (;;) { ch = *end; diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 6a58879..6b511d2 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -209,7 +209,7 @@ static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) if (lstrcpynW ( lpwStr, lpOle, nwStr)) { return lstrlenW (lpwStr); } - return 0; + return FALSE; } BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 4bd964c..357e4ff 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1138,7 +1138,7 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, { IGenericSFImpl *This = impl_from_ISFHelper(iface); WCHAR wszNewDir[MAX_PATH]; - DWORD bRes; + BOOL bRes; HRESULT hres = E_FAIL; TRACE ("(%p)(%s %p)\n", This, debugstr_w(pwszName), ppidlOut); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 686edb0..ac7fd48 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -255,7 +255,8 @@ static DWORD get_drive_map(void) 'P','o','l','i','c','i','e','s','\\', 'E','x','p','l','o','r','e','r',0}; static const WCHAR nodrivesW[] = {'N','o','D','r','i','v','e','s',0}; - static DWORD drive_mask, init_done; + static DWORD drive_mask; + static BOOL init_done = FALSE; if (!init_done) { @@ -277,7 +278,7 @@ static DWORD get_drive_map(void) RegCloseKey( hkey ); } drive_mask = mask; - init_done = 1; + init_done = TRUE; } return GetLogicalDrives() & ~drive_mask; @@ -626,7 +627,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, static const WCHAR wantsForParsingW[] = { 'W','a','n','t','s','F','o','r','P','a','r','s','i','n', 'g',0 }; - int bWantsForParsing = FALSE; + BOOL bWantsForParsing = FALSE; WCHAR szRegPath[100]; LONG r; diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fb4ef4e..0705948 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -203,7 +203,8 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( static void DoOpenExplore(ContextMenu *This, HWND hwnd, LPCSTR verb) { - UINT i, bFolderFound = FALSE; + UINT i; + BOOL bFolderFound = FALSE; LPITEMIDLIST pidlFQ; SHELLEXECUTEINFOA sei; diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index d05539c..6eb4163 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -282,7 +282,7 @@ BOOL XDG_MakeDirs(const char *path) */ static int dskentry_encode(const char *value, char *output) { - int only_spc = TRUE; + BOOL only_spc = TRUE; int num_written = 0; const char *c; for (c = value; *c; c++)

1 0

Frédéric Delanoy : winhlp32: Use BOOL type where appropriate.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 6eadc8ca4efe2758a7de336f32e8832af6f0ca94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eadc8ca4efe2758a7de336f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:10 2013 +0200 winhlp32: Use BOOL type where appropriate. --- programs/winhlp32/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 3a421da..cb1ac55 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -70,7 +70,7 @@ static void WINHELP_InitFonts(HWND hWnd) #define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) static HFONT fonts[FONTS_LEN]; - static BOOL init = 0; + static BOOL init = FALSE; win->fonts_len = FONTS_LEN; win->fonts = fonts; @@ -84,7 +84,7 @@ static void WINHELP_InitFonts(HWND hWnd) fonts[i] = CreateFontIndirectW(&logfontlist[i]); } - init = 1; + init = TRUE; } }

1 0

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 1f6e66babe9f26d38a22bac70015c0eb8c9dab7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6e66babe9f26d38a22bac70… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:11 2013 +0200 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/comboex.c | 6 +++--- dlls/comctl32/tests/header.c | 6 +++--- dlls/comctl32/tests/msg.h | 2 +- dlls/comctl32/tests/subclass.c | 6 +++--- dlls/comctl32/tests/treeview.c | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index cc17327..9a5bee3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -473,7 +473,7 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L return 0L; } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -485,7 +485,7 @@ static int init(void) if (!pInitCommonControlsEx) { win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); iccex.dwICC = ICC_USEREX_CLASSES; @@ -510,7 +510,7 @@ static int init(void) assert(hComboExParentWnd != NULL); hMainHinst = GetModuleHandleA(NULL); - return 1; + return TRUE; } static void cleanup(void) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 02fa61a..f6c6481 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1635,7 +1635,7 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP return 0L; } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -1650,7 +1650,7 @@ static int init(void) if (!pInitCommonControlsEx) { skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); @@ -1686,7 +1686,7 @@ static int init(void) NULL, NULL, GetModuleHandleA(NULL), 0); assert(hHeaderParentWnd != NULL); ShowWindow(hHeaderParentWnd, SW_SHOW); - return 1; + return TRUE; } /* maximum 8 items allowed */ diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 1d78ffe..fbe8fe7 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -106,7 +106,7 @@ static inline void flush_sequences(struct msg_sequence **seq, int n) } static void ok_sequence_(struct msg_sequence **seq, int sequence_index, - const struct message *expected, const char *context, int todo, + const struct message *expected, const char *context, BOOL todo, const char *file, int line) { struct msg_sequence *msg_seq = seq[sequence_index]; diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 8511275..e32919b 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -279,7 +279,7 @@ static BOOL RegisterWindowClasses(void) return TRUE; } -static int init_function_pointers(void) +static BOOL init_function_pointers(void) { HMODULE hmod; void *ptr; @@ -299,7 +299,7 @@ static int init_function_pointers(void) if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); - return 0; + return FALSE; } /* test named exports */ @@ -316,7 +316,7 @@ static int init_function_pointers(void) #undef TESTNAMED } - return 1; + return TRUE; } START_TEST(subclass) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index b784140..d523c23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -957,8 +957,8 @@ static void test_get_set_tooltips(void) static void test_get_set_unicodeformat(void) { - BOOL bPreviousSetting = 0; - BOOL bNewSetting = 0; + BOOL bPreviousSetting = FALSE; + BOOL bNewSetting = FALSE; HWND hTree; hTree = create_treeview_control(0); @@ -966,19 +966,19 @@ static void test_get_set_unicodeformat(void) /* Check that an invalid format returned by NF_QUERY defaults to ANSI */ bPreviousSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bPreviousSetting == 0, "Format should be ANSI.\n"); + ok(bPreviousSetting == FALSE, "Format should be ANSI.\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Set to Unicode */ bPreviousSetting = (BOOL)SendMessage( hTree, TVM_SETUNICODEFORMAT, 1, 0 ); bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bNewSetting == 1, "Unicode setting did not work.\n"); + ok(bNewSetting == TRUE, "Unicode setting did not work.\n"); /* Set to ANSI */ SendMessage( hTree, TVM_SETUNICODEFORMAT, 0, 0 ); bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bNewSetting == 0, "ANSI setting did not work.\n"); + ok(bNewSetting == FALSE, "ANSI setting did not work.\n"); /* Revert to original setting */ SendMessage( hTree, TVM_SETUNICODEFORMAT, bPreviousSetting, 0 );

1 0

Nikolay Sivov : ole32: Support activation context redirection in CoGetPSClsid().
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: e02b1687aadeff3e488f232049eb49c6516188dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02b1687aadeff3e488f23204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 22:59:03 2013 +0400 ole32: Support activation context redirection in CoGetPSClsid(). --- dlls/ole32/compobj.c | 22 ++++++++++++++++++++++ dlls/ole32/tests/compobj.c | 11 +++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ddfc74b..d70bfc1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -123,6 +123,18 @@ struct comclassredirect_data DWORD miscstatusdocprint; }; +struct ifacepsredirect_data +{ + ULONG size; + DWORD mask; + GUID iid; + ULONG nummethods; + GUID tlbid; + GUID base; + ULONG name_len; + ULONG name_offset; +}; + struct class_reg_data { union @@ -2359,6 +2371,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) HKEY hkey; APARTMENT *apt = COM_CurrentApt(); struct registered_psclsid *registered_psclsid; + ACTCTX_SECTION_KEYED_DATA data; TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid); @@ -2386,6 +2399,15 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) LeaveCriticalSection(&apt->cs); + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, + riid, &data)) + { + struct ifacepsredirect_data *ifaceps = (struct ifacepsredirect_data*)data.lpData; + *pclsid = ifaceps->iid; + return S_OK; + } + /* Interface\\{string form of riid}\\ProxyStubClsid32 */ strcpyW(path, wszInterface); StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9f94f3d..8998251 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1031,7 +1031,6 @@ static void test_CoGetPSClsid(void) if ((handle = activate_context(actctx_manifest, &cookie))) { -todo_wine { memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1051,7 +1050,15 @@ todo_wine { hr = CoGetPSClsid(&IID_Testiface4, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", debugstr_guid(&clsid)); -} + + /* register same interface and try to get CLSID back */ + hr = CoRegisterPSClsid(&IID_Testiface, &IID_Testiface4); + ok(hr == S_OK, "got 0x%08x\n", hr); + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", debugstr_guid(&clsid)); + pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); }

1 0

Nikolay Sivov : ole32: Support activation context in ProgIDFromCLSID().
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 03dbbe21039e6b4387ee5e37c06051af530c5006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03dbbe21039e6b4387ee5e37c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 23:11:46 2013 +0400 ole32: Support activation context in ProgIDFromCLSID(). --- dlls/ole32/compobj.c | 22 ++++++++++++++++++++++ dlls/ole32/tests/compobj.c | 9 ++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d70bfc1..b8954fb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2227,6 +2227,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) { static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; + ACTCTX_SECTION_KEYED_DATA data; HKEY hkey; HRESULT ret; LONG progidlen = 0; @@ -2238,6 +2239,27 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) } *ppszProgID = NULL; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + clsid, &data)) + { + struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + if (comclass->progid_len) + { + WCHAR *ptrW; + + *ppszProgID = CoTaskMemAlloc(comclass->progid_len + sizeof(WCHAR)); + if (!*ppszProgID) return E_OUTOFMEMORY; + + ptrW = (WCHAR*)((BYTE*)comclass + comclass->progid_offset); + memcpy(*ppszProgID, ptrW, comclass->progid_len + sizeof(WCHAR)); + return S_OK; + } + else + return REGDB_E_CLASSNOTREG; + } + ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey); if (FAILED(ret)) return ret; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8998251..3bc98fc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -309,19 +309,14 @@ static void test_ProgIDFromCLSID(void) static const WCHAR customfontW[] = {'C','u','s','t','o','m','F','o','n','t',0}; hr = ProgIDFromCLSID(&CLSID_non_existent, &progid); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - { - ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid)); - CoTaskMemFree(progid); - } + ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid)); + CoTaskMemFree(progid); /* try something registered and redirected */ progid = NULL; hr = ProgIDFromCLSID(&CLSID_StdFont, &progid); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpiW(progid, customfontW), "got wrong progid %s\n", wine_dbgstr_w(progid)); CoTaskMemFree(progid);

1 0

Alexandre Julliard : winex11: Use an init once function to register IME classes.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 7cc272cdefaa19ff2b6f0d2e961abdd840bce204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc272cdefaa19ff2b6f0d2e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:05:34 2013 +0200 winex11: Use an init once function to register IME classes. --- dlls/winex11.drv/ime.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index aa6c7dd..cd40f77 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -122,14 +122,10 @@ static BOOL UnlockRealIMC(HIMC hIMC) return FALSE; } -static void IME_RegisterClasses(void) +static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **context ) { - static BOOL done = FALSE; WNDCLASSW wndClass; - if (done) return; - done = TRUE; - ZeroMemory(&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; wndClass.lpfnWndProc = IME_WindowProc; @@ -151,6 +147,7 @@ static void IME_RegisterClasses(void) WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + return TRUE; } static HIMCC ImeCreateBlankCompStr(void) @@ -561,8 +558,10 @@ static void IME_AddToSelected(HIMC hIMC) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + TRACE("\n"); - IME_RegisterClasses(); + InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE;

1 0

Alexandre Julliard : winemac: Use an init once function to register IME classes.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 639c202ea7113f6e2b49733dd7041bc158284943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639c202ea7113f6e2b49733dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:05:39 2013 +0200 winemac: Use an init once function to register IME classes. --- dlls/winemac.drv/ime.c | 50 +++++++++++++++++++++++--------------------- dlls/winemac.drv/macdrv.h | 2 - 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 53a10f3..2c74f6e 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -563,25 +563,6 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) UnlockRealIMC(hIMC); } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) -{ - TRACE("\n"); - IME_RegisterClasses( macdrv_module ); - lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); - lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; - lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; - lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; - lpIMEInfo->fdwUICaps = UI_CAP_2700; - /* Tell App we cannot accept ImeSetCompositionString calls */ - /* FIXME: Can we? */ - lpIMEInfo->fdwSCSCaps = 0; - lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; - - lstrcpyW(lpszUIClass, UI_CLASS_NAME); - - return TRUE; -} - BOOL WINAPI ImeConfigure(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData); @@ -1394,10 +1375,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return rc; } - -/* Interfaces to other parts of the Mac driver */ - -void IME_RegisterClasses(HINSTANCE hImeInst) +static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **context ) { WNDCLASSW wndClass; ZeroMemory(&wndClass, sizeof(WNDCLASSW)); @@ -1405,7 +1383,7 @@ void IME_RegisterClasses(HINSTANCE hImeInst) wndClass.lpfnWndProc = (WNDPROC) IME_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); - wndClass.hInstance = hImeInst; + wndClass.hInstance = macdrv_module; wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); @@ -1421,8 +1399,32 @@ void IME_RegisterClasses(HINSTANCE hImeInst) WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + return TRUE; } +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + TRACE("\n"); + InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); + lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); + lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; + lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; + lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; + lpIMEInfo->fdwUICaps = UI_CAP_2700; + /* Tell App we cannot accept ImeSetCompositionString calls */ + /* FIXME: Can we? */ + lpIMEInfo->fdwSCSCaps = 0; + lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; + + lstrcpyW(lpszUIClass, UI_CLASS_NAME); + + return TRUE; +} + +/* Interfaces to other parts of the Mac driver */ + /*********************************************************************** * macdrv_im_set_text */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 24c3f65..98ecb90 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -210,8 +210,6 @@ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HI * Mac IME driver */ -extern void IME_RegisterClasses(HINSTANCE hImeInst) DECLSPEC_HIDDEN; - extern BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Get rid of the CreateCursorIcon driver entry point.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: a897e13fba192ad2460b02975ac8419b588066db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a897e13fba192ad2460b02975… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:08:21 2013 +0200 user32: Get rid of the CreateCursorIcon driver entry point. --- dlls/user32/cursoricon.c | 3 --- dlls/user32/driver.c | 12 ------------ dlls/user32/user_private.h | 1 - 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 93aa0c6..53089c2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -972,7 +972,6 @@ done: list_add_head( &icon_cache, &info->entry ); } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1609,7 +1608,6 @@ HICON WINAPI CopyIcon( HICON hIcon ) release_icon_ptr( hNew, ptrNew ); } release_icon_ptr( hIcon, ptrOld ); - if (hNew) USER_Driver->pCreateCursorIcon( hNew ); return hNew; } @@ -2212,7 +2210,6 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } return hObj; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6a6241c..4cfc552 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -67,7 +67,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(UnloadKeyboardLayout); GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(VkKeyScanEx); - GET_USER_FUNC(CreateCursorIcon); GET_USER_FUNC(DestroyCursorIcon); GET_USER_FUNC(SetCursor); GET_USER_FUNC(GetCursorPos); @@ -205,10 +204,6 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -1; } -static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor ) -{ -} - static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) { } @@ -439,7 +434,6 @@ static USER_DRIVER null_driver = nulldrv_UnregisterHotKey, nulldrv_VkKeyScanEx, /* cursor/icon functions */ - nulldrv_CreateCursorIcon, nulldrv_DestroyCursorIcon, nulldrv_SetCursor, nulldrv_GetCursorPos, @@ -559,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor ) -{ - load_driver()->pCreateCursorIcon( cursor ); -} - static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) { load_driver()->pDestroyCursorIcon( cursor ); @@ -787,7 +776,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - loaderdrv_CreateCursorIcon, loaderdrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0f86bdf..9daa9f4 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -73,7 +73,6 @@ typedef struct tagUSER_DRIVER { void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); /* cursor/icon functions */ - void (CDECL *pCreateCursorIcon)(HCURSOR); void (CDECL *pDestroyCursorIcon)(HCURSOR); void (CDECL *pSetCursor)(HCURSOR); BOOL (CDECL *pGetCursorPos)(LPPOINT);

1 0