wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Hans Leidekker : msi: Fix handling of single quoted column names in SELECT queries.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: ca49aae61ec31b8f26ce8b3e0b9317a312819940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca49aae61ec31b8f26ce8b3e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:54:26 2011 +0100 msi: Fix handling of single quoted column names in SELECT queries. --- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 2 + dlls/msi/select.c | 39 ++++++-- dlls/msi/sql.y | 59 ++++++++++-- dlls/msi/tests/db.c | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 331 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca49aae61ec31b8f26ce8…

1 0

Hans Leidekker : msi: Use a common function to validate a product ID.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: bde25b2cb4296540ea8378f45e06adcc40bebdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde25b2cb4296540ea8378f45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:53:54 2011 +0100 msi: Use a common function to validate a product ID. --- dlls/msi/action.c | 8 ++++++-- dlls/msi/events.c | 15 +-------------- dlls/msi/msipriv.h | 1 + 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 77749d8..8505507 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6871,7 +6871,7 @@ static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) return rc; } -static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) +UINT msi_validate_product_id( MSIPACKAGE *package ) { LPWSTR key, template, id; UINT r = ERROR_SUCCESS; @@ -6884,7 +6884,6 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) } template = msi_dup_property( package->db, szPIDTemplate ); key = msi_dup_property( package->db, szPIDKEY ); - if (key && template) { FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); @@ -6895,6 +6894,11 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) return r; } +static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) +{ + return msi_validate_product_id( package ); +} + static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) { TRACE("\n"); diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 2c0431d..785d98a 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -389,20 +389,7 @@ static UINT ControlEvent_Reinstall( MSIPACKAGE *package, LPCWSTR argument, static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog) { - LPWSTR key, template; - UINT ret = ERROR_SUCCESS; - - template = msi_dup_property( package->db, szPIDTemplate ); - key = msi_dup_property( package->db, szPIDKEY ); - - if (key && template) - { - FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); - ret = msi_set_property( package->db, szProductID, key ); - } - msi_free( template ); - msi_free( key ); - return ret; + return msi_validate_product_id( package ); } static const WCHAR end_dialogW[] = {'E','n','d','D','i','a','l','o','g',0}; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 619cfcb..dd8bd82 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -786,6 +786,7 @@ extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT extern INSTALLSTATE msi_get_feature_action( MSIPACKAGE *package, MSIFEATURE *feature ) DECLSPEC_HIDDEN; extern UINT msi_load_all_components( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_load_all_features( MSIPACKAGE *package ) DECLSPEC_HIDDEN; +extern UINT msi_validate_product_id( MSIPACKAGE *package ) DECLSPEC_HIDDEN; /* record internals */ extern void MSI_CloseRecord( MSIOBJECTHDR * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Fix changing media for normal files.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: ad4f747fa68fe185854e6fbbc6f0fec62e762e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4f747fa68fe185854e6fbbc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:53:34 2011 +0100 msi: Fix changing media for normal files. --- dlls/msi/files.c | 4 +- dlls/msi/media.c | 94 ++++++++++++++++++++++++---------------------------- dlls/msi/msipriv.h | 2 +- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index c6282f7..f755d92 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -331,7 +331,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (!file->Component->Enabled) continue; if (file->state != msifs_hashmatch && - (rc = ready_media( package, file->Sequence, file->IsCompressed, mi ))) + (rc = ready_media( package, file->IsCompressed, mi ))) { ERR("Failed to ready media for %s\n", debugstr_w(file->File)); goto done; @@ -512,7 +512,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) { MSICABDATA data; - rc = ready_media( package, patch->Sequence, TRUE, mi ); + rc = ready_media( package, TRUE, mi ); if (rc != ERROR_SUCCESS) { ERR("Failed to ready media for %s\n", debugstr_w(file->File)); diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 9162c3b..f8ed27e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -838,79 +838,71 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) return ERROR_FUNCTION_FAILED; } -UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi) +UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) { - UINT rc = ERROR_SUCCESS; - WCHAR *cabinet_file; + UINT rc; + WCHAR *cabinet_file = NULL; /* media info for continuous cabinet is already loaded */ - if (mi->is_continuous) - return ERROR_SUCCESS; - - /* cabinet is internal, no checks needed */ - if (!mi->cabinet || mi->cabinet[0] == '#') - return ERROR_SUCCESS; - - cabinet_file = get_cabinet_filename(mi); + if (mi->is_continuous) return ERROR_SUCCESS; - /* package should be downloaded */ - if (IsCompressed && - GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES && - package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + if (mi->cabinet) { - WCHAR temppath[MAX_PATH], *p; + /* cabinet is internal, no checks needed */ + if (mi->cabinet[0] == '#') return ERROR_SUCCESS; - rc = msi_download_file(cabinet_file, temppath); - if (rc != ERROR_SUCCESS) + if (!(cabinet_file = get_cabinet_filename( mi ))) return ERROR_OUTOFMEMORY; + + /* package should be downloaded */ + if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES && + package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) { - ERR("Failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); - msi_free(cabinet_file); - return rc; - } - if ((p = strrchrW(temppath, '\\'))) *p = 0; - strcpyW(mi->sourcedir, temppath); - PathAddBackslashW(mi->sourcedir); - msi_free(mi->cabinet); - mi->cabinet = strdupW(p + 1); + WCHAR temppath[MAX_PATH], *p; - msi_free(cabinet_file); - return ERROR_SUCCESS; + if ((rc = msi_download_file( cabinet_file, temppath )) != ERROR_SUCCESS) + { + ERR("failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); + msi_free( cabinet_file ); + return rc; + } + if ((p = strrchrW( temppath, '\\' ))) *p = 0; + strcpyW( mi->sourcedir, temppath ); + PathAddBackslashW( mi->sourcedir ); + msi_free( mi->cabinet ); + mi->cabinet = strdupW( p + 1 ); + msi_free( cabinet_file ); + return ERROR_SUCCESS; + } } - /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1 && - strcmpW( mi->first_volume, mi->volume_label )) + if (mi->volume_label && mi->disk_id > 1 && strcmpW( mi->first_volume, mi->volume_label )) { - LPWSTR source = msi_dup_property(package->db, szSourceDir); - BOOL matches; - - matches = source_matches_volume(mi, source); - msi_free(source); + WCHAR *source = msi_dup_property( package->db, szSourceDir ); + BOOL match = source_matches_volume( mi, source ); + msi_free( source ); - if ((mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) && !matches) + if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) { - rc = msi_change_media(package, mi); - if (rc != ERROR_SUCCESS) + if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) { - msi_free(cabinet_file); + msi_free( cabinet_file ); return rc; } } } - - if (IsCompressed && - GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) + if (mi->cabinet) { - rc = find_published_source(package, mi); - if (rc != ERROR_SUCCESS) + if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES) { - ERR("Cabinet not found: %s\n", debugstr_w(cabinet_file)); - msi_free(cabinet_file); - return ERROR_INSTALL_FAILURE; + if ((rc = find_published_source( package, mi )) != ERROR_SUCCESS) + { + ERR("cabinet not found: %s\n", debugstr_w(cabinet_file)); + msi_free( cabinet_file ); + return ERROR_INSTALL_FAILURE; + } } } - - msi_free(cabinet_file); + msi_free( cabinet_file ); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2ebac31..619cfcb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1041,7 +1041,7 @@ typedef struct PVOID user; } MSICABDATA; -extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; +extern UINT ready_media(MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; extern void msi_free_media_info(MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data) DECLSPEC_HIDDEN;

1 0

Erich Hoover : hhctrl.ocx: Fix HTML Help crashing on non-chm files.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 4ce176af61596b7e18ef54b713a1306b1f49aa48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce176af61596b7e18ef54b71… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Dec 22 12:12:06 2011 -0700 hhctrl.ocx: Fix HTML Help crashing on non-chm files. --- dlls/hhctrl.ocx/index.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index f119bbc..aa73bc9 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -277,6 +277,7 @@ void ReleaseIndex(HHInfo *info) IndexItem *item = info->index, *next; int i; + if(!item) return; /* Note: item->merge is identical for all items, only free once */ heap_free(item->merge.chm_file); heap_free(item->merge.chm_index);

1 0

Aric Stewart : usp10: Add currency scripts to match windows.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 91e0f56c05dcff14d3c16d2b7c4b88babffb6fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e0f56c05dcff14d3c16d2b7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 22 13:05:11 2011 -0600 usp10: Add currency scripts to match windows. --- dlls/usp10/shape.c | 3 +++ dlls/usp10/usp10.c | 27 ++++++++++++++++++++++++++- dlls/usp10/usp10_internal.h | 4 ++++ 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7f23296..91f706b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -715,6 +715,9 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, {{ no_features, 0}, NULL, "math", "", NULL, NULL}, + {{ hebrew_features, 1}, NULL, "hebr", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn" , "", NULL, NULL}, + {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14674a7..2e2efb5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -624,6 +624,18 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','a','t','h'), {'C','a','m','b','r','i','a',' ','M','a','t','h'}}, + {{Script_Hebrew_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_HEBREW, 0, 1, 0, 0, HEBREW_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('h','e','b','r'), + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, + {{Script_Vietnamese_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_VIETNAMESE, 0, 0, 0, 0, VIETNAMESE_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('l','a','t','n'), + {0}}, + {{Script_Thai_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_THAI, 0, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','h','a','i'), + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -667,7 +679,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[72].props, &scriptInformation[73].props, &scriptInformation[74].props, &scriptInformation[75].props, &scriptInformation[76].props, &scriptInformation[77].props, - &scriptInformation[78].props + &scriptInformation[78].props, &scriptInformation[79].props, + &scriptInformation[80].props, &scriptInformation[81].props }; typedef struct { @@ -830,6 +843,18 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; + /* Currency Symboles by Unicode point */ + switch (str[index]) + { + case 0x09f2: + case 0x09f3: return Script_Bengali_Currency; + case 0x0af1: return Script_Gujarati_Currency; + case 0x0e3f: return Script_Thai_Currency; + case 0x20aa: return Script_Hebrew_Currency; + case 0x20ab: return Script_Vietnamese_Currency; + case 0xfb29: return Script_Hebrew_Currency; + } + GetStringTypeW(CT_CTYPE1, &str[index], 1, &type); if (type == 0) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 559a0bc..fb98377 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -115,6 +115,10 @@ #define Script_Osmanya_Numeric 77 /* Unicode Chapter 15 : Plane 1 */ #define Script_MathAlpha 78 +/* Additional Currency Scripts */ +#define Script_Hebrew_Currency 79 +#define Script_Vietnamese_Currency 80 +#define Script_Thai_Currency 81 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Nikolay Sivov : msxml3: IXSL* implementations do not depend on libxml2.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 70fe8d5266163517e0934129ad50238418a72307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fe8d5266163517e0934129a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 23 01:57:12 2011 +0300 msxml3: IXSL* implementations do not depend on libxml2. --- dlls/msxml3/stylesheet.c | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 716ebba..5ee71af 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -40,9 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -#ifdef HAVE_LIBXML2 - -typedef struct _xsltemplate +typedef struct { DispatchEx dispex; IXSLTemplate IXSLTemplate_iface; @@ -51,7 +49,7 @@ typedef struct _xsltemplate IXMLDOMNode *node; } xsltemplate; -typedef struct _xslprocessor +typedef struct { DispatchEx dispex; IXSLProcessor IXSLProcessor_iface; @@ -115,15 +113,17 @@ static HRESULT WINAPI xsltemplate_QueryInterface( static ULONG WINAPI xsltemplate_AddRef( IXSLTemplate *iface ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { if (This->node) IXMLDOMNode_Release( This->node ); @@ -220,7 +220,6 @@ static const struct IXSLTemplateVtbl XSLTemplateVtbl = xsltemplate_GetTypeInfo, xsltemplate_GetIDsOfNames, xsltemplate_Invoke, - xsltemplate_putref_stylesheet, xsltemplate_get_stylesheet, xsltemplate_createProcessor @@ -295,15 +294,17 @@ static HRESULT WINAPI xslprocessor_QueryInterface( static ULONG WINAPI xslprocessor_AddRef( IXSLProcessor *iface ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { if (This->input) IXMLDOMNode_Release(This->input); @@ -591,7 +592,6 @@ static const struct IXSLProcessorVtbl XSLProcessorVtbl = xslprocessor_GetTypeInfo, xslprocessor_GetIDsOfNames, xslprocessor_Invoke, - xslprocessor_put_input, xslprocessor_get_input, xslprocessor_get_ownerTemplate, @@ -645,14 +645,3 @@ HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) return S_OK; } - -#else - -HRESULT XSLTemplate_create(IUnknown *pUnkOuter, void **ppObj) -{ - MESSAGE("This program tried to use a XSLTemplate object, but\n" - "libxml2 support was not present at compile time.\n"); - return E_NOTIMPL; -} - -#endif

1 0

Henri Verbeet : ddraw: Fix the title and class name for the auto ddraw device window.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 387a5f632cde39a15428285c53e4c063cc2121f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387a5f632cde39a15428285c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 22 21:51:22 2011 +0100 ddraw: Fix the title and class name for the auto ddraw device window. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/tests/ddraw1.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 21107f9..28122f8 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -831,7 +831,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_NOFOCUSWINDOW; } - device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DDraw device window", + device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DirectDrawDeviceWnd", WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), NULL, NULL, NULL, NULL); if (!device_window) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5d27703..df96402 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -120,7 +120,7 @@ struct IDirectDrawImpl UINT numConvertedDecls, declArraySize; }; -#define DDRAW_WINDOW_CLASS_NAME "ddraw_wc" +#define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" HRESULT ddraw_init(IDirectDrawImpl *ddraw, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b2f3394..54a1569 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -91,7 +91,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -101,7 +101,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -118,7 +118,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw_Release(ddraw); DestroyWindow(focus_window); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 824250a..1af341e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -98,7 +98,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -108,7 +108,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -125,7 +125,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw2_Release(ddraw); DestroyWindow(focus_window); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ead2aa3..680c6ac 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -394,7 +394,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -404,7 +404,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -421,7 +421,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw4_Release(ddraw); DestroyWindow(focus_window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c400ea..89974e9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -387,7 +387,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -397,7 +397,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -414,7 +414,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw7_Release(ddraw); DestroyWindow(focus_window);

1 0

Henri Verbeet : ddraw: Handle the special DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW combination .
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 3e6313050bff97a720026735ca2f267575edeb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6313050bff97a720026735c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 22 21:51:21 2011 +0100 ddraw: Handle the special DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW combination. --- dlls/ddraw/ddraw.c | 42 ++++++++++++++++++++++++++++++------------ dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 364e74f..21107f9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -788,21 +788,20 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } /* Handle those levels first which set various hwnds */ - if(cooplevel & DDSCL_SETFOCUSWINDOW) + if ((cooplevel & DDSCL_SETFOCUSWINDOW) && !(cooplevel & DDSCL_CREATEDEVICEWINDOW)) { /* This isn't compatible with a lot of flags */ - if(cooplevel & ( DDSCL_MULTITHREADED | - DDSCL_CREATEDEVICEWINDOW | - DDSCL_FPUSETUP | - DDSCL_FPUPRESERVE | - DDSCL_ALLOWREBOOT | - DDSCL_ALLOWMODEX | - DDSCL_SETDEVICEWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE | - DDSCL_FULLSCREEN ) ) + if (cooplevel & (DDSCL_MULTITHREADED + | DDSCL_FPUSETUP + | DDSCL_FPUPRESERVE + | DDSCL_ALLOWREBOOT + | DDSCL_ALLOWMODEX + | DDSCL_SETDEVICEWINDOW + | DDSCL_NORMAL + | DDSCL_EXCLUSIVE + | DDSCL_FULLSCREEN)) { - TRACE("Called with incompatible flags, returning DDERR_INVALIDPARAMS\n"); + WARN("Called with incompatible flags, returning DDERR_INVALIDPARAMS.\n"); wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } @@ -845,7 +844,26 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, ShowWindow(device_window, SW_SHOW); TRACE("Created a device window %p.\n", device_window); + /* Native apparently leaks the created device window if setting the + * focus window below fails. */ + This->cooperative_level |= DDSCL_CREATEDEVICEWINDOW; This->devicewindow = device_window; + + if (cooplevel & DDSCL_SETFOCUSWINDOW) + { + if (!hwnd) + { + wined3d_mutex_unlock(); + return DDERR_NOHWND; + } + + if (FAILED(hr = ddraw_set_focus_window(This, hwnd))) + { + wined3d_mutex_unlock(); + return hr; + } + } + hwnd = device_window; } } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9640bf0..b2f3394 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -89,7 +89,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -99,7 +99,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e3e9e86..824250a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -96,7 +96,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -106,7 +106,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 48f5768..ead2aa3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -392,7 +392,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -402,7 +402,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6448ea6..7c400ea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -385,7 +385,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -395,7 +395,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n");

1 0

Henri Verbeet : ddraw: Properly handle DDSCL_CREATEDEVICEWINDOW.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: d8153e5364ed9044692ea77c128144e561d6dcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8153e5364ed9044692ea77c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 22 21:51:20 2011 +0100 ddraw: Properly handle DDSCL_CREATEDEVICEWINDOW. --- dlls/ddraw/ddraw.c | 57 ++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw1.c | 6 ++-- dlls/ddraw/tests/ddraw2.c | 6 ++-- dlls/ddraw/tests/ddraw4.c | 6 ++-- dlls/ddraw/tests/ddraw7.c | 6 ++-- 5 files changed, 43 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8153e5364ed9044692ea…

1 0

Henri Verbeet : ddraw: Clear the focus and device windows on DDSCL_NORMAL.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: a5af10e12bd1ef0517ec60dde47c30136d45d9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5af10e12bd1ef0517ec60dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 22 21:51:19 2011 +0100 ddraw: Clear the focus and device windows on DDSCL_NORMAL. --- dlls/ddraw/ddraw.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 52015c1..112240d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -606,13 +606,6 @@ static HRESULT ddraw_set_focus_window(IDirectDrawImpl *ddraw, HWND window) /* Use the focus window for drawing too. */ ddraw->dest_window = ddraw->focuswindow; - /* Destroy the device window, if we have one. */ - if (ddraw->devicewindow) - { - DestroyWindow(ddraw->devicewindow); - ddraw->devicewindow = NULL; - } - return DD_OK; } @@ -828,6 +821,13 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } } + else + { + if (This->cooperative_level & DDSCL_CREATEDEVICEWINDOW) + DestroyWindow(This->devicewindow); + This->devicewindow = NULL; + This->focuswindow = NULL; + } if ((This->cooperative_level & DDSCL_EXCLUSIVE) && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE)))

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011