wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

André Hentschel : po: Update German translation.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: f2b655f1662c5c46754b3b71c413c04ed9ec1075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b655f1662c5c46754b3b71c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 10 19:53:49 2011 +0100 po: Update German translation. --- po/de.po | 83 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 38 insertions(+), 45 deletions(-) diff --git a/po/de.po b/po/de.po index f4ce8c7..4939f4e 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-01 21:21+0100\n" +"PO-Revision-Date: 2011-12-10 19:51+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -782,14 +782,12 @@ msgid "&Open" msgstr "&Öffnen" #: comdlg32.rc:495 -#, fuzzy msgid "File name:" -msgstr "&Dateiname:" +msgstr "Dateiname:" #: comdlg32.rc:498 -#, fuzzy msgid "Files of type:" -msgstr "Datei&typen" +msgstr "Dateien vom Typ:" #: comdlg32.rc:29 msgid "&About FolderPicker Test" @@ -2209,7 +2207,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "Willkommen" #: cryptui.rc:283 -#, fuzzy msgid "" "This wizard helps you import certificates, certificate revocation lists, and " "certificate trust lists from a file to a certificate store.\n" @@ -2221,10 +2218,15 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und " +"Zertifikatsvertrauenslisten aus einer Datei zu importieren.\n" +"\n" "Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es " -"kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. " +"kann auch fÃ¼r die Authentifizierung und zum Unterzeichnen genutzt werden. " "Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten " -"und Zertifikatsvertrauenslisten." +"und Zertifikatsvertrauenslisten.\n" +"\n" +"Klicken Sie Weiter um fortzufahren." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2340,7 +2342,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "Willkommen" #: cryptui.rc:373 -#, fuzzy msgid "" "This wizard helps you export certificates, certificate revocation lists, and " "certificate trust lists from a certificate store to a file.\n" @@ -2352,10 +2353,15 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und " +"Zertifikatsvertrauenslisten in eine Datei zu exportieren.\n" +"\n" "Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es " "kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. " "Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten " -"und Zertifikatsvertrauenslisten." +"und Zertifikatsvertrauenslisten.\n" +"\n" +"Klicken Sie Weiter um fortzufahren." #: cryptui.rc:381 msgid "" @@ -3003,9 +3009,8 @@ msgid "Mapping" msgstr "Zuordnung" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "Zugewiesene sortieren" +msgstr "Zeige Zugewiesene zuerst" #: dinput.rc:34 msgid "Action" @@ -9954,19 +9959,16 @@ msgid "N" msgstr "N" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "Verknüpfung für Dateiendung %s fehlt\n" +msgstr "Verknüpfung für Dateiendung %1 fehlt\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "Kein Befehl zum Öffnen für Dateityp '%s'\n" +msgstr "Kein Befehl zum Öffnen für Dateityp '%1'\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "%s überschreiben" +msgstr "%1 überschreiben" #: cmd.rc:297 msgid "More..." @@ -9987,23 +9989,20 @@ msgid "Syntax error\n" msgstr "Syntaxfehler\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "Hilfe für %s ist nicht verfügbar\n" +msgstr "Hilfe für %1 ist nicht verfügbar\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "Das Sprungziel von GOTO wurde nicht gefunden\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "Aktuelles Datum ist %s\n" +msgstr "Aktuelles Datum ist %1\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "Aktuelle Zeit ist %s\n" +msgstr "Aktuelle Zeit ist %1\n" #: cmd.rc:307 msgid "Enter new date: " @@ -10014,9 +10013,8 @@ msgid "Enter new time: " msgstr "Geben Sie die neue Zeit ein: " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "Die Umgebungsvariable %s ist nicht definiert\n" +msgstr "Die Umgebungsvariable %1 ist nicht definiert\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -10032,19 +10030,16 @@ msgid "A" msgstr "A" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, löschen" +msgstr "%1, löschen" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "Echo ist %s\n" +msgstr "Echo ist %1\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "Verify ist %s\n" +msgstr "Verify ist %1\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -10055,14 +10050,13 @@ msgid "Parameter error\n" msgstr "Parameterfehler\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume in drive %1!c! is %2\n" "Volume Serial Number is %3!04x!-%4!04x!\n" "\n" msgstr "" -"Volume in Laufwerk %c ist %s\n" -"Volumeseriennummer ist %04x-%04x\n" +"Volume in Laufwerk %1!c! ist %2\n" +"Volumeseriennummer ist %3!04x!-%4!04x!\n" "\n" #: cmd.rc:319 @@ -10082,9 +10076,8 @@ msgid "Wine Command Prompt" msgstr "Wine Befehlsprozessor" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "CMD Version %s\n" +msgstr "CMD Version %1!S!\n" #: cmd.rc:324 msgid "More? " @@ -12727,7 +12720,7 @@ msgstr "&Erweitert" #: winecfg.rc:251 msgid "De&vice:" -msgstr "De&vice:" +msgstr "Ge&rät:" #: winecfg.rc:253 msgid "Bro&wse..." @@ -12747,31 +12740,31 @@ msgstr "Zeige D&ot-Dateien an" #: winecfg.rc:267 msgid " Driver Diagnostics " -msgstr " Driver Diagnostics " +msgstr " Treiber Diagnose " #: winecfg.rc:269 msgid " Defaults " -msgstr " Defaults " +msgstr " Standards " #: winecfg.rc:270 msgid "Output device:" -msgstr "Output device:" +msgstr "Ausgabegerät:" #: winecfg.rc:271 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "Sprachausgabegerät:" #: winecfg.rc:272 msgid "Input device:" -msgstr "Input device:" +msgstr "Eingabegerät:" #: winecfg.rc:273 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "Spracheingabegerät:" #: winecfg.rc:278 msgid "&Test Sound" -msgstr "&Test Sound" +msgstr "Sound &testen" #: winecfg.rc:285 msgid " Appearance "

1 0

Juan Lang : wintrust: Don't dereference a potentially NULL pointer.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: ba78b54820b5a5cdb4cdcfb5556b35781a825fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba78b54820b5a5cdb4cdcfb55… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Dec 11 08:36:55 2011 -0800 wintrust: Don't dereference a potentially NULL pointer. --- dlls/wintrust/softpub.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 0f54c0b..358ba01 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -1207,7 +1207,8 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) CryptMsgClose(data->hMsg); if (data->fOpenedFile && - data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE) + data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE && + data->pWintrustData->u.pFile) CloseHandle(data->pWintrustData->u.pFile->hFile); return S_OK;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPRIMITIVETYPE typedef.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: e6a4a866080dd5cd0800f991ceae0068ae99d552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a4a866080dd5cd0800f991c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:32 2011 +0100 wined3d: Get rid of the WINED3DPRIMITIVETYPE typedef. --- dlls/d3d10core/device.c | 4 +- dlls/wined3d/device.c | 50 ++++++++++++++++++++-------------------- dlls/wined3d/utils.c | 28 +++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 34 +++++++++++++------------- 5 files changed, 59 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6a4a866080dd5cd0800f…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DLIGHTTYPE typedef.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: b55b683b083ee47f07d0fe453addef17d41138b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55b683b083ee47f07d0fe453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:31 2011 +0100 wined3d: Get rid of the WINED3DLIGHTTYPE typedef. --- dlls/wined3d/device.c | 18 +++++++++--------- dlls/wined3d/state.c | 6 +++--- include/wine/wined3d.h | 17 ++++++++--------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74b7a36..24130cb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* Define the default light parameters as specified by MSDN. */ const struct wined3d_light WINED3D_default_light = { - WINED3DLIGHT_DIRECTIONAL, /* Type */ + WINED3D_LIGHT_DIRECTIONAL, /* Type */ { 1.0f, 1.0f, 1.0f, 0.0f }, /* Diffuse r,g,b,a */ { 0.0f, 0.0f, 0.0f, 0.0f }, /* Specular r,g,b,a */ { 0.0f, 0.0f, 0.0f, 0.0f }, /* Ambient r,g,b,a, */ @@ -1898,10 +1898,10 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, switch (light->type) { - case WINED3DLIGHT_POINT: - case WINED3DLIGHT_SPOT: - case WINED3DLIGHT_PARALLELPOINT: - case WINED3DLIGHT_GLSPOT: + case WINED3D_LIGHT_POINT: + case WINED3D_LIGHT_SPOT: + case WINED3D_LIGHT_PARALLELPOINT: + case WINED3D_LIGHT_GLSPOT: /* Incorrect attenuation values can cause the gl driver to crash. * Happens with Need for speed most wanted. */ if (light->attenuation0 < 0.0f || light->attenuation1 < 0.0f || light->attenuation2 < 0.0f) @@ -1911,7 +1911,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, } break; - case WINED3DLIGHT_DIRECTIONAL: + case WINED3D_LIGHT_DIRECTIONAL: /* Ignores attenuation */ break; @@ -1958,7 +1958,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, switch (light->type) { - case WINED3DLIGHT_POINT: + case WINED3D_LIGHT_POINT: /* Position */ object->lightPosn[0] = light->position.x; object->lightPosn[1] = light->position.y; @@ -1968,7 +1968,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, /* FIXME: Range */ break; - case WINED3DLIGHT_DIRECTIONAL: + case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ object->lightPosn[0] = -light->direction.x; object->lightPosn[1] = -light->direction.y; @@ -1978,7 +1978,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, object->cutoff = 180.0f; break; - case WINED3DLIGHT_SPOT: + case WINED3D_LIGHT_SPOT: /* Position */ object->lightPosn[0] = light->position.x; object->lightPosn[1] = light->position.y; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e5fbb61..d7b86dc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4688,7 +4688,7 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s switch (lightInfo->OriginalParms.type) { - case WINED3DLIGHT_POINT: + case WINED3D_LIGHT_POINT: /* Position */ glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); checkGLcall("glLightfv"); @@ -4706,7 +4706,7 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s /* FIXME: Range */ break; - case WINED3DLIGHT_SPOT: + case WINED3D_LIGHT_SPOT: /* Position */ glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); checkGLcall("glLightfv"); @@ -4729,7 +4729,7 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s /* FIXME: Range */ break; - case WINED3DLIGHT_DIRECTIONAL: + case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); /* Note gl uses w position of 0 for direction! */ checkGLcall("glLightfv"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4f5998c..6af1485 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -65,15 +65,14 @@ #define WINEDDERR_NOCLIPLIST MAKE_WINED3DHRESULT(205) #define WINEDDERR_OVERLAYNOTVISIBLE MAKE_WINED3DHRESULT(577) -typedef enum _WINED3DLIGHTTYPE +enum wined3d_light_type { - WINED3DLIGHT_POINT = 1, - WINED3DLIGHT_SPOT = 2, - WINED3DLIGHT_DIRECTIONAL = 3, - WINED3DLIGHT_PARALLELPOINT = 4, /* D3D7 */ - WINED3DLIGHT_GLSPOT = 5, /* D3D7 */ - WINED3DLIGHT_FORCE_DWORD = 0x7fffffff -} WINED3DLIGHTTYPE; + WINED3D_LIGHT_POINT = 1, + WINED3D_LIGHT_SPOT = 2, + WINED3D_LIGHT_DIRECTIONAL = 3, + WINED3D_LIGHT_PARALLELPOINT = 4, /* D3D7 */ + WINED3D_LIGHT_GLSPOT = 5, /* D3D7 */ +}; typedef enum _WINED3DPRIMITIVETYPE { @@ -1553,7 +1552,7 @@ struct wined3d_matrix struct wined3d_light { - WINED3DLIGHTTYPE type; + enum wined3d_light_type type; struct wined3d_color diffuse; struct wined3d_color specular; struct wined3d_color ambient;

1 0

Henri Verbeet : wined3d: Trace all swapchain_desc fields in wined3d_device_reset().
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: d806c37b4acde3685158458e8d9bb38d61a97eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d806c37b4acde3685158458e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:30 2011 +0100 wined3d: Trace all swapchain_desc fields in wined3d_device_reset(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1411ba..74b7a36 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5468,9 +5468,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("device_window %p\n", swapchain_desc->device_window); TRACE("windowed %#x\n", swapchain_desc->windowed); TRACE("enable_auto_depth_stencil %#x\n", swapchain_desc->enable_auto_depth_stencil); + if (swapchain_desc->enable_auto_depth_stencil) + TRACE("auto_depth_stencil_format %s\n", debug_d3dformat(swapchain_desc->auto_depth_stencil_format)); TRACE("flags %#x\n", swapchain_desc->flags); TRACE("refresh_rate %u\n", swapchain_desc->refresh_rate); TRACE("swap_interval %u\n", swapchain_desc->swap_interval); + TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect;

1 0

Henri Verbeet : d3d10: Add a short description to skip_dword_unknown().
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 1f0a143c3b0c0dd4e97b40efbb1e94b4a7aa74ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0a143c3b0c0dd4e97b40efb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:29 2011 +0100 d3d10: Add a short description to skip_dword_unknown(). --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 12 ++++++------ dlls/d3d10/utils.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f44afe0..e60ac9d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -252,7 +252,7 @@ static inline void write_dword(char **ptr, DWORD d) *ptr += sizeof(d); } -void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; +void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ca10ba5..350f63b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -144,7 +144,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct read_dword(&ptr, &count); TRACE("%u elements\n", count); - skip_dword_unknown(&ptr, 1); + skip_dword_unknown("shader signature", &ptr, 1); e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) @@ -825,7 +825,7 @@ static HRESULT parse_fx10_annotation(struct d3d10_effect_variable *a, const char hr = parse_fx10_variable_head(a, ptr, data); if (FAILED(hr)) return hr; - skip_dword_unknown(ptr, 1); + skip_dword_unknown("annotation", ptr, 1); /* mark the variable as annotation */ a->flag = D3D10_EFFECT_VARIABLE_ANNOTATION; @@ -1160,7 +1160,7 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); - skip_dword_unknown(ptr, 1); + skip_dword_unknown("variable", ptr, 1); read_dword(ptr, &v->flag); TRACE("Variable flag: %#x.\n", v->flag); @@ -1208,7 +1208,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - skip_dword_unknown(ptr, 1); + skip_dword_unknown("local variable", ptr, 1); switch (v->type->basetype) { @@ -1266,7 +1266,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const for (j = 0; j < object_count; ++j) { - skip_dword_unknown(ptr, 4); + skip_dword_unknown("state object attribute", ptr, 4); } } break; @@ -1363,7 +1363,7 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch read_dword(ptr, &l->type->member_count); TRACE("Local buffer member count: %#x.\n", l->type->member_count); - skip_dword_unknown(ptr, 1); + skip_dword_unknown("local buffer", ptr, 1); read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 6806e5e..6bb7d05 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -146,12 +146,12 @@ void d3d10_rb_free(void *ptr) HeapFree(GetProcessHeap(), 0, ptr); } -void skip_dword_unknown(const char **ptr, unsigned int count) +void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) { unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); for (i = 0; i < count; ++i) { read_dword(ptr, &d); @@ -191,9 +191,9 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, } /* checksum? */ - skip_dword_unknown(&ptr, 4); + skip_dword_unknown("DXBC header", &ptr, 4); - skip_dword_unknown(&ptr, 1); + skip_dword_unknown("DXBC header", &ptr, 1); read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Henri Verbeet : ddraw: Destroy the swapchain after the D3D device in DllMain().
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 9d55388156e5b95104d4c8566739ce6e9b81ba24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d55388156e5b95104d4c8566… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:28 2011 +0100 ddraw: Destroy the swapchain after the D3D device in DllMain(). --- dlls/ddraw/main.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 9d5bb53..1477913 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -941,9 +941,6 @@ DllMain(HINSTANCE hInstDLL, IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface); IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - if (ddraw->wined3d_swapchain) - ddraw_destroy_swapchain(ddraw); - /* Does a D3D device exist? Destroy it * TODO: Destroy all Vertex buffers, Lights, Materials * and execute buffers too @@ -954,6 +951,12 @@ DllMain(HINSTANCE hInstDLL, while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface)); } + /* Destroy the swapchain after any 3D device. The 3D device + * cleanup code needs a swapchain. Specifically, it tries to + * set the current render target to the front buffer. */ + if (ddraw->wined3d_swapchain) + ddraw_destroy_swapchain(ddraw); + /* Try to release the objects * Do an EnumSurfaces to find any hanging surfaces */

1 0

Nikolay Sivov : msxml3: IDispatchEx support for MXNamespaceManager.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: e191b051b18df52f2e61bb9cfa3f4891d56852c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e191b051b18df52f2e61bb9cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 14:31:05 2011 +0300 msxml3: IDispatchEx support for MXNamespaceManager. --- dlls/msxml3/mxnamespace.c | 96 ++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e191b051b18df52f2e61b…

1 0

Nikolay Sivov : msxml3: Use IXMLDOMDocument3 as a latest interface version.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 01ed475c7c277ac4068e942f925967e4b3469b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ed475c7c277ac4068e942f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 14:02:18 2011 +0300 msxml3: Use IXMLDOMDocument3 as a latest interface version. --- dlls/msxml3/attribute.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index aec1679..58be87d 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -432,17 +432,17 @@ static HRESULT WINAPI domattr_get_nodeTypedValue( hr = IXMLDOMAttribute_get_ownerDocument(iface, &doc); if (hr == S_OK) { - IXMLDOMDocument2 *doc2; + IXMLDOMDocument3 *doc3; - hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument2, (void**)&doc2); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument3, (void**)&doc3); IXMLDOMDocument_Release(doc); if (hr == S_OK) { VARIANT schemas; - hr = IXMLDOMDocument2_get_schemas(doc2, &schemas); - IXMLDOMDocument2_Release(doc2); + hr = IXMLDOMDocument3_get_schemas(doc3, &schemas); + IXMLDOMDocument3_Release(doc3); if (hr != S_OK) return IXMLDOMAttribute_get_value(iface, value);

1 0

Nikolay Sivov : msxml3: Added IDispatchEx support for IXMLDOMSchemaCollection2.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: ae6ef458117b45fe9747806acdd1ed1d4848d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6ef458117b45fe9747806ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 13:58:24 2011 +0300 msxml3: Added IDispatchEx support for IXMLDOMSchemaCollection2. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 71 ++++++++++++++++--------------------------- dlls/msxml3/tests/schema.c | 66 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 45 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 529fd96..5114222 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -129,6 +129,7 @@ static tid_id_t tid_ids[] = { { &IID_IXMLDOMParseError, LibXml2 }, { &IID_IXMLDOMProcessingInstruction, LibXml2 }, { &IID_IXMLDOMSchemaCollection, LibXml2 }, + { &IID_IXMLDOMSchemaCollection2, LibXml2 }, { &IID_IXMLDOMSelection, LibXml2 }, { &IID_IXMLDOMText, LibXml2 }, { &IID_IXMLElement, LibXml }, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index bb517a7..cba00bb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -56,6 +56,7 @@ typedef enum tid_t { IXMLDOMParseError_tid, IXMLDOMProcessingInstruction_tid, IXMLDOMSchemaCollection_tid, + IXMLDOMSchemaCollection2_tid, IXMLDOMSelection_tid, IXMLDOMText_tid, IXMLElement_tid, diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index aff763e..7473dbb 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -89,6 +89,7 @@ typedef enum _SCHEMA_TYPE { typedef struct { + DispatchEx dispex; IXMLDOMSchemaCollection2 IXMLDOMSchemaCollection2_iface; LONG ref; @@ -961,6 +962,10 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -995,6 +1000,7 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface) if (ref == 0) { xmlHashFree(This->cache, cache_free); + release_dispex(&This->dispex); heap_free(This); } @@ -1005,25 +1011,15 @@ static HRESULT WINAPI schema_cache_GetTypeInfoCount(IXMLDOMSchemaCollection2* if UINT* pctinfo) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI schema_cache_GetTypeInfo(IXMLDOMSchemaCollection2* iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - HRESULT hr; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IXMLDOMSchemaCollection_tid, ppTInfo); - - return hr; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI schema_cache_GetIDsOfNames(IXMLDOMSchemaCollection2* iface, @@ -1031,23 +1027,8 @@ static HRESULT WINAPI schema_cache_GetIDsOfNames(IXMLDOMSchemaCollection2* iface UINT cNames, LCID lcid, DISPID* rgDispId) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - ITypeInfo* typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, @@ -1057,21 +1038,8 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, UINT* puArgErr) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - ITypeInfo* typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMSchemaCollection2_iface.lpVtbl, dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri, VARIANT var) @@ -1437,6 +1405,18 @@ XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node) return dt; } +static const tid_t schemacache_iface_tids[] = { + IXMLDOMSchemaCollection2_tid, + 0 +}; + +static dispex_static_data_t schemacache_dispex = { + NULL, + IXMLDOMSchemaCollection2_tid, + NULL, + schemacache_iface_tids +}; + HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) { schema_cache* This = heap_alloc(sizeof(schema_cache)); @@ -1450,6 +1430,7 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSchemaCollection2_iface, &schemacache_dispex); *obj = &This->IXMLDOMSchemaCollection2_iface; return S_OK; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 951ee68..59ceac5 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -27,6 +27,7 @@ #include "windows.h" #include "ole2.h" #include "msxml2.h" +#include "msxml2did.h" #include "dispex.h" #include "wine/test.h" @@ -1996,6 +1997,70 @@ static void test_validate_on_load(void) IXMLDOMSchemaCollection2_Release(cache); } +static void test_obj_dispex(IUnknown *obj) +{ + static const WCHAR starW[] = {'*',0}; + DISPID dispid = DISPID_SAX_XMLREADER_GETFEATURE; + IDispatchEx *dispex; + IUnknown *unk; + DWORD props; + UINT ticnt; + HRESULT hr; + BSTR name; + + hr = IUnknown_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + if (FAILED(hr)) return; + + ticnt = 0; + hr = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); + EXPECT_HR(hr, S_OK); + ok(ticnt == 1, "ticnt=%u\n", ticnt); + + name = SysAllocString(starW); + hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); + EXPECT_HR(hr, E_NOTIMPL); + SysFreeString(name); + + hr = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + EXPECT_HR(hr, E_NOTIMPL); + + props = 0; + hr = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &props); + EXPECT_HR(hr, E_NOTIMPL); + ok(props == 0, "expected 0 got %d\n", props); + + hr = IDispatchEx_GetMemberName(dispex, dispid, &name); + EXPECT_HR(hr, E_NOTIMPL); + if (SUCCEEDED(hr)) SysFreeString(name); + + hr = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_SCHEMACOLLECTION_ADD, &dispid); + EXPECT_HR(hr, E_NOTIMPL); + + hr = IDispatchEx_GetNameSpaceParent(dispex, &unk); + EXPECT_HR(hr, E_NOTIMPL); + if (hr == S_OK && unk) IUnknown_Release(unk); + + IDispatchEx_Release(dispex); +} + +static void test_dispex(void) +{ + IXMLDOMSchemaCollection *cache; + IUnknown *unk; + HRESULT hr; + + cache = create_cache(&IID_IXMLDOMSchemaCollection); + if (!cache) return; + + hr = IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + IXMLDOMSchemaCollection_Release(cache); +} + START_TEST(schema) { HRESULT r; @@ -2010,6 +2075,7 @@ START_TEST(schema) test_XDR_schemas(); test_XDR_datatypes(); test_validate_on_load(); + test_dispex(); CoUninitialize(); }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
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