December 2012 - Wine-Commits

Frédéric Delanoy : cmd: Remove dead assignment ( clang).
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 40a69ae868a3c0f242c55596e438c01f87d64c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a69ae868a3c0f242c55596e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 19 12:17:11 2012 +0100 cmd: Remove dead assignment (clang). --- programs/cmd/wcmdmain.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e373d19..3884727 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1196,8 +1196,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (!status) break; - called = FALSE; /* No need to retry as we launched something */ - if (!assumeInternal && !console) errorlevel = 0; else {

1 0

Huw Davies : usp10: PairValueRecord is a variable length struct, so don' t use a C array to index into them.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: b83216c1242814e7729132a23d850e6c23a1192d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83216c1242814e7729132a23… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 19 11:43:40 2012 +0000 usp10: PairValueRecord is a variable length struct, so don't use a C array to index into them. --- dlls/usp10/opentype.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a99a9b8..81135b8 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1198,6 +1198,10 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly if (GET_BE_WORD(ppf1->PosFormat) == 1) { int index; + WORD ValueFormat1 = GET_BE_WORD(ppf1->ValueFormat1); + WORD ValueFormat2 = GET_BE_WORD(ppf1->ValueFormat2); + INT val_fmt1_size = GPOS_get_value_record( ValueFormat1, NULL, NULL ); + INT val_fmt2_size = GPOS_get_value_record( ValueFormat2, NULL, NULL ); offset = GET_BE_WORD(ppf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)ppf1+offset, glyphs[glyph_index]); if (index != -1 && index < GET_BE_WORD(ppf1->PairSetCount)) @@ -1205,24 +1209,24 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly int k; int pair_count; const GPOS_PairSet *ps; + const GPOS_PairValueRecord *pair_val_rec; offset = GET_BE_WORD(ppf1->PairSetOffset[index]); ps = (const GPOS_PairSet*)((const BYTE*)ppf1+offset); pair_count = GET_BE_WORD(ps->PairValueCount); + pair_val_rec = ps->PairValueRecord; for (k = 0; k < pair_count; k++) { - WORD second_glyph = GET_BE_WORD(ps->PairValueRecord[k].SecondGlyph); + WORD second_glyph = GET_BE_WORD(pair_val_rec->SecondGlyph); if (glyphs[glyph_index+write_dir] == second_glyph) { int next = 1; GPOS_ValueRecord ValueRecord1 = {0,0,0,0,0,0,0,0}; GPOS_ValueRecord ValueRecord2 = {0,0,0,0,0,0,0,0}; - WORD ValueFormat1 = GET_BE_WORD(ppf1->ValueFormat1); - WORD ValueFormat2 = GET_BE_WORD(ppf1->ValueFormat2); TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); - offset = GPOS_get_value_record(ValueFormat1, ps->PairValueRecord[k].Value1, &ValueRecord1); - GPOS_get_value_record(ValueFormat2, (WORD*)((const BYTE*)(ps->PairValueRecord[k].Value2)+offset), &ValueRecord2); + GPOS_get_value_record(ValueFormat1, pair_val_rec->Value1, &ValueRecord1); + GPOS_get_value_record(ValueFormat2, pair_val_rec->Value1 + val_fmt1_size, &ValueRecord2); if (ValueFormat1) { GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord1, ValueFormat1, ppem, &ptAdjust[0], &ptAdvance[0]); @@ -1239,6 +1243,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly if (next) return glyph_index + next; } + pair_val_rec = (const GPOS_PairValueRecord *)(pair_val_rec->Value1 + val_fmt1_size + val_fmt2_size); } } }

1 0

Hans Leidekker : wininet: Map socket errors to ERROR_INTERNET_CANNOT_CONNECT in create_netconn_socket .
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: f33f7a5df1a5029adf5da2b3f5ce52665b95fb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33f7a5df1a5029adf5da2b3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 19 12:02:36 2012 +0100 wininet: Map socket errors to ERROR_INTERNET_CANNOT_CONNECT in create_netconn_socket. --- dlls/wininet/netconnection.c | 2 +- dlls/wininet/tests/http.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e7a3274..8d5fc6f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -646,7 +646,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t } } if(result == -1) - return sock_get_error(errno); + return ERROR_INTERNET_CANNOT_CONNECT; #ifdef TCP_NODELAY flag = 1; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c9bd0a4..ba4ec4d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4041,6 +4041,32 @@ static void test_InternetCloseHandle(void) closetest_req, res, GetLastError()); } +static void test_connection_failure(void) +{ + HINTERNET session, connect, request; + DWORD error; + BOOL ret; + + session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(session != NULL, "failed to get session handle\n"); + + connect = InternetConnectA(session, "localhost", 1, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "failed to get connection handle\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "failed to get request handle\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + error = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(error == ERROR_INTERNET_CANNOT_CONNECT, "wrong error %u\n", error); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -4117,4 +4143,5 @@ START_TEST(http) InternetReadFile_chunked_test(); HttpSendRequestEx_test(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); + test_connection_failure(); }

1 0

Jiang Yike : wined3d: Add recognition for NVIDIA GeForce GTX 660 Ti, 660, 650 Ti and 650.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 44d5d3951b76ff0534c6e520eb0c0f73552adf30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d5d3951b76ff0534c6e520e… Author: Jiang Yike <futureway(a)asia.com> Date: Tue Dec 18 20:21:18 2012 +0800 wined3d: Add recognition for NVIDIA GeForce GTX 660 Ti, 660, 650 Ti and 650. --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d32345..9a1a83c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1097,6 +1097,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650, "NVIDIA GeForce GTX 650", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650TI, "NVIDIA GeForce GTX 650 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1497,6 +1501,10 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ + {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ + {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend high */ + {"GTX 650 Ti", CARD_NVIDIA_GEFORCE_GTX650TI}, /* Geforce 600 - lowend */ + {"GTX 650", CARD_NVIDIA_GEFORCE_GTX650}, /* Geforce 600 - lowend */ {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dbff407..09055f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1427,6 +1427,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, + CARD_NVIDIA_GEFORCE_GTX650 = 0x0fc6, + CARD_NVIDIA_GEFORCE_GTX650TI = 0x11c6, + CARD_NVIDIA_GEFORCE_GTX660 = 0x11c0, + CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Huw Davies : usp10: Add the ability to just return the size of the value record.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: c28897f3e9020c19933a262da4fa87950ab4312c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28897f3e9020c19933a262da… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 19 11:43:39 2012 +0000 usp10: Add the ability to just return the size of the value record. --- dlls/usp10/opentype.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 635b822..a99a9b8 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1110,14 +1110,14 @@ static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLO static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) { INT offset = 0; - if (ValueFormat & 0x0001) record->XPlacement = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0002) record->YPlacement = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0004) record->XAdvance = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0008) record->YAdvance = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0010) record->XPlaDevice = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0020) record->YPlaDevice = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0040) record->XAdvDevice = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0080) record->YAdvDevice = GET_BE_WORD(data[offset++]); + if (ValueFormat & 0x0001) { if (data) record->XPlacement = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0002) { if (data) record->YPlacement = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0004) { if (data) record->XAdvance = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0008) { if (data) record->YAdvance = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0010) { if (data) record->XPlaDevice = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0020) { if (data) record->YPlaDevice = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0040) { if (data) record->XAdvDevice = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0080) { if (data) record->YAdvDevice = GET_BE_WORD(data[offset]); offset++; } return offset; }

1 0

Hans Leidekker : winhttp: Add a missing goto in winhttp_request_get_Status.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 10cb483cf164c18a214923937a3724f1dba2effc URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cb483cf164c18a214923937… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 19 12:01:51 2012 +0100 winhttp: Add a missing goto in winhttp_request_get_Status. --- dlls/winhttp/request.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d44ed1..584f27d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3040,6 +3040,7 @@ static HRESULT WINAPI winhttp_request_get_Status( if (!WinHttpQueryHeaders( request->hrequest, flags, NULL, &status_code, &len, &index )) { err = get_last_error(); + goto done; } *status = status_code;

1 0

Alexandre Julliard : make_specfiles: Don' t copy the ordinal flag if not appropriate.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: a0ec065666b581a961e937e7f473c6e87e3bb81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ec065666b581a961e937e7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 14:36:24 2012 +0100 make_specfiles: Don't copy the ordinal flag if not appropriate. --- tools/make_specfiles | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 93f5ff1..f618c56 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,7 +219,12 @@ sub update_spec_file($) goto done; } - my $flags = ($parent{callconv} ne "stub" || $update_flags) ? $parent{flags} : $descr{flags}; + my $flags = $descr{flags}; + if ($parent{callconv} ne "stub" || $update_flags) + { + $flags = $parent{flags}; + $flags =~ s/-ordinal\s*// if $descr{ordinal} eq "@"; + } if ($parent{callconv} ne "stub" || $parent{args}) {

1 0

Hans Leidekker : winhttp/tests: Fix test failures on Windows 8.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 4788c214e28d5b26f266b83cbe9cde3ea662aee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4788c214e28d5b26f266b83cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 19 12:01:27 2012 +0100 winhttp/tests: Fix test failures on Windows 8. --- dlls/winhttp/tests/notification.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 8ef2115..5b351c8 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -292,6 +292,8 @@ static void test_connection_cache( void ) WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); + + Sleep(2000); /* make sure connection is evicted from cache */ } static const struct notification redirect_test[] =

1 0

Stefan Dösinger : wined3d: Remove draw_*_primitive_up.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 8cf55497cc45e2bd7b2a4c09661be0ab7ab06277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf55497cc45e2bd7b2a4c096… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 22:53:16 2012 +0100 wined3d: Remove draw_*_primitive_up. Note that I can't remove the state->user_stream mess yet, because of draw_*_primitive_strided. Another patchset will deal with that. --- dlls/wined3d/device.c | 100 --------------------------------------------- dlls/wined3d/wined3d.spec | 2 - include/wine/wined3d.h | 5 -- 3 files changed, 0 insertions(+), 107 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7fcc9c8..42cd226 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4160,106 +4160,6 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE, NULL); } -HRESULT CDECL wined3d_device_draw_primitive_up(struct wined3d_device *device, UINT vertex_count, - const void *stream_data, UINT stream_stride) -{ - struct wined3d_stream_state *stream; - struct wined3d_buffer *vb; - - TRACE("device %p, vertex count %u, stream_data %p, stream_stride %u.\n", - device, vertex_count, stream_data, stream_stride); - - if (!device->stateBlock->state.vertex_declaration) - { - WARN("Called without a valid vertex declaration set.\n"); - return WINED3DERR_INVALIDCALL; - } - - /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ - stream = &device->stateBlock->state.streams[0]; - vb = stream->buffer; - stream->buffer = (struct wined3d_buffer *)stream_data; - if (vb) - wined3d_buffer_decref(vb); - stream->offset = 0; - stream->stride = stream_stride; - device->stateBlock->state.user_stream = TRUE; - if (device->stateBlock->state.load_base_vertex_index) - { - device->stateBlock->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - - /* TODO: Only mark dirty if drawing from a different UP address */ - device_invalidate_state(device, STATE_STREAMSRC); - - draw_primitive(device, 0, vertex_count, 0, 0, FALSE, NULL); - - /* MSDN specifies stream zero settings must be set to NULL */ - stream->buffer = NULL; - stream->stride = 0; - - /* stream zero settings set to null at end, as per the msdn. No need to - * mark dirty here, the app has to set the new stream sources or use UP - * drawing again. */ - return WINED3D_OK; -} - -HRESULT CDECL wined3d_device_draw_indexed_primitive_up(struct wined3d_device *device, - UINT index_count, const void *index_data, enum wined3d_format_id index_data_format_id, - const void *stream_data, UINT stream_stride) -{ - struct wined3d_stream_state *stream; - struct wined3d_buffer *vb, *ib; - - TRACE("device %p, index_count %u, index_data %p, index_data_format %s, stream_data %p, stream_stride %u.\n", - device, index_count, index_data, debug_d3dformat(index_data_format_id), stream_data, stream_stride); - - if (!device->stateBlock->state.vertex_declaration) - { - WARN("(%p) : Called without a valid vertex declaration set\n", device); - return WINED3DERR_INVALIDCALL; - } - - stream = &device->stateBlock->state.streams[0]; - vb = stream->buffer; - stream->buffer = (struct wined3d_buffer *)stream_data; - if (vb) - wined3d_buffer_decref(vb); - stream->offset = 0; - stream->stride = stream_stride; - device->stateBlock->state.user_stream = TRUE; - device->stateBlock->state.index_format = index_data_format_id; - - /* Set to 0 as per MSDN. Do it now due to the stream source loading during draw_primitive(). */ - device->stateBlock->state.base_vertex_index = 0; - if (device->stateBlock->state.load_base_vertex_index) - { - device->stateBlock->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - /* Invalidate the state until we have nicer tracking of the stream source pointers */ - device_invalidate_state(device, STATE_STREAMSRC); - device_invalidate_state(device, STATE_INDEXBUFFER); - - draw_primitive(device, 0, index_count, 0, 0, TRUE, index_data); - - /* MSDN specifies stream zero settings and index buffer must be set to NULL */ - stream->buffer = NULL; - stream->stride = 0; - ib = device->stateBlock->state.index_buffer; - if (ib) - { - wined3d_buffer_decref(ib); - device->stateBlock->state.index_buffer = NULL; - } - /* No need to mark the stream source state dirty here. Either the app calls UP drawing again, or it has to call - * SetStreamSource to specify a vertex buffer - */ - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_draw_primitive_strided(struct wined3d_device *device, UINT vertex_count, const struct wined3d_strided_data *strided_data) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3b39c41..5322be8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -45,10 +45,8 @@ @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) @ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_indexed_primitive_strided(ptr long ptr long ptr long) -@ cdecl wined3d_device_draw_indexed_primitive_up(ptr long ptr long ptr long) @ cdecl wined3d_device_draw_primitive(ptr long long) @ cdecl wined3d_device_draw_primitive_strided(ptr long ptr) -@ cdecl wined3d_device_draw_primitive_up(ptr long ptr long) @ cdecl wined3d_device_draw_rect_patch(ptr long ptr ptr) @ cdecl wined3d_device_draw_tri_patch(ptr long ptr ptr) @ cdecl wined3d_device_end_scene(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b07328..77c76ab 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2094,14 +2094,9 @@ void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_devi HRESULT __cdecl wined3d_device_draw_indexed_primitive_strided(struct wined3d_device *device, UINT index_count, const struct wined3d_strided_data *strided_data, UINT vertex_count, const void *index_data, enum wined3d_format_id index_data_format_id); -HRESULT __cdecl wined3d_device_draw_indexed_primitive_up(struct wined3d_device *device, - UINT index_count, const void *index_data, enum wined3d_format_id index_data_format_id, - const void *stream_data, UINT stream_stride); HRESULT __cdecl wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count); HRESULT __cdecl wined3d_device_draw_primitive_strided(struct wined3d_device *device, UINT vertex_count, const struct wined3d_strided_data *strided_data); -HRESULT __cdecl wined3d_device_draw_primitive_up(struct wined3d_device *device, - UINT vertex_count, const void *stream_data, UINT stream_stride); HRESULT __cdecl wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle, const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info); HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle,

1 0

Andrew Talbot : ole32: Indentation fix.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: fa96beb5c439c55c935fbd667dd31cbcd7cc3d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa96beb5c439c55c935fbd667… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 18 22:52:22 2012 +0000 ole32: Indentation fix. --- dlls/ole32/compobj.c | 129 +++++++++++++++++++++---------------------- dlls/ole32/ole2.c | 127 +++++++++++++++++++++--------------------- dlls/ole32/pointermoniker.c | 2 +- 3 files changed, 129 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa96beb5c439c55c935fb…

1 0