December 2011 - Wine-commits

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 : 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 : 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: 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

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

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 5d892e63e679a3d47b7a915a110878c4f5582432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d892e63e679a3d47b7a915a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 16:15:51 2011 +0300 po: Update Russian translation. --- po/ru.po | 248 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 119 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d892e63e679a3d47b7a9…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 8985c5339754e2049976a18d9f05da1b8f45ed9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8985c5339754e2049976a18d9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Dec 11 23:27:07 2011 +0900 po: Updated Korean translation. --- po/ko.po | 92 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 43 insertions(+), 49 deletions(-) diff --git a/po/ko.po b/po/ko.po index 80b7cf4..042c600 100644 --- a/po/ko.po +++ b/po/ko.po @@ -114,7 +114,6 @@ msgid "Wine Gecko Installer" msgstr "Wine Gecko 설치관리자" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -124,13 +123,13 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 패" -"키지를 찾을 수 없습니다. WIne은 당신을 위해 자동으로 다운로드하고 설치할 것입" -"니다.\n" -"\n" +"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" +"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" +"다.\n" "\n" -"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 " -"http://wiki.winehq.org/Gecko를 보십시오." +"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " +"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시" +"오." #: appwiz.rc:106 msgid "&Install" @@ -2205,7 +2204,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "인증서 가져오기 마법사에 온 것을 환영합니다" #: 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" @@ -2217,9 +2215,14 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"이 마법사는 당신이 인증서,인증서 폐기 목록을 가져오는 데 도움을 주고,파일에" +"서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n" +"\n" "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다. 인증서 보관소는 인증" -"서, 인증서 파기 목록, 인증서 신뢰 목록의 저장소입니다." +"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " +"인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" +"\n" +"계속하려면,다음을 클릭하십시오." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2334,7 +2337,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "인증서 내보내기 마법사에 오신 것을 환영합니다" #: 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" @@ -2346,9 +2348,15 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"이 마법사는 당신이 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 " +"신뢰 목록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍" +"니다.\n" +"\n" "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다. 인증서 보관소는 인증" -"서, 인증서 파기 목록, 인증서 신뢰 목록의 저장소입니다." +"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " +"인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" +"\n" +"계속 하려면, 다음을 클릭하십시오." #: cryptui.rc:381 msgid "" @@ -2990,9 +2998,8 @@ msgid "Mapping" msgstr "매핑" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "할당 정렬" +msgstr "우선 할당 보기" #: dinput.rc:34 msgid "Action" @@ -6761,9 +6768,8 @@ msgid "&Data Rate" msgstr "데이타 전송율(&D)" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "KB/sec" +msgstr "킬로바이트/초" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -7242,9 +7248,8 @@ msgid "us" msgstr "마이크로초" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "%s 속성" +msgstr "%s 설정" #: serialui.rc:28 msgid "Baud Rate" @@ -9836,19 +9841,16 @@ msgid "N" msgstr "아니오" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "이 파일확장자 %s에 연결된 풀그림이 없습니다.\n" +msgstr "이 파일확장자 %1에 연결된 풀그림이 없습니다.\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "이 파일 형식 '%s'과 연결된 어떠한 명령도 없습니다.'\n" +msgstr "이 파일 형식 '%1'과 연결된 어떠한 명령도 없습니다.'\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "%s 덮어쓰기" +msgstr "%1 덮어쓰기" #: cmd.rc:297 msgid "More..." @@ -9867,23 +9869,20 @@ msgid "Syntax error\n" msgstr "문법 오류\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "%s를 위한 어떠한 도움말도 찾을 수 없습니다\n" +msgstr "%1를 위한 어떠한 도움말도 찾을 수 없습니다\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "GOTO 타겟을 찾을 수 없습니다\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "현재 날짜는 %s\n" +msgstr "현재 날짜는 %1임\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "현재 시간은 %s\n" +msgstr "현재 시간은 %s임\n" #: cmd.rc:307 msgid "Enter new date: " @@ -9894,9 +9893,8 @@ msgid "Enter new time: " msgstr "새 시간 입력: " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "환경 변수 %s 는 정의되지 않았습니다\n" +msgstr "환경 변수 %1 는 정의되지 않았습니다\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -9912,19 +9910,16 @@ msgid "A" msgstr "A" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, 삭제" +msgstr "%1, 삭제" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "에코(Echo)는 %s\n" +msgstr "에코(Echo)는 %1임\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "검증(Verify)은 %s\n" +msgstr "검증(Verify)은 %1임\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -9935,15 +9930,14 @@ msgid "Parameter error\n" msgstr "매개변수 오류\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 "" -"%c 드라이브의 볼륨은 %s\n" -" 볼륨 시리얼 번호는 %04x-%04x\n" -"\n" +"드라이브 %1!c!의 볼륨은 %2임\n" +" 볼륨 시리얼 번호는 %3!04x!-%4!04x!\n" +"임\n" #: cmd.rc:319 msgid "Volume label (11 characters, ENTER for none)?" @@ -9962,9 +9956,8 @@ msgid "Wine Command Prompt" msgstr "Wine 명령 프롬프트" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "CMD 버젼 %s\n" +msgstr "CMD 버젼 %1!S!\n" #: cmd.rc:324 msgid "More? " @@ -13212,7 +13205,6 @@ msgstr "" "을 끼쳐드린 거에 대하여 유감을 표함니다." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13221,11 +13213,13 @@ msgid "" "If this problem is not present under Windows and has not been reported yet, " "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" -"프로그램의 문제나 Wind의 결함으로 위해 발생할 수 있습니다. 당신은 실행한 프로" -"그램에 대하여 http://appdb.winehq.org 의 팁을 확인 할 수 있습니다. .\n" +"이 문제는 프로그램의 문제나 Wine의 결함으로 위해 발생할 수 있습니다. 당신은실" +"행한 프로그램에 대하여 <a href=\"http://appdb.winehq.org\">Application " +"Database</a> 에서 관련 팁을 살펴 볼 수 있습니다.\n" "\n" "만약 이 문제가 윈도우에서는 존재하지 않고, 아직 버그로 보고되지 않았으면 , 당" -"신은 http://bugs.winehq.org에 버그로 보고할 수 있습니다." +"신은 <a href=\"http://wiki.winehq.org/Bugs\">파일을 버그로 보고할 수 있습니다" +"</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Eric Pouech : d3d: Fixed a couple of warnings for 64bit targets.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 1d3952ed9f6885784b4f97b11a01a68dcbf9d205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3952ed9f6885784b4f97b11… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 11 15:05:08 2011 +0100 d3d: Fixed a couple of warnings for 64bit targets. --- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/tests/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6467858..bf4e1ea 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -893,7 +893,7 @@ static void test_cursor_pos(void) flush_events(); ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - expect_pos - points, expect_pos->x, expect_pos->y); + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index abd3685..e3767bb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3237,7 +3237,7 @@ static void test_cursor_pos(void) flush_events(); ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - expect_pos - points, expect_pos->x, expect_pos->y); + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Alexandre Julliard : gdi32: Always use biClrUsed for the number of colors of internal BITMAPINFO structures .
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 25e2fae2a844075a1a13d4b8bf0b99f677e9e610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e2fae2a844075a1a13d4b8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 10 12:48:33 2011 +0100 gdi32: Always use biClrUsed for the number of colors of internal BITMAPINFO structures. --- dlls/gdi32/dib.c | 36 +++++++++++++++++------------------- dlls/gdi32/dibdrv/bitblt.c | 3 +-- dlls/gdi32/dibdrv/dc.c | 23 +++++++++-------------- dlls/gdi32/gdi_private.h | 8 +------- 4 files changed, 28 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b2d18cc..23affb1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -90,7 +90,8 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) } else /* assume BITMAPINFOHEADER */ { - colors = get_dib_num_of_colors( info ); + if (info->bmiHeader.biClrUsed) colors = min( info->bmiHeader.biClrUsed, 256 ); + else colors = info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); @@ -225,10 +226,11 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY palEntry[256]; HPALETTE palette = GetCurrentObject( hdc, OBJ_PAL ); - int i, colors = get_dib_num_of_colors( info ); + int i, colors = 1 << info->bmiHeader.biBitCount; + + info->bmiHeader.biClrUsed = colors; if (!palette) return 0; - if (!colors) return 0; memset( palEntry, 0, sizeof(palEntry) ); if (!GetPaletteEntries( palette, 0, colors, palEntry )) @@ -1021,24 +1023,21 @@ static int fill_query_info( BITMAPINFO *info, BITMAPOBJ *bmp ) */ static void copy_color_info(BITMAPINFO *dst, const BITMAPINFO *src, UINT coloruse) { - unsigned int colors = get_dib_num_of_colors( src ); - RGBQUAD *src_colors = (RGBQUAD *)((char *)src + src->bmiHeader.biSize); - - assert( src->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ); + assert( src->bmiHeader.biSize == sizeof(BITMAPINFOHEADER) ); if (dst->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREINFO *core = (BITMAPCOREINFO *)dst; if (coloruse == DIB_PAL_COLORS) - memcpy( core->bmciColors, src_colors, colors * sizeof(WORD) ); + memcpy( core->bmciColors, src->bmiColors, src->bmiHeader.biClrUsed * sizeof(WORD) ); else { unsigned int i; - for (i = 0; i < colors; i++) + for (i = 0; i < src->bmiHeader.biClrUsed; i++) { - core->bmciColors[i].rgbtRed = src_colors[i].rgbRed; - core->bmciColors[i].rgbtGreen = src_colors[i].rgbGreen; - core->bmciColors[i].rgbtBlue = src_colors[i].rgbBlue; + core->bmciColors[i].rgbtRed = src->bmiColors[i].rgbRed; + core->bmciColors[i].rgbtGreen = src->bmiColors[i].rgbGreen; + core->bmciColors[i].rgbtBlue = src->bmiColors[i].rgbBlue; } } } @@ -1050,16 +1049,16 @@ static void copy_color_info(BITMAPINFO *dst, const BITMAPINFO *src, UINT colorus if (src->bmiHeader.biCompression == BI_BITFIELDS) /* bitfields are always at bmiColors even in larger structures */ memcpy( dst->bmiColors, src->bmiColors, 3 * sizeof(DWORD) ); - else if (colors) + else if (src->bmiHeader.biClrUsed) { void *colorptr = (char *)dst + dst->bmiHeader.biSize; unsigned int size; if (coloruse == DIB_PAL_COLORS) - size = colors * sizeof(WORD); + size = src->bmiHeader.biClrUsed * sizeof(WORD); else - size = colors * sizeof(RGBQUAD); - memcpy( colorptr, src_colors, size ); + size = src->bmiHeader.biClrUsed * sizeof(RGBQUAD); + memcpy( colorptr, src->bmiColors, size ); } } } @@ -1358,13 +1357,12 @@ INT WINAPI GetDIBits( if (coloruse == DIB_PAL_COLORS) { WORD *index = (WORD *)dst_info->bmiColors; - int colors = get_dib_num_of_colors( dst_info ); - for (i = 0; i < colors; i++, index++) + for (i = 0; i < dst_info->bmiHeader.biClrUsed; i++, index++) *index = i; } - dst_info->bmiHeader.biClrUsed = 0; copy_color_info( info, dst_info, coloruse ); + if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) info->bmiHeader.biClrUsed = 0; done: release_dc_ptr( dc ); diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 5bd5234..28e2fac 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -872,7 +872,6 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; if (hbitmap) @@ -929,7 +928,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); if (!info->bmiHeader.biClrUsed) return FALSE; - if (dib->color_table_size != get_dib_num_of_colors( info )) return FALSE; + if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 44a4075..2f06d62 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -68,7 +68,7 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) } static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, - RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) + RGBQUAD *color_table, void *bits, enum dib_info_flags flags) { dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; @@ -141,17 +141,17 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return FALSE; } - if(color_table) + if (color_table && bi->biClrUsed) { if (flags & private_color_table) { - dib->color_table = HeapAlloc(GetProcessHeap(), 0, color_table_size * sizeof(dib->color_table[0])); + dib->color_table = HeapAlloc(GetProcessHeap(), 0, bi->biClrUsed * sizeof(dib->color_table[0])); if(!dib->color_table) return FALSE; - memcpy(dib->color_table, color_table, color_table_size * sizeof(color_table[0])); + memcpy(dib->color_table, color_table, bi->biClrUsed * sizeof(color_table[0])); } else dib->color_table = color_table; - dib->color_table_size = color_table_size; + dib->color_table_size = bi->biClrUsed; } else { @@ -164,9 +164,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) { - int num_colors = get_dib_num_of_colors( bi ); - - if (num_colors && usage == DIB_PAL_COLORS) + if (bi->bmiHeader.biClrUsed && usage == DIB_PAL_COLORS) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -180,11 +178,8 @@ BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, U BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) { - unsigned int colors = get_dib_num_of_colors( info ); - void *colorptr = (char *)&info->bmiHeader + info->bmiHeader.biSize; - const DWORD *bitfields = (info->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)colorptr : NULL; - - return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags ); + return init_dib_info( dib, &info->bmiHeader, (const DWORD *)info->bmiColors, + (RGBQUAD *)info->bmiColors, bits, flags ); } BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) @@ -206,7 +201,7 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f flags | private_color_table ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->dib->dsBmih.biClrUsed, bmp->dib->dsBm.bmBits, flags ); + bmp->color_table, bmp->dib->dsBm.bmBits, flags ); } static void clear_dib_info(dib_info *dib) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6d47143..8589c4f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -469,15 +469,9 @@ static inline int get_dib_image_size( const BITMAPINFO *info ) * abs( info->bmiHeader.biHeight ); } -static inline int get_dib_num_of_colors( const BITMAPINFO *info ) -{ - if (info->bmiHeader.biClrUsed) return min( info->bmiHeader.biClrUsed, 256 ); - return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; -} - static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) { - unsigned int size = FIELD_OFFSET( BITMAPINFO, bmiColors[get_dib_num_of_colors( src )] ); + unsigned int size = FIELD_OFFSET( BITMAPINFO, bmiColors[src->bmiHeader.biClrUsed] ); if (src->bmiHeader.biCompression == BI_BITFIELDS) size += 3 * sizeof(DWORD); memcpy( dst, src, size ); }

1 0